Update Kotlin version in components, tutorials and examples to 2.1.0 (#…

…5205)
JetBrains · Jan 21, 2025 · 50b5708 · 50b5708
1 parent 8be4ab8
commit 50b5708
Show file tree

Hide file tree

Showing 57 changed files with 1,158 additions and 1,798 deletions.
diff --git a/ci/compose-uber-jar/gradle.properties b/ci/compose-uber-jar/gradle.properties
@@ -1,2 +1,2 @@
-compose.version=1.7.1
+compose.version=1.7.3
 kotlin.code.style=official
diff --git a/ci/templates/desktop-template/gradle.properties b/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.0.20
-compose.version=1.7.1
+kotlin.version=2.1.0
+compose.version=1.7.3
diff --git a/ci/templates/html-library-template/gradle.properties b/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.0.20
-compose.version=1.7.1
+kotlin.version=2.1.0
+compose.version=1.7.3
diff --git a/ci/templates/html-library-template/gradle/wrapper/gradle-wrapper.properties b/ci/templates/html-library-template/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/ci/templates/multiplatform-template/gradle.properties b/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.0.20
+kotlin.version=2.1.0
 agp.version=8.1.0
-compose.version=1.7.1
+compose.version=1.7.3
diff --git a/components/AnimatedImage/demo/build.gradle.kts b/components/AnimatedImage/demo/build.gradle.kts
@@ -1,6 +1,7 @@
 plugins {
     kotlin("multiplatform")
     id("org.jetbrains.compose")
+    id("org.jetbrains.kotlin.plugin.compose")
 }
 
 kotlin {

diff --git a/components/AnimatedImage/library/build.gradle.kts b/components/AnimatedImage/library/build.gradle.kts
@@ -1,6 +1,7 @@
 plugins {
     kotlin("multiplatform")
     id("org.jetbrains.compose")
+    id("org.jetbrains.kotlin.plugin.compose")
     id("maven-publish")
 }
 

diff --git a/components/SplitPane/demo/build.gradle.kts b/components/SplitPane/demo/build.gradle.kts
@@ -1,6 +1,7 @@
 plugins {
     kotlin("multiplatform")
     id("org.jetbrains.compose")
+    id("org.jetbrains.kotlin.plugin.compose")
 }
 
 kotlin {

diff --git a/components/SplitPane/library/build.gradle.kts b/components/SplitPane/library/build.gradle.kts
@@ -1,6 +1,7 @@
 plugins {
     kotlin("multiplatform")
     id("org.jetbrains.compose")
+    id("org.jetbrains.kotlin.plugin.compose")
     id("maven-publish")
 }
 

diff --git a/components/gradle.properties b/components/gradle.properties
@@ -7,7 +7,7 @@ org.gradle.configuration-cache=true
 android.useAndroidX=true
 
 #Versions
-kotlin.version=1.9.24
+kotlin.version=2.1.0
 agp.version=8.2.2
 compose.version=1.8.0-alpha01
 deploy.version=0.1.0-SNAPSHOT

diff --git a/components/resources/demo/androidApp/build.gradle.kts b/components/resources/demo/androidApp/build.gradle.kts
@@ -2,6 +2,7 @@ plugins {
     id("com.android.application")
     kotlin("android")
     id("org.jetbrains.compose")
+    id("org.jetbrains.kotlin.plugin.compose")
 }
 
 android {

diff --git a/components/resources/demo/desktopApp/build.gradle.kts b/components/resources/demo/desktopApp/build.gradle.kts
@@ -1,6 +1,7 @@
 plugins {
     kotlin("multiplatform")
     id("org.jetbrains.compose")
+    id("org.jetbrains.kotlin.plugin.compose")
 }
 
 kotlin {

diff --git a/components/resources/demo/shared/build.gradle.kts b/components/resources/demo/shared/build.gradle.kts
@@ -4,6 +4,7 @@ plugins {
     kotlin("multiplatform")
     id("com.android.library")
     id("org.jetbrains.compose")
+    id("org.jetbrains.kotlin.plugin.compose")
 }
 
 kotlin {

diff --git a/components/resources/library/build.gradle.kts b/components/resources/library/build.gradle.kts
@@ -5,6 +5,7 @@ import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
 plugins {
     kotlin("multiplatform")
     id("org.jetbrains.compose")
+    id("org.jetbrains.kotlin.plugin.compose")
     id("maven-publish")
     id("com.android.library")
     id("org.jetbrains.kotlinx.binary-compatibility-validator")

diff --git a/components/settings.gradle.kts b/components/settings.gradle.kts
@@ -12,9 +12,10 @@ pluginManagement {
     plugins {
         kotlin("jvm").version(extra["kotlin.version"] as String)
         kotlin("multiplatform").version(extra["kotlin.version"] as String)
+        id("org.jetbrains.kotlin.plugin.compose").version(extra["kotlin.version"] as String)
         id("org.jetbrains.compose").version(extra["compose.version"] as String)
         id("com.android.library").version(extra["agp.version"] as String)
-        id("org.jetbrains.kotlinx.binary-compatibility-validator").version("0.15.0-Beta.2")
+        id("org.jetbrains.kotlinx.binary-compatibility-validator").version("0.17.0")
     }
 
     val gradlePluginDir = rootDir.resolve("../gradle-plugins")

diff --git a/components/ui-tooling-preview/demo/desktopApp/build.gradle.kts b/components/ui-tooling-preview/demo/desktopApp/build.gradle.kts
@@ -1,6 +1,7 @@
 plugins {
     kotlin("multiplatform")
     id("org.jetbrains.compose")
+    id("org.jetbrains.kotlin.plugin.compose")
 }
 
 kotlin {

diff --git a/components/ui-tooling-preview/demo/shared/build.gradle.kts b/components/ui-tooling-preview/demo/shared/build.gradle.kts
@@ -2,6 +2,7 @@ plugins {
     kotlin("multiplatform")
     id("com.android.library")
     id("org.jetbrains.compose")
+    id("org.jetbrains.kotlin.plugin.compose")
 }
 
 kotlin {

diff --git a/examples/chat/gradle.properties b/examples/chat/gradle.properties
@@ -10,6 +10,6 @@ kotlin.native.useEmbeddableCompilerJar=true
 kotlin.mpp.androidSourceSetLayoutVersion=2
 # Enable kotlin/native experimental memory model
 kotlin.native.binary.memoryModel=experimental
-kotlin.version=2.0.20
+kotlin.version=2.1.0
 agp.version=8.5.0
-compose.version=1.7.1
+compose.version=1.7.3
diff --git a/examples/cocoapods-ios-example/gradle.properties b/examples/cocoapods-ios-example/gradle.properties
@@ -20,6 +20,6 @@ android.minSdk=24
 #Compose
 
 #Versions
-kotlin.version=2.0.20
+kotlin.version=2.1.0
 agp.version=8.5.0
-compose.version=1.7.1
+compose.version=1.7.3
diff --git a/examples/codeviewer/gradle.properties b/examples/codeviewer/gradle.properties
@@ -10,6 +10,6 @@ kotlin.native.useEmbeddableCompilerJar=true
 kotlin.mpp.androidSourceSetLayoutVersion=2
 # Enable kotlin/native experimental memory model
 kotlin.native.binary.memoryModel=experimental
-kotlin.version=2.0.20
+kotlin.version=2.1.0
 agp.version=8.5.0
-compose.version=1.7.1
+compose.version=1.7.3
diff --git a/examples/graphics-2d/gradle.properties b/examples/graphics-2d/gradle.properties
@@ -10,9 +10,9 @@ kotlin.native.useEmbeddableCompilerJar=true
 kotlin.mpp.androidSourceSetLayoutVersion=2
 # Enable kotlin/native experimental memory model
 kotlin.native.binary.memoryModel=experimental
-kotlin.version=2.0.20
+kotlin.version=2.1.0
 agp.version=8.5.0
-compose.version=1.7.1
+compose.version=1.7.3
 
 # TODO: remove when switching to 1.9.10. See: https://youtrack.jetbrains.com/issue/KT-60852
 # usage: ./gradlew :jsApp:jsBrowserRun -Pworkaround.kotlin.js.kt60852=true

diff --git a/examples/html/compose-bird/build.gradle.kts b/examples/html/compose-bird/build.gradle.kts
@@ -25,7 +25,7 @@ kotlin {
             dependencies {
                 implementation(compose.html.core)
                 implementation(compose.runtime)
-                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.0-RC")
+                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.1")
             }
         }
     }

diff --git a/examples/html/compose-bird/gradle.properties b/examples/html/compose-bird/gradle.properties
@@ -1,5 +1,5 @@
 kotlin.code.style=official
-kotlin.version=2.0.20
-compose.version=1.7.1
+kotlin.version=2.1.0
+compose.version=1.7.3
 org.gradle.configuration-cache=true
 org.gradle.caching=true
diff --git a/examples/html/compose-in-js/gradle.properties b/examples/html/compose-in-js/gradle.properties
@@ -1,6 +1,6 @@
 kotlin.code.style=official
 kotlin.js.webpack.major.version=4
-kotlin.version=2.0.20
-compose.version=1.7.1
+kotlin.version=2.1.0
+compose.version=1.7.3
 org.gradle.configuration-cache=true
 org.gradle.caching=true
diff --git a/examples/html/landing/gradle.properties b/examples/html/landing/gradle.properties
@@ -1,5 +1,5 @@
 kotlin.code.style=official
-kotlin.version=2.0.20
-compose.version=1.7.1
+kotlin.version=2.1.0
+compose.version=1.7.3
 org.gradle.configuration-cache=true
 org.gradle.caching=true
diff --git a/examples/html/with-react/gradle.properties b/examples/html/with-react/gradle.properties
@@ -1,5 +1,5 @@
 kotlin.code.style=official
-kotlin.version=2.0.20
-compose.version=1.7.1
+kotlin.version=2.1.0
+compose.version=1.7.3
 org.gradle.configuration-cache=true
 org.gradle.caching=true
diff --git a/examples/imageviewer/gradle.properties b/examples/imageviewer/gradle.properties
@@ -7,7 +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
-org.jetbrains.compose.experimental.wasm.enabled=true
-kotlin.version=2.0.20
+kotlin.version=2.1.0
 agp.version=8.5.0
-compose.version=1.7.1
+compose.version=1.7.3