Merge pull request #752 from SimonMarquis/kotlin-1.9.0

Kotlin 1.9.0
android · Jul 19, 2023 · 56389cb · 56389cb
2 parents 9197b33 + 5fa8c1d
commit 56389cb
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 8 deletions.
diff --git a/app/src/androidTest/java/com/google/samples/apps/nowinandroid/ui/NiaAppStateTest.kt b/app/src/androidTest/java/com/google/samples/apps/nowinandroid/ui/NiaAppStateTest.kt
@@ -183,7 +183,7 @@ class NiaAppStateTest {
 @Composable
 private fun rememberTestNavController(): TestNavHostController {
     val context = LocalContext.current
-    val navController = remember {
+    return remember<TestNavHostController> {
         TestNavHostController(context).apply {
             navigatorProvider.addNavigator(ComposeNavigator())
             graph = createGraph(startDestination = "a") {
@@ -193,5 +193,4 @@ private fun rememberTestNavController(): TestNavHostController {
             }
         }
     }
-    return navController
 }
diff --git a/core/datastore/build.gradle.kts b/core/datastore/build.gradle.kts
@@ -52,6 +52,13 @@ protobuf {
     }
 }
 
+androidComponents.beforeVariants {
+    android.sourceSets.register(it.name) {
+        java.srcDir(buildDir.resolve("generated/source/proto/${it.name}/java"))
+        kotlin.srcDir(buildDir.resolve("generated/source/proto/${it.name}/kotlin"))
+    }
+}
+
 dependencies {
     implementation(project(":core:common"))
     implementation(project(":core:model"))

diff --git a/gradle.properties b/gradle.properties
@@ -38,3 +38,7 @@ android.nonTransitiveRClass=true
 # https://developer.android.com/build/releases/gradle-plugin#default-changes
 android.defaults.buildfeatures.resvalues=false
 android.defaults.buildfeatures.shaders=false
+
+# Use newer lint version to support Kotlin 1.9 and corresponding kotlinx-metadata-jvm
+# https://googlesamples.github.io/android-custom-lint-rules/usage/newer-lint.md.html
+android.experimental.lint.version=8.1.0-rc01
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -6,7 +6,7 @@ androidxActivity = "1.7.0"
 androidxAppCompat = "1.5.1"
 androidxBrowser = "1.4.0"
 androidxComposeBom = "2023.06.01"
-androidxComposeCompiler = "1.4.8"
+androidxComposeCompiler = "1.5.0"
 androidxComposeRuntimeTracing = "1.0.0-alpha03"
 androidxCore = "1.9.0"
 androidxCoreSplashscreen = "1.0.0"
@@ -34,18 +34,18 @@ firebasePerfPlugin = "1.4.2"
 gmsPlugin = "4.3.14"
 googleOss = "17.0.1"
 googleOssPlugin = "0.10.6"
-hilt = "2.46.1"
+hilt = "2.47"
 hiltExt = "1.0.0"
 jacoco = "0.8.7"
 junit4 = "4.13.2"
-kotlin = "1.8.22"
+kotlin = "1.9.0"
 kotlinxCoroutines = "1.6.4"
 kotlinxDatetime = "0.4.0"
 kotlinxSerializationJson = "1.5.1"
-ksp = "1.8.22-1.0.11"
-lint = "30.3.1"
+ksp = "1.9.0-1.0.11"
+lint = "31.0.2"
 okhttp = "4.10.0"
-protobuf = "3.23.0"
+protobuf = "3.23.4"
 protobufPlugin = "0.9.3"
 retrofit = "2.9.0"
 retrofitKotlinxSerializationJson = "1.0.0"