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

ci/compose-uber-jar/gradle.properties

@@ -1,2 +1,2 @@
-compose.version=1.7.1
+compose.version=1.7.3
 kotlin.code.style=official

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
+kotlin.version=2.1.0
-compose.version=1.7.1
+compose.version=1.7.3

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
+kotlin.version=2.1.0
-compose.version=1.7.1
+compose.version=1.7.3

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

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

components/AnimatedImage/demo/build.gradle.kts

@@ -1,6 +1,7 @@
 plugins {
     kotlin("multiplatform")
     id("org.jetbrains.compose")
+    id("org.jetbrains.kotlin.plugin.compose")
 }
 
 kotlin {

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")
 }
 

components/SplitPane/demo/build.gradle.kts

@@ -1,6 +1,7 @@
 plugins {
     kotlin("multiplatform")
     id("org.jetbrains.compose")
+    id("org.jetbrains.kotlin.plugin.compose")
 }
 
 kotlin {

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")
 }
 

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

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 {

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 {

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 {

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")

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")

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 {

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 {

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

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

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

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

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")
             }
         }
     }

examples/html/compose-bird/gradle.properties

@@ -1,5 +1,5 @@
 kotlin.code.style=official
-kotlin.version=2.0.20
+kotlin.version=2.1.0
-compose.version=1.7.1
+compose.version=1.7.3
 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.0.20
+kotlin.version=2.1.0
-compose.version=1.7.1
+compose.version=1.7.3
 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.0.20
+kotlin.version=2.1.0
-compose.version=1.7.1
+compose.version=1.7.3
 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.0.20
+kotlin.version=2.1.0
-compose.version=1.7.1
+compose.version=1.7.3
 org.gradle.configuration-cache=true
 org.gradle.caching=true

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.1.0
-kotlin.version=2.0.20
 agp.version=8.5.0
-compose.version=1.7.1
+compose.version=1.7.3

examples/intellij-plugin/gradle.properties

@@ -1,5 +1,5 @@
 kotlin.code.style=official
-kotlin.version=2.0.20
+kotlin.version=2.1.0
-compose.version=1.7.1
+compose.version=1.7.3
 org.gradle.configuration-cache=true
 org.gradle.caching=true

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.0.20
+kotlin.version=2.1.0
-compose.version=1.7.1
+compose.version=1.7.3

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

@@ -3,5 +3,5 @@ xcodeproj=./iosApp
 org.gradle.jvmargs=-Xmx3g
 # Enable kotlin/native experimental memory model
 kotlin.native.binary.memoryModel=experimental
-kotlin.version=2.0.20
+kotlin.version=2.1.0
-compose.version=1.7.1
+compose.version=1.7.3

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

@@ -3,5 +3,5 @@ xcodeproj=./iosApp
 org.gradle.jvmargs=-Xmx3g
 # Enable kotlin/native experimental memory model
 kotlin.native.binary.memoryModel=experimental
-kotlin.version=2.0.20
+kotlin.version=2.1.0
-compose.version=1.7.1
+compose.version=1.7.3

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

@@ -3,5 +3,5 @@ xcodeproj=./iosApp
 org.gradle.jvmargs=-Xmx3g
 # Enable kotlin/native experimental memory model
 kotlin.native.binary.memoryModel=experimental
-kotlin.version=2.0.20
+kotlin.version=2.1.0
-compose.version=1.7.1
+compose.version=1.7.3

examples/issues/common/build.gradle.kts

@@ -7,7 +7,7 @@ plugins {
 }
 
 kotlin {
-    android()
+    androidTarget()
     jvm("desktop")
 
     sourceSets {

examples/issues/gradle.properties

@@ -19,6 +19,6 @@ kotlin.code.style=official
 android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
 android.enableJetifier=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

examples/jetsnack/gradle.properties

@@ -2,5 +2,5 @@ org.gradle.jvmargs=-Xmx8g
 kotlin.code.style=official
 android.useAndroidX=true
 agp.version=8.5.0
-kotlin.version=2.0.20
+kotlin.version=2.1.0
-compose.version=1.7.1
+compose.version=1.7.3

examples/nav_cupcake/gradle/libs.versions.toml

@@ -9,7 +9,7 @@ androidx-navigation = "2.7.0-alpha06"
 compose-android = "1.6.7"
 compose-multiplatform = "1.7.0"
 junit = "4.13.2"
-kotlin = "2.0.20"
+kotlin = "2.1.0"
 kotlinx-datetime = "0.6.0"
 
 [libraries]

examples/notepad/gradle.properties

@@ -1,6 +1,6 @@
 org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 kotlin.code.style=official
-kotlin.version=2.0.20
+kotlin.version=2.1.0
-compose.version=1.7.1
+compose.version=1.7.3
 org.gradle.configuration-cache=true
 org.gradle.caching=true

examples/todoapp-lite/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

examples/widgets-gallery/gradle.properties

@@ -10,7 +10,7 @@ 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
 # Replace this with release version when it comes out
-compose.version=1.7.1
+compose.version=1.7.3

gradle-plugins/gradle.properties

@@ -10,7 +10,7 @@ dev.junit.parallel=false
 # Default version of Compose Libraries used by Gradle plugin
 compose.version=1.8.0-alpha01
 # The latest version of Kotlin compatible with compose.tests.compiler.version. Used only in tests/CI.
-compose.tests.kotlin.version=2.0.0
+compose.tests.kotlin.version=2.1.0
 # __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/benchmark-core/build.gradle.kts

@@ -3,6 +3,7 @@ import org.jetbrains.compose.gradle.standardConf
 plugins {
     id("org.jetbrains.kotlin.multiplatform")
     id("org.jetbrains.compose")
+    id("org.jetbrains.kotlin.plugin.compose")
 }
 
 

html/build.gradle.kts

@@ -25,11 +25,6 @@ tasks.register("printBundleSize") {
     )
 }
 
-// see https://youtrack.jetbrains.com/issue/KT-49109#focus=Comments-27-5381158.0-0
-rootProject.plugins.withType<org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin> {
-    rootProject.the<org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension>().nodeVersion = "16.13.1"
-}
-
 subprojects {
     apply(plugin = "maven-publish")
 

html/buildSrc/gradle.properties

@@ -1 +1 @@
-kotlin.version=1.9.21
+kotlin.version=2.1.0

html/compose-compiler-integration/build.gradle.kts

@@ -3,6 +3,7 @@ import org.jetbrains.compose.gradle.standardConf
 plugins {
     kotlin("multiplatform")
     id("org.jetbrains.compose")
+    id("org.jetbrains.kotlin.plugin.compose")
 }
 
 

html/compose-compiler-integration/lib/build.gradle.kts

@@ -1,6 +1,7 @@
 plugins {
     kotlin("multiplatform")
     id("org.jetbrains.compose")
+    id("org.jetbrains.kotlin.plugin.compose")
 }
 
 repositories {

html/core/build.gradle.kts

@@ -3,6 +3,7 @@ import org.jetbrains.compose.gradle.standardConf
 plugins {
     kotlin("multiplatform")
     id("org.jetbrains.compose")
+    id("org.jetbrains.kotlin.plugin.compose")
 }
 
 

html/gradle.properties

@@ -1,4 +1,4 @@
-compose.version=1.6.0-alpha01
+compose.version=1.7.3
 compose.web.buildSamples=false
 compose.web.tests.integration.withFirefox
 compose.web.tests.skip.benchmarks=false

html/integration-core/build.gradle.kts

@@ -3,6 +3,7 @@ import org.jetbrains.compose.gradle.standardConf
 plugins {
     kotlin("multiplatform")
     id("org.jetbrains.compose")
+    id("org.jetbrains.kotlin.plugin.compose")
 }
 
 val integrationTestsEnabled: Boolean = project.properties.getValue("integrationTestsEnabled") == "true"

html/internal-html-core-runtime/build.gradle.kts

@@ -3,6 +3,7 @@ import org.jetbrains.compose.gradle.standardConf
 plugins {
     kotlin("multiplatform")
     id("org.jetbrains.compose")
+    id("org.jetbrains.kotlin.plugin.compose")
 }
 
 

html/settings.gradle.kts

@@ -20,6 +20,9 @@ pluginManagement {
 
     val repos = (localProperties?.getProperty("compose.web.repos"))?.split(File.pathSeparator)
 
+    val buildSrcProperties: java.util.Properties = properties(rootProject.projectDir.resolve("buildSrc/gradle.properties").absolutePath)!!
+    val kotlinVersion = buildSrcProperties["kotlin.version"] as String
+
     repositories {
         gradlePluginPortal()
         mavenCentral()
@@ -44,6 +47,9 @@ pluginManagement {
             if (requested.id.id == "org.jetbrains.compose") {
                 useModule("org.jetbrains.compose:org.jetbrains.compose.gradle.plugin:$COMPOSE_CORE_VERSION")
             }
+            if (requested.id.id == "org.jetbrains.kotlin.plugin.compose") {
+                useVersion(kotlinVersion)
+            }
         }
     }
 }

html/svg/build.gradle.kts

@@ -3,6 +3,7 @@ import org.jetbrains.compose.gradle.standardConf
 plugins {
     kotlin("multiplatform")
     id("org.jetbrains.compose")
+    id("org.jetbrains.kotlin.plugin.compose")
 }
 
 

html/test-utils/build.gradle.kts

@@ -3,6 +3,7 @@ import org.jetbrains.compose.gradle.standardConf
 plugins {
     kotlin("multiplatform")
     id("org.jetbrains.compose")
+    id("org.jetbrains.kotlin.plugin.compose")
 }
 
 

tutorials/HTML/Getting_Started/README.md

@@ -36,8 +36,8 @@ pluginManagement {
 ``` kotlin
 // Add compose gradle plugin
 plugins {
-    kotlin("multiplatform") version "2.0.20"
+    kotlin("multiplatform") version "2.1.0"
-    id("org.jetbrains.compose") version "1.7.1"
+    id("org.jetbrains.compose") version "1.7.3"
 }
 
 // Add maven repositories