Merge "Merge cherrypicks of ['android-review.googlesource.com/3077092'] into androidx-compose-compiler-release." into androidx-compose-compiler-releaseandroidx-compose-compiler-release

4 files changed, 16 insertions, 14 deletions

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 c445253c0d1..e2ac7434cc9 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
@@ -322,7 +322,7 @@ class ComposePluginRegistrar : org.jetbrains.kotlin.compiler.plugin.ComponentReg
     companion object {
         fun checkCompilerVersion(configuration: CompilerConfiguration): Boolean {
             try {
-                val KOTLIN_VERSION_EXPECTATION = "1.9.23"
+                val KOTLIN_VERSION_EXPECTATION = "1.9.24"
                 KotlinCompilerVersion.getVersion()?.let { version ->
                     val msgCollector = configuration.get(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY)
                     val suppressKotlinVersionCheck = configuration.get(
diff --git a/development/update_kotlin.sh b/development/update_kotlin.sh
index d19df4be274..bed10345671 100755
--- a/development/update_kotlin.sh
+++ b/development/update_kotlin.sh
@@ -13,6 +13,7 @@ done
 
 # Download maven artifacts
 ARTIFACTS_TO_DOWNLOAD="org.jetbrains.kotlin:kotlin-gradle-plugin:$KOTLIN_VERSION,"
+ARTIFACTS_TO_DOWNLOAD="org.jetbrains.kotlin:kotlin-build-tools-impl:$KOTLIN_VERSION,"
 ARTIFACTS_TO_DOWNLOAD+="org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:$KOTLIN_VERSION,"
 ARTIFACTS_TO_DOWNLOAD+="org.jetbrains.kotlin.plugin.serialization:org.jetbrains.kotlin.plugin.serialization.gradle.plugin:$KOTLIN_VERSION,"
 ARTIFACTS_TO_DOWNLOAD+="org.jetbrains.kotlin:kotlin-serialization-compiler-plugin-embeddable:$KOTLIN_VERSION,"
@@ -29,6 +30,7 @@ ARTIFACTS_TO_DOWNLOAD+="org.jetbrains.kotlin:kotlin-annotation-processing-gradle
 ARTIFACTS_TO_DOWNLOAD+="org.jetbrains.kotlin:kotlin-parcelize-compiler:$KOTLIN_VERSION,"
 ARTIFACTS_TO_DOWNLOAD+="org.jetbrains.kotlin:kotlin-bom:$KOTLIN_VERSION,"
 ARTIFACTS_TO_DOWNLOAD+="org.jetbrains.kotlin:kotlin-reflect:$KOTLIN_VERSION,"
+ARTIFACTS_TO_DOWNLOAD+="org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:$KOTLIN_VERSION,"
 
 ./development/importMaven/importMaven.sh "$ALLOW_JETBRAINS_DEV" "$ARTIFACTS_TO_DOWNLOAD"
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index cd86e73d797..4f17c0aeec9 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -41,14 +41,14 @@ incap = "0.2"
 jcodec = "0.2.5"
 kotlin17 = "1.7.10"
 kotlin18 = "1.8.22"
-kotlin19 = "1.9.23"
-kotlin = "1.9.23"
+kotlin19 = "1.9.24"
+kotlin = "1.9.24"
 kotlinBenchmark = "0.4.8"
-kotlinNative = "1.9.23"
+kotlinNative = "1.9.24"
 kotlinCompileTesting = "1.4.9"
 kotlinCoroutines = "1.7.3"
 kotlinSerialization = "1.6.3"
-ksp = "1.9.23-1.0.19"
+ksp = "1.9.24-1.0.20"
 ktfmt = "0.45"
 ktlint = "0.49.1"
 leakcanary = "2.13"
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index ccbb1ddcb56..1c09ef253f8 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -489,19 +489,19 @@
       </trusted-keys>
    </configuration>
    <components>
-      <component group="" name="kotlin-native-prebuilt-linux-x86_64" version="1.9.23">
-         <artifact name="kotlin-native-prebuilt-linux-x86_64-1.9.23.tar.gz">
-            <sha256 value="ffab3a3c870bbc99770ce3971e04823cc7a7d215fee0eb496ea4af1df7e90e19" origin="Hand-built using sha256sum kotlin-native-prebuilt-linux-x86_64-1.9.23.tar.gz" reason="https://youtrack.jetbrains.com/issue/KT-52483"/>
+      <component group="" name="kotlin-native-prebuilt-linux-x86_64" version="1.9.24">
+         <artifact name="kotlin-native-prebuilt-linux-x86_64-1.9.24.tar.gz">
+            <sha256 value="846d29584d806a1073cec7eec21a8bb21326c6755d2df224d173a3d07682e6d7" origin="Hand-built using sha256sum kotlin-native-prebuilt-linux-x86_64-1.9.24.tar.gz" reason="https://youtrack.jetbrains.com/issue/KT-52483"/>
          </artifact>
       </component>
-      <component group="" name="kotlin-native-prebuilt-macos-aarch64" version="1.9.23">
-         <artifact name="kotlin-native-prebuilt-macos-aarch64-1.9.23.tar.gz">
-            <sha256 value="9a3a9e94ac63b66477896b79a398a5dd84517054c848191edb18954443428b5a" origin="Hand-built using sha256sum kotlin-native-prebuilt-macos-aarch64-1.9.23.tar.gz" reason="https://youtrack.jetbrains.com/issue/KT-52483"/>
+      <component group="" name="kotlin-native-prebuilt-macos-aarch64" version="1.9.24">
+         <artifact name="kotlin-native-prebuilt-macos-aarch64-1.9.24.tar.gz">
+            <sha256 value="8f8958895ae83bb84f5d558feefc8be1cb38721af3ea3a4984cb15f576b1025b" origin="Hand-built using sha256sum kotlin-native-prebuilt-macos-aarch64-1.9.24.tar.gz" reason="https://youtrack.jetbrains.com/issue/KT-52483"/>
          </artifact>
       </component>
-      <component group="" name="kotlin-native-prebuilt-macos-x86_64" version="1.9.23">
-         <artifact name="kotlin-native-prebuilt-macos-x86_64-1.9.23.tar.gz">
-            <sha256 value="dd50c2e01db9e7232eed72c8de391a5016e8ef8edab4f5fdbd679034852e72b5" origin="Hand-built using sha256sum kotlin-native-prebuilt-macos-x86_64-1.9.23.tar.gz" reason="https://youtrack.jetbrains.com/issue/KT-52483"/>
+      <component group="" name="kotlin-native-prebuilt-macos-x86_64" version="1.9.24">
+         <artifact name="kotlin-native-prebuilt-macos-x86_64-1.9.24.tar.gz">
+            <sha256 value="772ebe7d8ad6847daf3441dc37792c2ac1d7f987702c5067e16b05825b90be03" origin="Hand-built using sha256sum kotlin-native-prebuilt-macos-x86_64-1.9.24.tar.gz" reason="https://youtrack.jetbrains.com/issue/KT-52483"/>
          </artifact>
       </component>
       <component group="aopalliance" name="aopalliance" version="1.0">