Skip to content

A fully functional Android app built entirely with Kotlin and Jetpack Compose

Update Compose compiler to 1.2.0, Kotlin to 1.7.0

Márton Braun6df6f03c95e4
diff --git a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/AndroidCompose.kt b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/AndroidCompose.kt
index cb5eb8bd3..4cb05f4d5 100644
--- a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/AndroidCompose.kt
+++ b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/AndroidCompose.kt
@@ -36,7 +36,7 @@ internal fun Project.configureAndroidCompose(
}
composeOptions {
- kotlinCompilerExtensionVersion = libs.findVersion("androidxCompose").get().toString()
+ kotlinCompilerExtensionVersion = libs.findVersion("androidxComposeCompiler").get().toString()
}
kotlinOptions {
diff --git a/core-datastore/build.gradle.kts b/core-datastore/build.gradle.kts
index 033005aa8..acc358541 100644
--- a/core-datastore/build.gradle.kts
+++ b/core-datastore/build.gradle.kts
@@ -70,3 +70,10 @@ dependencies {
kapt(libs.hilt.compiler)
kaptAndroidTest(libs.hilt.compiler)
}
+
+// Workaround for kapt issues in Kotlin 1.7
+// https://github.com/google/dagger/issues/3448
+// https://youtrack.jetbrains.com/issue/KT-52761
+kapt {
+ correctErrorTypes = true
+}
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 7cd1e9bae..77f178d35 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -5,6 +5,7 @@ androidGradlePlugin = "7.2.1"
androidxActivity = "1.4.0"
androidxAppCompat = "1.4.2"
androidxCompose = "1.2.0-rc02"
+androidxComposeCompiler = "1.2.0"
androidxComposeMaterial3 = "1.0.0-alpha13"
androidxCore = "1.8.0"
androidxCustomView = "1.0.0-rc01"
@@ -27,11 +28,11 @@ hilt = "2.42"
hiltExt = "1.0.0"
jacoco = "0.8.7"
junit4 = "4.13.2"
-kotlin = "1.6.21"
+kotlin = "1.7.0"
kotlinxCoroutines = "1.6.3"
kotlinxDatetime = "0.3.3"
kotlinxSerializationJson = "1.3.3"
-ksp = "1.6.21-1.0.5"
+ksp = "1.7.0-1.0.6"
ktlint = "0.43.0"
lint = "30.2.1"
material3 = "1.6.1"