From 02c052e7f48f32c713d04afc58ef014daab0dc12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A1rton=20Braun?= <zsmb@google.com>
Date: Wed, 12 Oct 2022 13:59:14 +0200
Subject: [PATCH] Update Kotlin to 1.7.20

Change-Id: Ib3ce03b0a1d78e90424f8431f039511c04446a62
---
 core/datastore/build.gradle.kts | 5 -----
 gradle.properties               | 2 --
 gradle/libs.versions.toml       | 6 +++---
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/core/datastore/build.gradle.kts b/core/datastore/build.gradle.kts
index 616256bf5..e879c63d7 100644
--- a/core/datastore/build.gradle.kts
+++ b/core/datastore/build.gradle.kts
@@ -64,8 +64,3 @@ dependencies {
     implementation(libs.androidx.dataStore.core)
     implementation(libs.protobuf.kotlin.lite)
 }
-
-// TODO b/239411851, Remove kapt workaround configuration
-kapt {
-    correctErrorTypes = true
-}
diff --git a/gradle.properties b/gradle.properties
index 6533378ed..10ff2e365 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -30,8 +30,6 @@ org.gradle.unsafe.configuration-cache=true
 android.useAndroidX=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
-# Allow kapt to use incremental processing
-kapt.incremental.apt=true
 
 # Non-transitive R classes is recommended and is faster/smaller
 android.nonTransitiveRClass=true
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index fe34f3da8..b63d2f937 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -6,7 +6,7 @@ androidxActivity = "1.6.0"
 androidxAppCompat = "1.5.1"
 androidxCompose = "1.3.0-beta02"
 androidxComposeRuntimeTracing = "1.0.0-alpha01"
-androidxComposeCompiler = "1.3.1"
+androidxComposeCompiler = "1.3.2"
 androidxComposeMaterial3 = "1.0.0-beta03"
 androidxCore = "1.9.0"
 androidxCoreSplashscreen = "1.0.0"
@@ -35,11 +35,11 @@ hilt = "2.42"
 hiltExt = "1.0.0"
 jacoco = "0.8.7"
 junit4 = "4.13.2"
-kotlin = "1.7.10"
+kotlin = "1.7.20"
 kotlinxCoroutines = "1.6.4"
 kotlinxDatetime = "0.4.0"
 kotlinxSerializationJson = "1.4.0"
-ksp = "1.7.10-1.0.6"
+ksp = "1.7.20-1.0.6"
 lint = "30.2.2"
 okhttp = "4.10.0"
 protobuf = "3.21.5"