Update for k/wasm (#4009)

This a comanion PR to JetBrains/compose-multiplatform-core#914 Resources lib doesn't contain k/wasm target yet. It will be added in a separate PR --------- Co-authored-by: Oleksandr Karpovich <[email protected]>
JetBrains · Dec 8, 2023 · 93b5134 · 93b5134
1 parent dfaeced
commit 93b5134
Show file tree

Hide file tree

Showing 25 changed files with 309 additions and 445 deletions.
diff --git a/examples/html/compose-bird/build.gradle.kts b/examples/html/compose-bird/build.gradle.kts
@@ -24,6 +24,7 @@ kotlin {
             dependencies {
                 implementation(compose.html.core)
                 implementation(compose.runtime)
+                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.0-RC")
             }
         }
     }

diff --git a/...ugins/compose/src/main/kotlin/org/jetbrains/compose/ComposeCompilerKotlinSupportPlugin.kt b/...ugins/compose/src/main/kotlin/org/jetbrains/compose/ComposeCompilerKotlinSupportPlugin.kt
@@ -92,7 +92,8 @@ class ComposeCompilerKotlinSupportPlugin : KotlinCompilerPluginSupportPlugin {
     }
 
     private val platformPluginOptions = mapOf(
-        KotlinPlatformType.js to options("generateDecoys" to "true")
+        KotlinPlatformType.js to options("generateDecoys" to "false"),
+        KotlinPlatformType.wasm to options("generateDecoys" to "false")
     )
 
     private fun options(vararg options: Pair<String, String>): List<SubpluginOption> =

diff --git a/...e/src/main/kotlin/org/jetbrains/compose/experimental/internal/checkExperimentalTargets.kt b/...e/src/main/kotlin/org/jetbrains/compose/experimental/internal/checkExperimentalTargets.kt
@@ -27,6 +27,7 @@ private val TargetType.gradlePropertyName get() = "org.jetbrains.compose.experim
 private val EXPERIMENTAL_TARGETS: Set<TargetType> = setOf(
     TargetType("macos", presets = listOf("macosX64", "macosArm64")),
     TargetType("jscanvas", presets = listOf("jsIr", "js")),
+    TargetType("wasm", presets = listOf("wasm", "wasmJs")),
 )
 
 private sealed interface CheckResult {

diff --git a/...se/src/test/kotlin/org/jetbrains/compose/test/tests/integration/DesktopApplicationTest.kt b/...se/src/test/kotlin/org/jetbrains/compose/test/tests/integration/DesktopApplicationTest.kt
@@ -77,25 +77,25 @@ class DesktopApplicationTest : GradlePluginTestBase() {
     @Test
     fun testSettingLatestCompiler() = testProject(
         TestProjects.customCompiler, defaultTestEnvironment.copy(
-            kotlinVersion = "1.7.20",
-            composeCompilerPlugin = "dependencies.compiler.forKotlin(\"1.7.20\")",
+            kotlinVersion = "1.8.20",
+            composeCompilerPlugin = "dependencies.compiler.forKotlin(\"1.8.20\")",
         )
     ).checkCustomComposeCompiler()
 
     @Test
     fun testSettingAutoCompiler() = testProject(
         TestProjects.customCompiler, defaultTestEnvironment.copy(
-            kotlinVersion = "1.7.10",
+            kotlinVersion = "1.8.10",
             composeCompilerPlugin = "dependencies.compiler.auto",
         )
     ).checkCustomComposeCompiler()
 
     @Test
     fun testKotlinCheckDisabled() = testProject(
         TestProjects.customCompilerArgs, defaultTestEnvironment.copy(
-            kotlinVersion = "1.7.21",
-            composeCompilerPlugin = "dependencies.compiler.forKotlin(\"1.7.20\")",
-            composeCompilerArgs = "\"suppressKotlinVersionCompatibilityCheck=1.7.21\""
+            kotlinVersion = "1.9.21",
+            composeCompilerPlugin = "dependencies.compiler.forKotlin(\"1.9.20\")",
+            composeCompilerArgs = "\"suppressKotlinVersionCompatibilityCheck=1.9.21\""
         )
     ).checkCustomComposeCompiler(checkKJS = true)
 

diff --git a/.../compose/src/test/kotlin/org/jetbrains/compose/test/tests/integration/GradlePluginTest.kt b/.../compose/src/test/kotlin/org/jetbrains/compose/test/tests/integration/GradlePluginTest.kt
@@ -10,7 +10,9 @@ import org.jetbrains.compose.desktop.ui.tooling.preview.rpc.PreviewLogger
 import org.jetbrains.compose.desktop.ui.tooling.preview.rpc.RemoteConnection
 import org.jetbrains.compose.desktop.ui.tooling.preview.rpc.receiveConfigFromGradle
 import org.jetbrains.compose.experimental.internal.kotlinVersionNumbers
+import org.jetbrains.compose.internal.utils.Arch
 import org.jetbrains.compose.internal.utils.OS
+import org.jetbrains.compose.internal.utils.currentArch
 import org.jetbrains.compose.internal.utils.currentOS
 import org.jetbrains.compose.test.utils.*
 import org.junit.jupiter.api.Assumptions
@@ -122,16 +124,20 @@ class GradlePluginTest : GradlePluginTestBase() {
             defaultTestEnvironment.copy(kotlinVersion = kotlinVersion, useGradleConfigurationCache = false)
         )
 
-        val task = ":subproject:linkDebugFrameworkIosX64"
-        with(nativeCacheKindProject(kotlinVersion = TestKotlinVersions.v1_8_20)) {
+        val task = if (currentArch == Arch.X64) {
+            ":subproject:linkDebugFrameworkIosX64"
+        } else {
+            ":subproject:linkDebugFrameworkIosArm64"
+        }
+        with(nativeCacheKindProject(kotlinVersion = TestKotlinVersions.v1_9_0)) {
             gradle(task, "--info").checks {
                 check.taskSuccessful(task)
                 check.logDoesntContain("-Xauto-cache-from=")
             }
         }
         testWorkDir.deleteRecursively()
         testWorkDir.mkdirs()
-        with(nativeCacheKindProject(kotlinVersion = TestKotlinVersions.v1_9_0) ) {
+        with(nativeCacheKindProject(kotlinVersion = TestKotlinVersions.v1_9_10) ) {
             gradle(task, "--info").checks {
                 check.taskSuccessful(task)
                 check.logDoesntContain("-Xauto-cache-from=")
@@ -205,7 +211,7 @@ class GradlePluginTest : GradlePluginTestBase() {
             }
         }
 
-        testKotlinVersion(TestKotlinVersions.v1_9_20_Beta)
+        testKotlinVersion(TestKotlinVersions.v1_9_21)
     }
 
     @Test

diff --git a/...e/src/test/kotlin/org/jetbrains/compose/test/tests/integration/KotlinCompatibilityTest.kt b/...e/src/test/kotlin/org/jetbrains/compose/test/tests/integration/KotlinCompatibilityTest.kt
@@ -12,16 +12,16 @@ import org.junit.jupiter.api.Test
 
 class KotlinCompatibilityTest : GradlePluginTestBase() {
     @Test
-    fun testKotlinMpp_1_7_10() = testMpp("1.7.10")
+    fun testKotlinMpp_1_9_10() = testMpp("1.9.10")
 
     @Test
-    fun testKotlinJsMpp_1_7_10() = testJsMpp("1.7.10")
+    fun testKotlinJsMpp_1_9_10() = testJsMpp("1.9.10")
 
     @Test
-    fun testKotlinMpp_1_7_20() = testMpp("1.7.20")
+    fun testKotlinMpp_1_9_20() = testMpp("1.9.20")
 
     @Test
-    fun testKotlinJsMpp_1_7_20() = testJsMpp("1.7.20")
+    fun testKotlinJsMpp_1_9_20() = testJsMpp("1.9.20")
 
     private fun testMpp(kotlinVersion: String) = with(
         testProject(

diff --git a/...le-plugins/compose/src/test/kotlin/org/jetbrains/compose/test/utils/TestKotlinVersions.kt b/...le-plugins/compose/src/test/kotlin/org/jetbrains/compose/test/utils/TestKotlinVersions.kt
@@ -9,5 +9,7 @@ object TestKotlinVersions {
     val Default = TestProperties.composeCompilerCompatibleKotlinVersion
     val v1_8_20 = "1.8.20"
     val v1_9_0 = "1.9.0"
+    val v1_9_10 = "1.9.10"
     val v1_9_20_Beta = "1.9.20-Beta"
+    val v1_9_21 = "1.9.21"
 }
diff --git a/gradle-plugins/compose/src/test/test-projects/misc/commonResources/gradle.properties b/gradle-plugins/compose/src/test/test-projects/misc/commonResources/gradle.properties
@@ -1 +1,2 @@
+org.gradle.jvmargs=-Xmx8096M
 android.useAndroidX=true
diff --git a/gradle-plugins/compose/src/test/test-projects/misc/nativeCacheKind/gradle.properties b/gradle-plugins/compose/src/test/test-projects/misc/nativeCacheKind/gradle.properties
@@ -1 +1,2 @@
+org.gradle.jvmargs=-Xmx8096M
 org.jetbrains.compose.experimental.uikit.enabled=true
diff --git a/html/benchmark-core/build.gradle.kts b/html/benchmark-core/build.gradle.kts
@@ -23,6 +23,7 @@ kotlin {
                 implementation(compose.runtime)
                 implementation(project(":html-core"))
                 implementation(kotlin("stdlib-common"))
+                implementation(libs.kotlinx.coroutines.core)
             }
         }
 

diff --git a/html/build.gradle.kts b/html/build.gradle.kts
@@ -172,7 +172,7 @@ subprojects {
         configurations.all {
             resolutionStrategy.dependencySubstitution {
                 substitute(module("org.jetbrains.compose.html:html-core")).apply {
-                    with(project(":html-core"))
+                    using(project(":html-core"))
                 }
             }
         }

diff --git a/html/buildSrc/build.gradle.kts b/html/buildSrc/build.gradle.kts
@@ -15,8 +15,8 @@ plugins {
 
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
 }
 
 dependencies {

diff --git a/html/buildSrc/gradle.properties b/html/buildSrc/gradle.properties
@@ -1 +1 @@
-kotlin.version=1.8.21
+kotlin.version=1.9.21
diff --git a/html/compose-compiler-integration/build.gradle.kts b/html/compose-compiler-integration/build.gradle.kts
@@ -25,6 +25,7 @@ kotlin {
                 implementation(kotlin("stdlib-js"))
                 implementation(compose.runtime)
                 implementation(project(":html-core"))
+                implementation(libs.kotlinx.coroutines.core)
             }
         }
 

diff --git a/html/compose-compiler-integration/main-template/build.gradle.kts b/html/compose-compiler-integration/main-template/build.gradle.kts
@@ -22,6 +22,7 @@ kotlin {
                 implementation(kotlin("stdlib-common"))
                 implementation(compose.runtime)
                 implementation(project(":lib"))
+                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.0-RC")
             }
         }
     }

diff --git a/html/compose-compiler-integration/main-template/lib/build.gradle.kts b/html/compose-compiler-integration/main-template/lib/build.gradle.kts
@@ -21,6 +21,7 @@ kotlin {
             dependencies {
                 implementation(kotlin("stdlib-common"))
                 implementation(compose.runtime)
+                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.0-RC")
             }
         }
     }

diff --git a/html/core/build.gradle.kts b/html/core/build.gradle.kts
@@ -23,6 +23,7 @@ kotlin {
         val commonMain by getting {
             dependencies {
                 implementation(compose.runtime)
+                implementation(libs.kotlinx.coroutines.core)
             }
         }
 

diff --git a/html/gradle.properties b/html/gradle.properties
@@ -1,8 +1,8 @@
-compose.version=1.5.1
+compose.version=1.6.0-alpha01
 compose.web.buildSamples=false
 compose.web.tests.integration.withFirefox
 compose.web.tests.skip.benchmarks=false
 org.gradle.jvmargs=-Xmx8g
 
 # TODO: figure out why jvmTest (web driver tests) fail with timeout with kotlin 1.9.0
-integrationTestsEnabled=false
+integrationTestsEnabled=false
diff --git a/html/gradle/wrapper/gradle-wrapper.properties b/html/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/html/integration-core/build.gradle.kts b/html/integration-core/build.gradle.kts
@@ -39,6 +39,7 @@ kotlin {
                 implementation(compose.runtime)
                 implementation(project(":html-core"))
                 implementation(kotlin("stdlib-common"))
+                implementation(libs.kotlinx.coroutines.core)
             }
         }
 

diff --git a/html/internal-html-core-runtime/build.gradle.kts b/html/internal-html-core-runtime/build.gradle.kts
@@ -21,6 +21,7 @@ kotlin {
         val commonMain by getting {
             dependencies {
                 implementation(compose.runtime)
+                implementation(libs.kotlinx.coroutines.core)
             }
         }
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		org.gradle.jvmargs=-Xmx8096M
		android.useAndroidX=true
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		org.gradle.jvmargs=-Xmx8096M
		org.jetbrains.compose.experimental.uikit.enabled=true