WIP: Migrate to Kotlin JS

Ivy-Apps · Apr 23, 2024 · 2361862 · 2361862
1 parent e52fc43
commit 2361862
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 6 deletions.
diff --git a/.github/workflows/build_web.yml b/.github/workflows/build_web.yml
@@ -1,4 +1,4 @@
-name: Build Web (WASM)
+name: Build Web (Kotlin JS)
 
 on:
   push:
@@ -30,4 +30,4 @@ jobs:
             ${{ runner.os }}-gradle-
 
       - name: Build Web distribution
-        run: ./gradlew :composeApp:wasmJsBrowserDistribution
+        run: ./gradlew :composeApp:jsBrowserDistribution
diff --git a/.github/workflows/deploy_web_github_pages.yml b/.github/workflows/deploy_web_github_pages.yml
@@ -50,12 +50,12 @@ jobs:
             ${{ runner.os }}-gradle-
       
       - name: Build Web distribution
-        run: ./gradlew :composeApp:wasmJsBrowserDistribution
+        run: ./gradlew :composeApp:jsBrowserDistribution
 
       - name: Upload artifact
         uses: actions/upload-pages-artifact@v3
         with:
-          path: 'composeApp/build/dist/wasmJs/productionExecutable'
+          path: 'composeApp/build/dist/js/productionExecutable'
       - name: Deploy to GitHub Pages
         id: deployment
         uses: actions/deploy-pages@v4
diff --git a/buildSrc/src/main/kotlin/ivy.shared-module.gradle.kts b/buildSrc/src/main/kotlin/ivy.shared-module.gradle.kts
@@ -4,6 +4,13 @@ plugins {
 }
 
 kotlin {
+    js()
+    js {
+        browser {
+        }
+        binaries.executable()
+    }
+
     androidTarget {
         compilations.all {
             kotlinOptions {
@@ -17,7 +24,6 @@ kotlin {
     iosSimulatorArm64()
 
     jvm()
-    js()
 
     sourceSets {
         jvmTest.dependencies {

diff --git a/composeApp/build.gradle.kts b/composeApp/build.gradle.kts
@@ -7,6 +7,13 @@ plugins {
 }
 
 kotlin {
+    js()
+    js {
+        browser {
+        }
+        binaries.executable()
+    }
+
     androidTarget {
         compilations.all {
             kotlinOptions {

diff --git a/scripts/runWebApp.sh b/scripts/runWebApp.sh
@@ -11,4 +11,4 @@ if [ ! -f "settings.gradle.kts" ]; then
     exit 1
 fi
 
-./gradlew :composeApp:wasmJsBrowserDevelopmentRun
+./gradlew :composeApp:jsBrowserDevelopmentRun
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,4 +11,4 @@ if [ ! -f "settings.gradle.kts" ]; then @@
         exit 1
     fi
-    ./gradlew :composeApp:wasmJsBrowserDevelopmentRun
+    ./gradlew :composeApp:jsBrowserDevelopmentRun