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 fd485fd..64584940 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
@@ -204,7 +204,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 6bcb125..dcea713 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()