Merge pull request #3304 from square/mikepaw.wasm

Adding wasm target to wire runtime.

Author: mpawliszyn

.github/workflows/build.yml

@@ -29,13 +29,13 @@ jobs:
           ./gradlew generateTests -Pswift=false --stacktrace --warning-mode all
           if [ ! -z "$(git status --porcelain)" ]; then git diff; echo -e "\nTest files changed. Did you run ./gradlew generateTests?"; exit 1; fi
 
-      - name: Test Native and JS
+      - name: Test Native, JS and Wasm
         run: |
-          ./gradlew -Dkjs=true -Dknative=true -Pswift=false samples:native:build samples:js:build samples:multi-target:build --stacktrace --warning-mode all
+          ./gradlew -Dkjs=true -Dknative=true -Dkwasm=true -Pswift=false samples:native:build samples:js:build samples:multi-target:build --stacktrace --warning-mode all
 
       - name: Test
         run: |
-          ./gradlew -Dkjs=false -Dknative=false -Pswift=false build --stacktrace --warning-mode all -x samples:native:build -x samples:js:build -x samples:multi-target:build
+          ./gradlew -Dkjs=false -Dknative=false -Dkwasm=false -Pswift=false build --stacktrace --warning-mode all -x samples:native:build -x samples:js:build -x samples:multi-target:build
 
   multiplatform:
     runs-on: macos-latest

gradle/libs.versions.toml

@@ -62,6 +62,7 @@ kotlin-test-annotations = { module = "org.jetbrains.kotlin:kotlin-test-annotatio
 kotlin-test-common = { module = "org.jetbrains.kotlin:kotlin-test-common" }
 kotlin-test-js = { module = "org.jetbrains.kotlin:kotlin-test-js" }
 kotlin-test-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit" }
+kotlin-test-wasm-js = { module = "org.jetbrains.kotlin:kotlin-test-wasm-js" }
 kotlinpoet = { module = "com.squareup:kotlinpoet", version.ref = "kotlinpoet" }
 misk = { module = "com.squareup.misk:misk", version = "2025.02.21.143120-9967585" }
 moshi = { module = "com.squareup.moshi:moshi", version.ref = "moshi" }

wire-runtime/build.gradle.kts

@@ -1,4 +1,5 @@
 import com.diffplug.gradle.spotless.SpotlessExtension
+import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
 
 plugins {
   kotlin("multiplatform")
@@ -39,6 +40,17 @@ kotlin {
     tvosArm64()
     tvosSimulatorArm64()
   }
+
+  if (System.getProperty("kwasm", "true").toBoolean()) {
+    wasmJs {
+      browser()
+    }
+    @OptIn(ExperimentalWasmDsl::class)
+    wasmWasi {
+      nodejs()
+    }
+  }
+
   sourceSets {
     val commonMain by getting {
       dependencies {
@@ -62,13 +74,51 @@ kotlin {
         implementation(libs.kotlin.test.junit)
       }
     }
+    val nonJvmMain by creating {
+      dependsOn(commonMain)
+    }
+    val nonJvmTest by creating {
+      dependsOn(commonTest)
+    }
+    if (System.getProperty("knative", "true").toBoolean()) {
+      val nativeMain by getting {
+        dependsOn(nonJvmMain)
+      }
+      val nativeTest by getting {
+        dependsOn(nonJvmTest)
+      }
+    }
     if (System.getProperty("kjs", "true").toBoolean()) {
+      val jsMain by getting {
+        dependsOn(nonJvmMain)
+      }
       val jsTest by getting {
+        dependsOn(nonJvmTest)
         dependencies {
           implementation(libs.kotlin.test.js)
         }
       }
     }
+    if (System.getProperty("kwasm", "true").toBoolean()) {
+      val wasmJsMain by getting {
+        dependsOn(nonJvmMain)
+      }
+      val wasmJsTest by getting {
+        dependsOn(nonJvmTest)
+        dependencies {
+          implementation(libs.kotlin.test.wasm.js)
+        }
+      }
+      val wasmWasiMain by getting {
+        dependsOn(nonJvmMain)
+      }
+      val wasmWasiTest by getting {
+        dependsOn(nonJvmTest)
+        dependencies {
+          implementation(libs.kotlin.test)
+        }
+      }
+    }
   }
 }
 

wire-runtime/src/jsMain/kotlin/com/squareup/wire/ProtoAdapter.kt

@@ -15,48 +15,4 @@
  */
 package com.squareup.wire.internal
 
-import okio.IOException
-
-actual interface Serializable
-
-/** This annotation is an empty placeholder. */
-actual annotation class JvmField
-
-/** This annotation is an empty placeholder. */
-actual annotation class JvmSynthetic
-
-/** This annotation is an empty placeholder. */
-actual annotation class JvmStatic
-
-actual abstract class ObjectStreamException : IOException()
-
-actual class ProtocolException actual constructor(host: String) : IOException(host)
-
-@Suppress("NOTHING_TO_INLINE") // Syntactic sugar.
-actual inline fun <T> MutableList<T>.toUnmodifiableList(): List<T> = this
-
-@Suppress("NOTHING_TO_INLINE") // Syntactic sugar.
-actual inline fun <K, V> MutableMap<K, V>.toUnmodifiableMap(): Map<K, V> = this
-
-// TODO: Use code points to process each char.
-actual fun camelCase(string: String, upperCamel: Boolean): String {
-  return buildString(string.length) {
-    var index = 0
-    var uppercase = upperCamel
-    while (index < string.length) {
-      var char = string[index]
-
-      index++
-
-      if (char == '_') {
-        uppercase = true
-        continue
-      }
-      if (uppercase) {
-        if (char in 'a'..'z') char += 'A' - 'a'
-      }
-      append(char)
-      uppercase = false
-    }
-  }
-}
+actual typealias JsName = kotlin.js.JsName