Rebase to Kotlin 1.8.10
Change-Id: I4993a2df083a3125ab7db41dc06f4c706ce19405
diff --git a/compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/ComposerParamSignatureTests.kt b/compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/ComposerParamSignatureTests.kt
index a7e8e11..8e53da5 100644
--- a/compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/ComposerParamSignatureTests.kt
+++ b/compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/ComposerParamSignatureTests.kt
@@ -66,8 +66,8 @@
public final class TestKt {
public final static Foo(Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;I)V
public final static Bar(Landroidx/compose/runtime/Composer;I)V
- final static INNERCLASS TestKt%Foo%1 null null
final static INNERCLASS TestKt%Bar%1 null null
+ final static INNERCLASS TestKt%Foo%1 null null
}
final class TestKt%Foo%1 extends kotlin/jvm/internal/Lambda implements kotlin/jvm/functions/Function2 {
<init>(Lkotlin/jvm/functions/Function2;I)V
@@ -424,9 +424,9 @@
public final class TestKt {
public final static Foo(Ljava/lang/String;Lkotlin/jvm/functions/Function0;Landroidx/compose/runtime/Composer;I)V
public final static Example(Landroidx/compose/runtime/Composer;I)V
- final static INNERCLASS TestKt%Foo%1 null null
final static INNERCLASS TestKt%Example%1 null null
final static INNERCLASS TestKt%Example%2 null null
+ final static INNERCLASS TestKt%Foo%1 null null
}
final class TestKt%Foo%1 extends kotlin/jvm/internal/Lambda implements kotlin/jvm/functions/Function2 {
<init>(Ljava/lang/String;Lkotlin/jvm/functions/Function0;I)V
@@ -473,8 +473,8 @@
public final static Foo(Landroidx/compose/runtime/Composer;I)V
static <clinit>()V
private final static Landroidx/compose/runtime/ProvidableCompositionLocal; a
- final static INNERCLASS TestKt%Foo%1 null null
final static INNERCLASS TestKt%a%1 null null
+ final static INNERCLASS TestKt%Foo%1 null null
}
final class TestKt%Foo%1 extends kotlin/jvm/internal/Lambda implements kotlin/jvm/functions/Function2 {
<init>(I)V
@@ -742,8 +742,8 @@
public final class TestKt {
public final static Foo(ILjava/lang/String;Landroidx/compose/runtime/Composer;I)V
public final static Bar(ILjava/lang/String;Landroidx/compose/runtime/Composer;I)V
- final static INNERCLASS TestKt%Foo%1 null null
final static INNERCLASS TestKt%Bar%1 null null
+ final static INNERCLASS TestKt%Foo%1 null null
}
final class TestKt%Foo%1 extends kotlin/jvm/internal/Lambda implements kotlin/jvm/functions/Function2 {
<init>(ILjava/lang/String;I)V
@@ -781,8 +781,8 @@
public final class TestKt {
public final static Foo(Landroidx/compose/runtime/Composer;I)V
public final static Bar(ILandroidx/compose/runtime/Composer;I)V
- final static INNERCLASS TestKt%Foo%2 null null
final static INNERCLASS TestKt%Bar%1 null null
+ final static INNERCLASS TestKt%Foo%2 null null
}
final class TestKt%Foo%2 extends kotlin/jvm/internal/Lambda implements kotlin/jvm/functions/Function2 {
<init>(I)V
@@ -914,9 +914,9 @@
public final class TestKt {
public final static Wrap(Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;I)V
public final static App(ILandroidx/compose/runtime/Composer;I)V
- final static INNERCLASS TestKt%Wrap%1 null null
final static INNERCLASS TestKt%App%1 null null
final static INNERCLASS TestKt%App%2 null null
+ final static INNERCLASS TestKt%Wrap%1 null null
}
final class TestKt%Wrap%1 extends kotlin/jvm/internal/Lambda implements kotlin/jvm/functions/Function2 {
<init>(Lkotlin/jvm/functions/Function3;I)V
@@ -943,8 +943,8 @@
final synthetic I %x
final synthetic I %a
OUTERCLASS TestKt%App%1 invoke (ILandroidx/compose/runtime/Composer;I)V
- final static INNERCLASS TestKt%App%1%1 null null
final static INNERCLASS TestKt%App%1 null null
+ final static INNERCLASS TestKt%App%1%1 null null
}
final class TestKt%App%2 extends kotlin/jvm/internal/Lambda implements kotlin/jvm/functions/Function2 {
<init>(II)V
@@ -1213,9 +1213,9 @@
public final static Wat(Landroidx/compose/runtime/Composer;I)V
public final static Foo(ILandroidx/compose/runtime/Composer;I)V
private final static Foo%goo(Landroidx/compose/runtime/Composer;I)V
- final static INNERCLASS TestKt%Wat%1 null null
- public final static INNERCLASS TestKt%Foo%Bar null Bar
final static INNERCLASS TestKt%Foo%1 null null
+ public final static INNERCLASS TestKt%Foo%Bar null Bar
+ final static INNERCLASS TestKt%Wat%1 null null
}
final class TestKt%Wat%1 extends kotlin/jvm/internal/Lambda implements kotlin/jvm/functions/Function2 {
<init>(I)V
@@ -1274,8 +1274,8 @@
public final static C(I)V
public final static I(Lkotlin/jvm/functions/Function0;)V
public final static J()V
- public final static INNERCLASS TestKt%C%D null D
public final static INNERCLASS TestKt%C%g%1 null null
+ public final static INNERCLASS TestKt%C%D null D
final static INNERCLASS TestKt%J%1 null null
}
public final class TestKt%C%D {
@@ -1308,8 +1308,8 @@
static <clinit>()V
public final static LTestKt%J%1%1; INSTANCE
OUTERCLASS TestKt%J%1 invoke ()V
- final static INNERCLASS TestKt%J%1%1 null null
final static INNERCLASS TestKt%J%1 null null
+ final static INNERCLASS TestKt%J%1%1 null null
}
"""
)
@@ -1497,8 +1497,8 @@
final synthetic I %it
final synthetic I %%changed
OUTERCLASS TestKt%Example%1 compute (ILandroidx/compose/runtime/Composer;I)V
- final static INNERCLASS TestKt%Example%1%compute%1 null null
final static INNERCLASS TestKt%Example%1 null null
+ final static INNERCLASS TestKt%Example%1%compute%1 null null
}
"""
)
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 666f74d..d0d3b5e 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
@@ -208,7 +208,7 @@
companion object {
fun checkCompilerVersion(configuration: CompilerConfiguration): Boolean {
try {
- val KOTLIN_VERSION_EXPECTATION = "1.8.0"
+ val KOTLIN_VERSION_EXPECTATION = "1.8.10"
KotlinCompilerVersion.getVersion()?.let { version ->
val msgCollector = configuration.get(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY)
val suppressKotlinVersionCheck = configuration.get(
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index d0edcbe..68d0f3e 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -36,13 +36,13 @@
hilt = "2.44"
incap = "0.2"
jcodec = "0.2.5"
-kotlin = "1.8.0"
+kotlin = "1.8.10"
kotlinBenchmark = "0.4.7"
-kotlinNative = "1.8.0"
+kotlinNative = "1.8.10"
kotlinCompileTesting = "1.4.9"
kotlinCoroutines = "1.6.4"
kotlinSerialization = "1.3.3"
-ksp = "1.8.0-1.0.8"
+ksp = "1.8.10-1.0.9"
ktlint = "0.46.0-20220520.192227-74"
leakcanary = "2.8.1"
media3 = "1.0.0-beta03"
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 1cf4e56..afcc410 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -911,21 +911,21 @@
<sha256 value="4e54622f5dc0f8b6c51e28650268f001e3b55d076c8e3a9d9731c050820c0a3d" origin="Generated by Gradle"/>
</artifact>
</component>
- <component group="" name="kotlin-native-prebuilt-linux-x86_64" version="1.8.0" androidx:reason="Unsigned, b/227204920">
- <artifact name="kotlin-native-prebuilt-linux-x86_64-1.8.0.tar.gz">
- <sha256 value="841582a0259eb0440e90f8ac6c71bd164ac1dcd01eef02c66ac9852179a86d9f" origin="Hand-built using sha256sum kotlin-native-prebuilt-linux-x86_64-1.7.21.tar.gz"/>
+ <component group="" name="kotlin-native-prebuilt-linux-x86_64" version="1.8.10" androidx:reason="Unsigned, b/227204920">
+ <artifact name="kotlin-native-prebuilt-linux-x86_64-1.8.10.tar.gz">
+ <sha256 value="7c031ecc225cacc96c9479be28249d57226ff10a1d9ad78340ed6efffd06bdf5" origin="Hand-built using sha256sum kotlin-native-prebuilt-linux-x86_64-1.8.10.tar.gz"/>
</artifact>
</component>
- <component group="" name="kotlin-native-prebuilt-macos-aarch64" version="1.8.0">
- <artifact name="kotlin-native-prebuilt-macos-aarch64-1.8.0.tar.gz">
- <sha256 value="83022c4b47d5e0c261dd4844ec775c3cedc998d08e8cff07a9318b309ca7fbf1" origin="Hand-built using sha256sum kotlin-native-prebuilt-macos-aarch64-1.7.21.tar.gz"/>
+ <component group="" name="kotlin-native-prebuilt-macos-aarch64" version="1.8.10">
+ <artifact name="kotlin-native-prebuilt-macos-aarch64-1.8.10.tar.gz">
+ <sha256 value="b15d176c8b88ee6d4bc8017e17462222081dca2e97347fd9eecd554c5839a819" origin="Hand-built using sha256sum kotlin-native-prebuilt-macos-aarch64-1.8.10.tar.gz"/>
</artifact>
</component>
- <component group="" name="kotlin-native-prebuilt-macos-x86_64" version="1.8.0">
- <artifact name="kotlin-native-prebuilt-macos-x86_64-1.8.0.tar.gz">
- <sha256 value="27f9b7de732ce36b3daf291f7970762ba7e538cf1eb75603dd2377ae8ebf9513" origin="Hand-built using sha256sum kotlin-native-prebuilt-macos-x86_64-1.7.21.tar.gz"/>
+ <component group="" name="kotlin-native-prebuilt-macos-x86_64" version="1.8.10">
+ <artifact name="kotlin-native-prebuilt-macos-x86_64-1.8.10.tar.gz">
+ <sha256 value="8a31a27a776ba55974936b897be76edca1cf871d9ae75537e593a7f1b83380e9" origin="Hand-built using sha256sum kotlin-native-prebuilt-macos-x86_64-1.8.10.tar.gz"/>
</artifact>
</component>
</components>
diff --git a/room/integration-tests/kotlintestapp/build.gradle b/room/integration-tests/kotlintestapp/build.gradle
index bc91f86..664b125 100644
--- a/room/integration-tests/kotlintestapp/build.gradle
+++ b/room/integration-tests/kotlintestapp/build.gradle
@@ -130,8 +130,13 @@
ksp {
arg("room.schemaLocation","$projectDir/schemas-ksp".toString())
}
+
+// Commented out as workaround suggested by KSP team due to bug in KSP 1.8.10-1.0.9
+// TODO: Tracking as b/267692813
+/*
tasks.withType(KspTask).configureEach { kspTask ->
if (kspTask.name.contains("GenKotlin")) {
kspTask.apOptions.put("room.generateKotlin", "true")
}
}
+*/
\ No newline at end of file
diff --git a/room/room-compiler-processing/src/test/java/androidx/room/compiler/processing/compat/XConvertersTest.kt b/room/room-compiler-processing/src/test/java/androidx/room/compiler/processing/compat/XConvertersTest.kt
index 158a455..dfd1e17 100644
--- a/room/room-compiler-processing/src/test/java/androidx/room/compiler/processing/compat/XConvertersTest.kt
+++ b/room/room-compiler-processing/src/test/java/androidx/room/compiler/processing/compat/XConvertersTest.kt
@@ -35,7 +35,7 @@
import com.google.auto.common.MoreTypes
import com.google.common.truth.Truth.assertThat
import com.google.devtools.ksp.getDeclaredFunctions
-import com.google.devtools.ksp.symbol.impl.kotlin.KSNameImpl
+import com.google.devtools.ksp.processing.impl.KSNameImpl
import com.squareup.javapoet.ClassName
import com.squareup.javapoet.JavaFile
import com.squareup.javapoet.TypeSpec
