Chore: Kotlin 1.9.22 & Compose 1.6.0-beta01 (#81)

jordond · Jan 26, 2024 · 50080b4 · 50080b4
1 parent e1868de
commit 50080b4
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 114 deletions.
diff --git a/.run/demo.browser.run.xml b/.run/demo.browser.run.xml
@@ -10,15 +10,15 @@
       </option>
       <option name="taskNames">
         <list>
-          <option value=":demo:composeApp:jsBrowserDevelopmentRun" />
+          <option value=":demo:composeApp:wasmJsBrowserDevelopmentRun" />
         </list>
       </option>
       <option name="vmOptions" />
     </ExternalSystemSettings>
     <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
     <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
     <DebugAllEnabled>false</DebugAllEnabled>
-    <ForceTestExec>false</ForceTestExec>
+    <RunAsTest>false</RunAsTest>
     <method v="2" />
   </configuration>
 </component>
diff --git a/demo/README.md b/demo/README.md
@@ -49,5 +49,5 @@ To run the application on iPhone device/simulator:
 
 ### Browser
 
-Run the browser application: `./gradlew :composeApp:jsBrowserDevelopmentRun`
+Run the browser application: `./gradlew :composeApp:wasmJsBrowserDevelopmentRun`
 
diff --git a/demo/composeApp/build.gradle.kts b/demo/composeApp/build.gradle.kts
@@ -1,4 +1,5 @@
 import org.jetbrains.compose.desktop.application.dsl.TargetFormat
+import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
 
 plugins {
     alias(libs.plugins.multiplatform)
@@ -20,8 +21,14 @@ kotlin {
 
     jvm("desktop")
 
-    js {
-        browser()
+    @OptIn(ExperimentalWasmDsl::class)
+    wasmJs {
+        moduleName = "composeApp"
+        browser {
+            commonWebpackConfig {
+                outputFileName = "composeApp.js"
+            }
+        }
         binaries.executable()
     }
 
@@ -47,6 +54,7 @@ kotlin {
                 optIn("org.jetbrains.compose.resources.ExperimentalResourceApi")
             }
         }
+
         val commonMain by getting {
             dependencies {
                 implementation(compose.runtime)
@@ -83,12 +91,6 @@ kotlin {
             }
         }
 
-        val jsMain by getting {
-            dependencies {
-                implementation(compose.html.core)
-            }
-        }
-
         val iosMain by getting {
             dependencies {
             }

diff --git a/demo/composeApp/src/jsMain/kotlin/BrowserViewportWindow.kt b/demo/composeApp/src/jsMain/kotlin/BrowserViewportWindow.kt
diff --git a/demo/composeApp/src/jsMain/kotlin/main.kt b/demo/composeApp/src/jsMain/kotlin/main.kt
diff --git a/demo/composeApp/src/jsMain/resources/index.html b/demo/composeApp/src/jsMain/resources/index.html
diff --git a/demo/composeApp/src/wasmJsMain/kotlin/main.kt b/demo/composeApp/src/wasmJsMain/kotlin/main.kt
@@ -0,0 +1,8 @@
+import androidx.compose.ui.ExperimentalComposeUiApi
+import androidx.compose.ui.window.CanvasBasedWindow
+import com.materialkolor.demo.App
+
+@OptIn(ExperimentalComposeUiApi::class)
+fun main() {
+    CanvasBasedWindow(canvasElementId = "ComposeTarget") { App() }
+}
diff --git a/demo/composeApp/src/wasmJsMain/resources/index.html b/demo/composeApp/src/wasmJsMain/resources/index.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html lang="en">
+    <head>
+        <meta charset="UTF-8">
+        <title>MaterialKolor</title>
+        <script type="application/javascript" src="../../../build/compose/skiko-wasm/js/skiko.js"></script>
+        <script type="application/javascript" src="composeApp.js"></script>
+    </head>
+    <body>
+        <canvas id="ComposeTarget"></canvas>
+    </body>
+</html>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -49,5 +49,5 @@ To run the application on iPhone device/simulator:

		### Browser

		Run the browser application: `./gradlew :composeApp:jsBrowserDevelopmentRun`
		Run the browser application: `./gradlew :composeApp:wasmJsBrowserDevelopmentRun`