Upgrade to Kotlin 1.6.10
Change-Id: I57d57a8386aea53c6dcbb871066bca06a4ea5240
(cherry picked from commit c9a5f82fedc59bd7675eec96a1e35cec6245ef87)
Merged-In:I57d57a8386aea53c6dcbb871066bca06a4ea5240
diff --git a/compose/compiler/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/ComposePlugin.kt b/compose/compiler/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/ComposePlugin.kt
index 0095ce0..edf5e93 100644
--- a/compose/compiler/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/ComposePlugin.kt
+++ b/compose/compiler/compiler-hosted/src/main/java/androidx/compose/compiler/plugins/kotlin/ComposePlugin.kt
@@ -187,7 +187,7 @@
project: Project,
configuration: CompilerConfiguration
) {
- val KOTLIN_VERSION_EXPECTATION = "1.6.0"
+ val KOTLIN_VERSION_EXPECTATION = "1.6.10"
KotlinCompilerVersion.getVersion()?.let { version ->
val suppressKotlinVersionCheck = configuration.get(
ComposeConfiguration.SUPPRESS_KOTLIN_VERSION_COMPATIBILITY_CHECK,
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index ac87caf..6cb3c7a2 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -28,10 +28,10 @@
guavaJre = "29.0-jre"
hilt = "2.40.1"
incap = "0.2"
-kotlin = "1.6.0"
+kotlin = "1.6.10"
kotlinCompileTesting = "1.4.1"
kotlinCoroutines = "1.5.2"
-ksp = "1.6.0-1.0.1"
+ksp = "1.6.10-1.0.2"
ktlint = "0.43.0"
leakcanary = "2.7"
mockito = "2.25.0"
diff --git a/room/room-compiler-processing-testing/src/main/java/androidx/room/compiler/processing/util/compiler/TestKspRegistrar.kt b/room/room-compiler-processing-testing/src/main/java/androidx/room/compiler/processing/util/compiler/TestKspRegistrar.kt
index 233cb41..b4104d3 100644
--- a/room/room-compiler-processing-testing/src/main/java/androidx/room/compiler/processing/util/compiler/TestKspRegistrar.kt
+++ b/room/room-compiler-processing-testing/src/main/java/androidx/room/compiler/processing/util/compiler/TestKspRegistrar.kt
@@ -83,6 +83,7 @@
}
val logger = MessageCollectorBasedKSPLogger(
messageCollector = messageCollector,
+ wrappedMessageCollector = messageCollector,
allWarningsAsErrors = baseOptions.allWarningsAsErrors
)
val options = baseOptions.build()
