Merge pull request #122 from arkivanov/wasm

Support wasmJs

build.gradle.kts

@@ -35,6 +35,7 @@ setupDefaults(
         androidTarget()
         jvm()
         js { browser() }
+        wasmJs { browser() }
         linuxX64()
         iosCompat()
         watchosCompat()
@@ -43,8 +44,8 @@ setupDefaults(
     },
     androidConfig = AndroidConfig(
         minSdkVersion = 15,
-        compileSdkVersion = 31,
-        targetSdkVersion = 31,
+        compileSdkVersion = 34,
+        targetSdkVersion = 34,
     ),
     binaryCompatibilityValidatorConfig = BinaryCompatibilityValidatorConfig(
         nonPublicMarkers = listOf("com.arkivanov.mvikotlin.core.utils.internal.InternalMviKotlinApi"),

deps.versions.toml

@@ -6,11 +6,11 @@ timeTravelApp = "3.0.1"
 
 kotlin = "1.9.21"
 kotlinxBinaryCompatibilityValidator = "0.13.2"
-kotlinxCoroutines = "1.7.3"
+kotlinxCoroutines = "1.8.0-RC2"
 intellijGradlePlugin = "1.15.0"
 detektGradlePlugin = "1.23.3"
-essenty = "1.3.0"
-reaktive = "2.0.0"
+essenty = "2.0.0-alpha02"
+reaktive = "2.1.0-beta01"
 multiplatformSettings = "1.1.0"
 compose = "1.5.11"
 kotlinWrappers = "1.0.0-pre.608"
@@ -27,6 +27,7 @@ androidxDrawerLayout = "1.0.0"
 kotlin-kotlinGradlePlug = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin", version.ref = "kotlin" }
 kotlin-kotlinTestCommon = { group = "org.jetbrains.kotlin", name = "kotlin-test-common", version.ref = "kotlin" }
 kotlin-kotlinTestJs = { group = "org.jetbrains.kotlin", name = "kotlin-test-js", version.ref = "kotlin" }
+kotlin-kotlinTestWasmJs = { group = "org.jetbrains.kotlin", name = "kotlin-test-wasm-js", version.ref = "kotlin" }
 kotlin-kotlinTestJunit = { group = "org.jetbrains.kotlin", name = "kotlin-test-junit", version.ref = "kotlin" }
 kotlin-kotlinTestAnnotationsCommon = { group = "org.jetbrains.kotlin", name = "kotlin-test-annotations-common", version.ref = "kotlin" }
 

mvikotlin-test-internal/build.gradle.kts

@@ -20,6 +20,7 @@ kotlin {
         val android by bundle()
         val jvm by bundle()
         val js by bundle()
+        val wasmJs by bundle()
         val darwin by bundle()
 
         darwin dependsOn common
@@ -36,6 +37,10 @@ kotlin {
             implementation(deps.kotlin.kotlinTestJs)
         }
 
+        wasmJs.main.dependencies {
+            implementation(deps.kotlin.kotlinTestWasmJs)
+        }
+
         android.main.dependencies {
             implementation(deps.kotlin.kotlinTestJunit)
         }

mvikotlin-timetravel-proto-internal/build.gradle.kts

@@ -20,12 +20,13 @@ android {
 
 kotlin {
     setupSourceSets {
-        val jvmNative by bundle()
+        val nonJs by bundle()
         val java by bundle()
         val native by bundle()
+        val wasmJs by bundle()
 
-        jvmNative dependsOn common
-        (java + native) dependsOn jvmNative
+        nonJs dependsOn common
+        (java + native + wasmJs) dependsOn nonJs
         javaSet dependsOn java
         nativeSet dependsOn native
     }

mvikotlin-timetravel-proto-internal/src/wasmJsMain/kotlin/com/arkivanov/mvikotlin/timetravel/proto/internal/data/value/ValueParser.kt

@@ -0,0 +1,13 @@
+package com.arkivanov.mvikotlin.timetravel.proto.internal.data.value
+
+@Suppress("EmptyDefaultConstructor")
+actual class ValueParser actual constructor() {
+
+    actual fun parseValue(obj: Any): ValueNode =
+        ValueNode(
+            type = parseType(obj = obj),
+            value = obj.toString(),
+        )
+
+    actual fun parseType(obj: Any): String = obj::class.simpleName ?: "Any?"
+}

mvikotlin/build.gradle.kts

@@ -23,16 +23,20 @@ kotlin {
     setupSourceSets {
         val android by bundle()
         val js by bundle()
-        val jsNative by bundle()
+        val wasmJs by bundle()
+        val web by bundle()
+        val webNative by bundle()
         val java by bundle()
         val native by bundle()
         val darwin by bundle()
 
-        jsNative dependsOn common
-        native dependsOn jsNative
+        webNative dependsOn common
+        native dependsOn webNative
         darwin dependsOn native
         java dependsOn common
-        js dependsOn jsNative
+        web dependsOn webNative
+        js dependsOn web
+        wasmJs dependsOn web
 
         javaSet dependsOn java
         (nativeSet - darwinSet) dependsOn native

mvikotlin/src/jsMain/kotlin/com/arkivanov/mvikotlin/core/utils/internal/Logs.kt

@@ -1,8 +1,5 @@
 package com.arkivanov.mvikotlin.core.utils.internal
 
-import com.arkivanov.mvikotlin.core.utils.internal.InternalMviKotlinApi
-import com.arkivanov.mvikotlin.core.utils.internal.withLogTag
-
 @InternalMviKotlinApi
 actual fun logV(text: String) {
     console.log(text.withLogTag())

mvikotlin/src/wasmJsMain/kotlin/com/arkivanov/mvikotlin/core/utils/internal/Logs.kt

@@ -0,0 +1,11 @@
+package com.arkivanov.mvikotlin.core.utils.internal
+
+@InternalMviKotlinApi
+actual fun logV(text: String) {
+    println(text.withLogTag())
+}
+
+@InternalMviKotlinApi
+actual fun logE(text: String) {
+    println(text.withLogTag())
+}