Update kotlin version in examples (#4844)

Changes:
- update all examples to Kotlin 2.0
- migrate to using kotlin("plugin.compose") for Compose compiler
configuration
- remove deprecated Compose Web gradle API usages

- added a workaround for
#4848 in
Jetsnack example

Testing:
- `./gradlew build` in every example
- run some examples in simulators (or desktop, browser)

(cherry picked from commit 4c01cbd)

ci/templates/desktop-template/build.gradle.kts

@@ -2,6 +2,7 @@ import org.jetbrains.compose.desktop.application.dsl.TargetFormat
 
 plugins {
     kotlin("jvm")
+    kotlin("plugin.compose")
     id("org.jetbrains.compose")
 }
 

ci/templates/desktop-template/gradle.properties

@@ -1,4 +1,4 @@
 org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 kotlin.code.style=official
-kotlin.version=1.9.23
-compose.version=1.6.2
+kotlin.version=2.0.0
+compose.version=1.6.10

ci/templates/desktop-template/settings.gradle.kts

@@ -6,6 +6,7 @@ pluginManagement {
 
     plugins {
         kotlin("jvm").version(extra["kotlin.version"] as String)
+        kotlin("plugin.compose").version(extra["kotlin.version"] as String)
         id("org.jetbrains.compose").version(extra["compose.version"] as String)
     }
 }

ci/templates/html-library-template/build.gradle.kts

@@ -3,6 +3,7 @@ import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension
 
 plugins {
     kotlin("multiplatform")
+    kotlin("plugin.compose")
     id("org.jetbrains.compose")
 }
 
@@ -30,12 +31,3 @@ kotlin {
     }
 }
 
-// a temporary workaround for a bug in jsRun invocation - see https://youtrack.jetbrains.com/issue/KT-48273
-afterEvaluate {
-    rootProject.extensions.configure<NodeJsRootExtension> {
-        nodeVersion = "16.0.0"
-        versions.webpackDevServer.version = "4.0.0"
-        versions.webpackCli.version = "4.10.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=1.9.23
-compose.version=1.6.2
+kotlin.version=2.0.0
+compose.version=1.6.10

ci/templates/html-library-template/settings.gradle.kts

@@ -6,6 +6,7 @@ pluginManagement {
 
     plugins {
         kotlin("multiplatform").version(extra["kotlin.version"] as String)
+        kotlin("plugin.compose").version(extra["kotlin.version"] as String)
         id("org.jetbrains.compose").version(extra["compose.version"] as String)
     }
 }

ci/templates/multiplatform-template/android/build.gradle.kts

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

ci/templates/multiplatform-template/build.gradle.kts

@@ -3,6 +3,7 @@ plugins {
     // in each subproject's classloader
     kotlin("jvm") apply false
     kotlin("multiplatform") apply false
+    kotlin("plugin.compose") apply false
     kotlin("android") apply false
     id("com.android.application") apply false
     id("com.android.library") apply false

ci/templates/multiplatform-template/common/build.gradle.kts

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

ci/templates/multiplatform-template/desktop/build.gradle.kts

@@ -3,6 +3,7 @@ import org.jetbrains.compose.desktop.application.dsl.TargetFormat
 plugins {
     kotlin("multiplatform") 
     id("org.jetbrains.compose")
+    kotlin("plugin.compose")
 }
 
 kotlin {

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=1.9.23
+kotlin.version=2.0.0
 agp.version=8.0.2
-compose.version=1.6.2
+compose.version=1.6.10

ci/templates/multiplatform-template/settings.gradle.kts

@@ -8,6 +8,7 @@ pluginManagement {
     plugins {
         kotlin("jvm").version(extra["kotlin.version"] as String)
         kotlin("multiplatform").version(extra["kotlin.version"] as String)
+        kotlin("plugin.compose").version(extra["kotlin.version"] as String)
         kotlin("android").version(extra["kotlin.version"] as String)
         id("com.android.application").version(extra["agp.version"] as String)
         id("com.android.library").version(extra["agp.version"] as String)

examples/chat/androidApp/build.gradle.kts

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

examples/chat/build.gradle.kts

@@ -3,6 +3,7 @@ plugins {
     // in each subproject's classloader
     kotlin("jvm") apply false
     kotlin("multiplatform") apply false
+    kotlin("plugin.compose") apply false
     kotlin("android") apply false
     id("com.android.application") apply false
     id("com.android.library") apply false

examples/chat/desktopApp/build.gradle.kts

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

examples/chat/gradle.properties

@@ -1,7 +1,7 @@
 kotlin.code.style=official
 xcodeproj=./iosApp
 android.useAndroidX=true
-org.gradle.jvmargs=-Xmx3g
+org.gradle.jvmargs=-Xmx8g
 org.gradle.configuration-cache=true
 org.gradle.caching=true
 org.jetbrains.compose.experimental.jscanvas.enabled=true
@@ -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=1.9.23
+kotlin.version=2.0.0
 agp.version=8.0.2
-compose.version=1.6.2
+compose.version=1.6.10

examples/chat/jsApp/build.gradle.kts

@@ -1,5 +1,6 @@
 plugins {
     kotlin("multiplatform")
+    kotlin("plugin.compose")
     id("org.jetbrains.compose")
 }
 
@@ -19,7 +20,3 @@ kotlin {
     }
 }
 
-compose.experimental {
-    web.application {}
-}
-

examples/chat/jsApp/src/jsMain/kotlin/main.js.kt

@@ -1,12 +1,14 @@
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.window.Window
+import androidx.compose.ui.window.CanvasBasedWindow
+import androidx.compose.ui.ExperimentalComposeUiApi
 import org.jetbrains.skiko.wasm.onWasmReady
 
+@OptIn(ExperimentalComposeUiApi::class)
 fun main() {
     onWasmReady {
-        Window("Chat") {
+        CanvasBasedWindow(title = "Chat") {
             Column(modifier = Modifier.fillMaxSize()) {
                 MainView()
             }

examples/chat/settings.gradle.kts

@@ -12,6 +12,7 @@ pluginManagement {
 
         kotlin("jvm").version(kotlinVersion)
         kotlin("multiplatform").version(kotlinVersion)
+        kotlin("plugin.compose").version(kotlinVersion)
         kotlin("android").version(kotlinVersion)
         id("com.android.base").version(agpVersion)
         id("com.android.application").version(agpVersion)

examples/chat/shared/build.gradle.kts

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

examples/cocoapods-ios-example/androidApp/build.gradle.kts

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

examples/cocoapods-ios-example/build.gradle.kts

@@ -2,6 +2,7 @@ plugins {
     // this is necessary to avoid the plugins to be loaded multiple times
     // in each subproject's classloader
     kotlin("multiplatform").apply(false)
+    kotlin("plugin.compose").apply(false)
     id("com.android.application").apply(false)
     id("com.android.library").apply(false)
     id("org.jetbrains.compose").apply(false)

examples/cocoapods-ios-example/gradle.properties

@@ -1,5 +1,5 @@
 #Gradle
-org.gradle.jvmargs=-Xmx2048M -Dkotlin.daemon.jvm.options\="-Xmx2048M"
+org.gradle.jvmargs=-Xmx8g -Dkotlin.daemon.jvm.options\="-Xmx8g"
 org.gradle.configuration-cache=true
 org.gradle.caching=true
 
@@ -20,6 +20,6 @@ android.minSdk=24
 #Compose
 
 #Versions
-kotlin.version=1.9.23
+kotlin.version=2.0.0
 agp.version=8.0.2
-compose.version=1.6.2
+compose.version=1.6.10

examples/cocoapods-ios-example/settings.gradle.kts

@@ -16,6 +16,7 @@ pluginManagement {
         val composeVersion = extra["compose.version"] as String
 
         kotlin("jvm").version(kotlinVersion)
+        kotlin("plugin.compose").version(kotlinVersion)
         kotlin("multiplatform").version(kotlinVersion)
         kotlin("android").version(kotlinVersion)
 

examples/cocoapods-ios-example/shared/build.gradle.kts

@@ -1,5 +1,6 @@
 plugins {
     kotlin("multiplatform")
+    kotlin("plugin.compose")
     kotlin("native.cocoapods")
     id("com.android.library")
     id("org.jetbrains.compose")

examples/codeviewer/androidApp/build.gradle.kts

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

examples/codeviewer/build.gradle.kts

@@ -3,6 +3,7 @@ plugins {
     // in each subproject's classloader
     kotlin("jvm") apply false
     kotlin("multiplatform") apply false
+    kotlin("plugin.compose") apply false
     kotlin("android") apply false
     id("com.android.application") apply false
     id("com.android.library") apply false

examples/codeviewer/desktopApp/build.gradle.kts

@@ -2,6 +2,7 @@ import org.jetbrains.compose.desktop.application.dsl.TargetFormat
 
 plugins {
     kotlin("multiplatform")
+    kotlin("plugin.compose")
     id("org.jetbrains.compose")
 }
 

examples/codeviewer/gradle.properties

@@ -1,7 +1,7 @@
 kotlin.code.style=official
 xcodeproj=./iosApp
 android.useAndroidX=true
-org.gradle.jvmargs=-Xmx3g
+org.gradle.jvmargs=-Xmx8g
 org.gradle.configuration-cache=true
 org.gradle.caching=true
 org.jetbrains.compose.experimental.jscanvas.enabled=true
@@ -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=1.9.23
+kotlin.version=2.0.0
 agp.version=8.0.2
-compose.version=1.6.2
+compose.version=1.6.10

examples/codeviewer/settings.gradle.kts

@@ -13,6 +13,7 @@ pluginManagement {
 
         kotlin("jvm").version(kotlinVersion)
         kotlin("multiplatform").version(kotlinVersion)
+        kotlin("plugin.compose").version(kotlinVersion)
         kotlin("android").version(kotlinVersion)
         id("com.android.base").version(agpVersion)
         id("com.android.application").version(agpVersion)

examples/codeviewer/shared/build.gradle.kts

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