add wasmJs support

hoc081098 · Feb 16, 2024 · cae673f · cae673f
1 parent 1f54638
commit cae673f
Show file tree

Hide file tree

Showing 9 changed files with 40 additions and 8 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -21,7 +21,7 @@ jobs:
   build:
     strategy:
       matrix:
-        os: [ macos-11 ]
+        os: [ macos-14 ]
     runs-on: ${{ matrix.os }}
     timeout-minutes: 45
     if: ${{ github.repository == 'hoc081098/kmp-viewmodel' }}
@@ -84,7 +84,7 @@ jobs:
     if: ${{ github.ref == 'refs/heads/master' && github.repository == 'hoc081098/kmp-viewmodel' }}
     strategy:
       matrix:
-        os: [ macos-11 ]
+        os: [ macos-14 ]
     runs-on: ${{ matrix.os }}
     timeout-minutes: 45
     steps:

diff --git a/README.md b/README.md
@@ -59,6 +59,7 @@ Liked some of my work? Buy me a coffee (or more likely a beer)
 > Because the `ViewModel.viewModelScope` depends on `Dispatchers.Main` provided by that libraries on Desktop.
 
 - `js` (`IR`).
+- `wasmJs`.
 - `Darwin` targets:
   - `iosArm64`, `iosX64`, `iosSimulatorArm64`.
   - `watchosArm32`, `watchosArm64`, `watchosX64`, `watchosSimulatorArm64`.

diff --git a/docs/multiplatform.md b/docs/multiplatform.md
@@ -14,6 +14,7 @@
 > Because the `ViewModel.viewModelScope` depends on `Dispatchers.Main` provided by that libraries on Desktop.
 
 - `js` (`IR`).
+- `wasmJs`.
 - `Darwin` targets:
   - `iosArm64`, `iosX64`, `iosSimulatorArm64`.
   - `watchosArm32`, `watchosArm64`, `watchosX64`, `watchosSimulatorArm64`.

diff --git a/viewmodel/build.gradle.kts b/viewmodel/build.gradle.kts
@@ -1,6 +1,7 @@
 @file:Suppress("ClassName")
 
 import java.net.URL
+import org.jetbrains.kotlin.gradle.dsl.JsModuleKind
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 @Suppress("DSL_SCOPE_VIOLATION")
@@ -45,15 +46,24 @@ kotlin {
     }
   }
   js(IR) {
-    compilations.all {
-      kotlinOptions {
-        sourceMap = true
-        moduleKind = "commonjs"
+    moduleName = project.name
+    compilations.configureEach {
+      compilerOptions.configure {
+        sourceMap.set(true)
+        moduleKind.set(JsModuleKind.MODULE_COMMONJS)
       }
     }
     browser()
     nodejs()
   }
+  @OptIn(org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl::class)
+  wasmJs {
+    // Module name should be different from the one from JS
+    // otherwise IC tasks that start clashing different modules with the same module name
+    moduleName = project.name + "Wasm"
+    browser()
+    nodejs()
+  }
 
   iosArm64()
   iosX64()
@@ -119,16 +129,33 @@ kotlin {
       }
     }
 
-    jsMain {
+    val jsAndWasmMain by creating {
       dependsOn(nonAndroidMain)
     }
-    jsTest {
+    val jsAndWasmTest by creating {
       dependsOn(nonAndroidTest)
+    }
+
+    jsMain {
+      dependsOn(jsAndWasmMain)
+    }
+    jsTest {
+      dependsOn(jsAndWasmTest)
       dependencies {
         implementation(kotlin("test-js"))
       }
     }
 
+    val wasmJsMain by getting {
+      dependsOn(jsAndWasmMain)
+    }
+    val wasmJsTest by getting {
+      dependsOn(jsAndWasmTest)
+      dependencies {
+        implementation(kotlin("test-wasm-js"))
+      }
+    }
+
     nativeMain {
       dependsOn(nonAndroidMain)
       dependencies {

diff --git a/...om/hoc081098/kmp/viewmodel/Closable.js.kt → ...81098/kmp/viewmodel/Closable.jsAndWasm.kt b/...om/hoc081098/kmp/viewmodel/Closable.js.kt → ...81098/kmp/viewmodel/Closable.jsAndWasm.kt
diff --git a/...om/hoc081098/kmp/viewmodel/Lockable.js.kt → ...81098/kmp/viewmodel/Lockable.jsAndWasm.kt b/...om/hoc081098/kmp/viewmodel/Lockable.js.kt → ...81098/kmp/viewmodel/Lockable.jsAndWasm.kt
diff --git a/...mp/viewmodel/internal/AtomicBoolean.js.kt → ...model/internal/AtomicBoolean.jsAndWasm.kt b/...mp/viewmodel/internal/AtomicBoolean.js.kt → ...model/internal/AtomicBoolean.jsAndWasm.kt
diff --git a/...kmp/viewmodel/internal/synchronized.js.kt → ...wmodel/internal/synchronized.jsAndWasm.kt b/...kmp/viewmodel/internal/synchronized.js.kt → ...wmodel/internal/synchronized.jsAndWasm.kt
diff --git a/...odel/src/jsAndWasmTest/kotlin/com/hoc081098/kmp/viewmodel/utils/runBlockInNewThread.js.kt b/...odel/src/jsAndWasmTest/kotlin/com/hoc081098/kmp/viewmodel/utils/runBlockInNewThread.js.kt
@@ -0,0 +1,3 @@
+package com.hoc081098.kmp.viewmodel.utils
+
+actual suspend fun runBlockInNewThread(block: () -> Unit) = block()
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		package com.hoc081098.kmp.viewmodel.utils

		actual suspend fun runBlockInNewThread(block: () -> Unit) = block()