Upgrade to Kotlin 2.4.20

ci/templates/desktop-template/gradle.properties

@@ -1,4 +1,4 @@
 org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 kotlin.code.style=official
-kotlin.version=2.4.10
+kotlin.version=2.4.20
 compose.version=1.12.0

ci/templates/html-library-template/gradle.properties

@@ -1,4 +1,4 @@
 org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 kotlin.code.style=official
-kotlin.version=2.4.10
+kotlin.version=2.4.20
 compose.version=1.12.0

ci/templates/maven-test-project/pom.xml

@@ -12,7 +12,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <kotlin.code.style>official</kotlin.code.style>
         <kotlin.compiler.jvmTarget>11</kotlin.compiler.jvmTarget>
-        <kotlin.version>2.4.10</kotlin.version>
+        <kotlin.version>2.4.20</kotlin.version>
         <compose.version>1.12.0</compose.version>
         <compose.material3.version>1.9.0</compose.material3.version>
     </properties>

ci/templates/multiplatform-template/gradle.properties

@@ -2,6 +2,6 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 android.useAndroidX=true
 android.enableJetifier=true
 kotlin.code.style=official
-kotlin.version=2.4.10
+kotlin.version=2.4.20
 agp.version=8.9.0
 compose.version=1.12.0

components/gradle.properties

@@ -7,7 +7,7 @@ org.gradle.configuration-cache=true
 android.useAndroidX=true
 
 #Versions
-kotlin.version=2.3.20
+kotlin.version=2.4.20
 agp.version=9.1.1
 compose.version=1.12.10-alpha01+dev4472
 deploy.version=9999.0.0-SNAPSHOT

examples/chat/gradle.properties

@@ -5,6 +5,6 @@ org.gradle.jvmargs=-Xmx8g
 org.gradle.configuration-cache=true
 org.gradle.caching=true
 org.jetbrains.compose.experimental.macos.enabled=true
-kotlin.version=2.4.10
+kotlin.version=2.4.20
 agp.version=9.2.1
 compose.version=1.12.0

examples/codeviewer/gradle.properties

@@ -5,6 +5,6 @@ org.gradle.jvmargs=-Xmx8g
 org.gradle.configuration-cache=true
 org.gradle.caching=true
 org.jetbrains.compose.experimental.macos.enabled=true
-kotlin.version=2.4.10
+kotlin.version=2.4.20
 agp.version=9.2.1
 compose.version=1.12.0

examples/graphics-2d/gradle.properties

@@ -5,6 +5,6 @@ org.gradle.jvmargs=-Xmx8g
 org.gradle.configuration-cache=true
 org.gradle.caching=true
 org.jetbrains.compose.experimental.macos.enabled=true
-kotlin.version=2.4.10
+kotlin.version=2.4.20
 agp.version=9.2.1
 compose.version=1.12.0

examples/html/compose-bird/gradle.properties

@@ -1,5 +1,5 @@
 kotlin.code.style=official
-kotlin.version=2.4.10
+kotlin.version=2.4.20
 compose.version=1.12.0
 org.gradle.configuration-cache=true
 org.gradle.caching=true

examples/html/compose-in-js/gradle.properties

@@ -1,6 +1,6 @@
 kotlin.code.style=official
 kotlin.js.webpack.major.version=4
-kotlin.version=2.4.10
+kotlin.version=2.4.20
 compose.version=1.12.0
 org.gradle.configuration-cache=true
 org.gradle.caching=true

examples/html/landing/gradle.properties

@@ -1,5 +1,5 @@
 kotlin.code.style=official
-kotlin.version=2.4.10
+kotlin.version=2.4.20
 compose.version=1.12.0
 org.gradle.configuration-cache=true
 org.gradle.caching=true

examples/html/with-react/gradle.properties

@@ -1,5 +1,5 @@
 kotlin.code.style=official
-kotlin.version=2.4.10
+kotlin.version=2.4.20
 compose.version=1.12.0
 org.gradle.configuration-cache=true
 org.gradle.caching=true

examples/imageviewer/gradle.properties

@@ -7,6 +7,6 @@ org.gradle.configuration-cache=true
 org.gradle.caching=true
 org.jetbrains.compose.experimental.jscanvas.enabled=true
 org.jetbrains.compose.experimental.macos.enabled=true
-kotlin.version=2.4.10
+kotlin.version=2.4.20
 agp.version=9.1.1
 compose.version=1.12.0

examples/interop/ios-compose-in-swiftui/gradle.properties

@@ -1,5 +1,5 @@
 kotlin.code.style=official
 xcodeproj=./iosApp
 org.gradle.jvmargs=-Xmx3g
-kotlin.version=2.4.10
+kotlin.version=2.4.20
 compose.version=1.12.0

examples/interop/ios-compose-in-uikit/gradle.properties

@@ -1,5 +1,5 @@
 kotlin.code.style=official
 xcodeproj=./iosApp
 org.gradle.jvmargs=-Xmx3g
-kotlin.version=2.4.10
+kotlin.version=2.4.20
 compose.version=1.12.0

examples/interop/ios-swiftui-in-compose/gradle.properties

@@ -1,5 +1,5 @@
 kotlin.code.style=official
 xcodeproj=./iosApp
 org.gradle.jvmargs=-Xmx3g
-kotlin.version=2.4.10
+kotlin.version=2.4.20
 compose.version=1.12.0

examples/interop/ios-uikit-in-compose/gradle.properties

@@ -1,5 +1,5 @@
 kotlin.code.style=official
 xcodeproj=./iosApp
 org.gradle.jvmargs=-Xmx3g
-kotlin.version=2.4.10
+kotlin.version=2.4.20
 compose.version=1.12.0

examples/issues/gradle.properties

@@ -2,6 +2,6 @@ org.gradle.jvmargs=-Xmx2048m
 org.gradle.caching=true
 kotlin.code.style=official
 android.useAndroidX=true
-kotlin.version=2.4.10
+kotlin.version=2.4.20
 agp.version=9.2.1
 compose.version=1.12.0

examples/nav_cupcake/gradle.properties

@@ -2,6 +2,6 @@ kotlin.code.style=official
 android.useAndroidX=true
 org.gradle.jvmargs=-Xmx8g
 org.gradle.caching=true
-kotlin.version=2.4.10
+kotlin.version=2.4.20
 agp.version=9.2.1
 compose.version=1.12.0

gradle-plugins/compose/src/test/kotlin/org/jetbrains/compose/test/tests/integration/GradlePluginTest.kt

@@ -24,7 +24,6 @@ import java.net.SocketTimeoutException
 import java.util.concurrent.atomic.AtomicBoolean
 import java.util.concurrent.atomic.AtomicInteger
 import kotlin.concurrent.thread
-import kotlin.test.assertContentEquals
 import kotlin.test.assertFalse
 
 class GradlePluginTest : GradlePluginTestBase() {
@@ -99,14 +98,14 @@ class GradlePluginTest : GradlePluginTestBase() {
             }
         }
 
-    // Note: we can't test non-jvm targets with Kotlin older than 2.3.0, because of klib abi version bump in 2.3.0
-    private val oldestSupportedKotlinVersion = "2.3.0"
+    // Note: older version is fine for k/jvm, k/android projects
+    private val oldestSupportedKotlinJvmVersion = "2.3.0"
 
     @Test
     fun testOldestKotlinMpp() = with(
         testProject(
             "application/mpp",
-            testEnvironment = defaultTestEnvironment.copy(kotlinVersion = oldestSupportedKotlinVersion)
+            testEnvironment = defaultTestEnvironment.copy(kotlinVersion = oldestSupportedKotlinJvmVersion)
         )
     ) {
         val logLine = "Kotlin MPP app is running!"
@@ -116,11 +115,14 @@ class GradlePluginTest : GradlePluginTestBase() {
         }
     }
 
+    // Note: we can't test non-jvm targets with Kotlin older than 2.4.0, because of klib abi version bump in 2.4.0
+    private val oldestSupportedKotlinMultiplatformVersion = "2.4.0"
+
     @Test
     fun testOldestKotlinJsMpp() = with(
         testProject(
             "application/jsMpp",
-            testEnvironment = defaultTestEnvironment.copy(kotlinVersion = oldestSupportedKotlinVersion)
+            testEnvironment = defaultTestEnvironment.copy(kotlinVersion = oldestSupportedKotlinMultiplatformVersion)
         )
     ) {
         gradle(":compileKotlinJs").checks {

gradle-plugins/compose/src/test/test-projects/application/newAndroidTarget/build.gradle

@@ -6,8 +6,6 @@ plugins {
 }
 
 kotlin {
-    targetHierarchy.default()
-
     android {
         namespace = "com.google.samples.apps.diceroller.shared"
         compileSdk {

gradle-plugins/gradle.properties

@@ -11,7 +11,7 @@ dev.junit.parallel=false
 compose.version=1.12.10-alpha01+dev4472
 compose.material3.version=1.9.0
 # The latest version of Kotlin compatible with compose.tests.compiler.version. Used only in tests/CI.
-compose.tests.kotlin.version=2.3.20
+compose.tests.kotlin.version=2.4.20
 # __SUPPORTED_GRADLE_VERSIONS__
 # Don't forget to edit versions in .github/workflows/gradle-plugin.yml as well
 # and Publish.Subtasks.buildTypes.gradle.GradlePluginTestKt#gradleVersions in the TC config

html/.gitignore

@@ -0,0 +1,2 @@
+# Kotlin/JS generated Yarn stores at any directory depth
+kotlin-js-store/

html/buildSrc/gradle.properties

@@ -1 +1 @@
-kotlin.version=2.3.20
+kotlin.version=2.4.20

html/gradle.properties

@@ -2,7 +2,7 @@
 org.gradle.jvmargs=-Xmx8g
 
 #Versions
-compose.version=1.10.1
+compose.version=1.12.0
 
 #Compose
 compose.web.buildSamples=false