From 6df6f03c95e42a28cdc3122bb131b3acfa68d3a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A1rton=20Braun?= <zsmb@google.com>
Date: Mon, 18 Jul 2022 14:36:34 +0200
Subject: [PATCH 1/2] Update Compose compiler to 1.2.0, Kotlin to 1.7.0

---
 .../com/google/samples/apps/nowinandroid/AndroidCompose.kt | 2 +-
 core-datastore/build.gradle.kts                            | 7 +++++++
 gradle/libs.versions.toml                                  | 5 +++--
 3 files changed, 11 insertions(+), 3 deletions(-)

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"

From 0e75e427e972be2006c477af7014c0ece51b3969 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A1rton=20Braun?= <zsmb@google.com>
Date: Mon, 18 Jul 2022 16:17:33 +0200
Subject: [PATCH 2/2] Add TODO comment with bug

---
 core-datastore/build.gradle.kts | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/core-datastore/build.gradle.kts b/core-datastore/build.gradle.kts
index acc358541..a554a6de2 100644
--- a/core-datastore/build.gradle.kts
+++ b/core-datastore/build.gradle.kts
@@ -71,9 +71,7 @@ dependencies {
     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
+// TODO b/239411851, Remove kapt workaround configuration
 kapt {
     correctErrorTypes = true
 }