Compose Multiplatform 1.6.0-alpha01

joreilly · Dec 6, 2023 · 85da81c · 85da81c
1 parent ba4d531
commit 85da81c
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 74 deletions.
diff --git a/compose-desktop/build.gradle.kts b/compose-desktop/build.gradle.kts
@@ -18,8 +18,3 @@ dependencies {
 application {
     mainClass.set("MainKt")
 }
-
-compose {
-    kotlinCompilerPlugin.set(libs.versions.jbComposeCompiler)
-    kotlinCompilerPluginArgs.add("suppressKotlinVersionCompatibilityCheck=${libs.versions.kotlin}")
-}
diff --git a/compose-web-wasm/build.gradle.kts b/compose-web-wasm/build.gradle.kts
@@ -16,20 +16,6 @@ kotlin {
         browser {
             commonWebpackConfig {
                 outputFileName = "peopleinspace.js"
-                devServer = (devServer ?: KotlinWebpackConfig.DevServer()).copy(
-//                    open = mapOf(
-//                        "app" to mapOf(
-//                            "name" to "google chrome canary",
-//                            "arguments" to listOf("--js-flags=--experimental-wasm-gc ")
-//                        )
-//                    ),
-                    static = (devServer?.static ?: mutableListOf()).apply {
-                        // Serve sources to debug inside browser
-                        add(project.rootDir.path)
-                        add(project.rootDir.path + "/common/")
-                        add(project.rootDir.path + "/compose-web-wasm/")
-                    },
-                    )
             }
         }
         binaries.executable()
@@ -58,8 +44,3 @@ kotlin {
 compose.experimental {
     web.application {}
 }
-
-compose {
-    kotlinCompilerPlugin.set(libs.versions.jbComposeCompiler)
-    kotlinCompilerPluginArgs.add("suppressKotlinVersionCompatibilityCheck=${libs.versions.kotlin}")
-}
diff --git a/compose-web-wasm/src/wasmJsMain/resources/load.mjs b/compose-web-wasm/src/wasmJsMain/resources/load.mjs
diff --git a/compose-web-wasm/webpack.config.d/boilerplate.js b/compose-web-wasm/webpack.config.d/boilerplate.js
diff --git a/compose-web-wasm/webpack.config.d/cleanupSourcemap.js b/compose-web-wasm/webpack.config.d/cleanupSourcemap.js
diff --git a/gradle.properties b/gradle.properties
@@ -34,4 +34,6 @@ org.jetbrains.compose.experimental.uikit.enabled=true
 kotlin.mpp.stability.nowarn=true
 kotlin.mpp.androidSourceSetLayoutVersion=2
 
-kotlin.experimental.tryK2=true
+kotlin.experimental.tryK2=true
+
+org.jetbrains.compose.experimental.wasm.enabled=true
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -22,7 +22,7 @@ androidxLifecycle = "2.6.2"
 imageLoader = "1.7.1"
 osmdroidAndroid = "6.1.17"
 
-composeMultiplatform = "1.5.10-dev-wasm02"
+composeMultiplatform = "1.6.0-alpha01"
 accompanist = "0.32.0"
 coilCompose = "2.5.0"
 horologist = "0.5.10"