Updating Wasm implementation

.github/workflows/build.yml → .github/workflows/build_mac.yml

@@ -1,4 +1,4 @@
-name: build
+name: build Mac
 on:
   pull_request:
   push:
@@ -8,24 +8,14 @@ on:
 
 jobs:
   build:
-    strategy:
-      matrix:
-        os: [macOS-latest, windows-latest]
-    runs-on: ${{matrix.os}}
+    runs-on: macOS-latest
     steps:
       - name: Checkout the repo
         uses: actions/checkout@v2
       - uses: actions/setup-java@v2
         with:
           distribution: "adopt"
           java-version: "17"
-      - name: Install msys2
-        if: matrix.os == 'windows-latest'
-        uses: msys2/setup-msys2@v2
-        with:
-          msystem: MINGW64
-          update: true
-          install: git mingw-w64-x86_64-toolchain
       - name: Validate Gradle Wrapper
         uses: gradle/wrapper-validation-action@v1
       - name: Cache gradle
@@ -42,26 +32,15 @@ jobs:
           key: ${{ runner.os }}-gradle-${{ hashFiles('*.gradle.kts') }}
           restore-keys: |
             ${{ runner.os }}-gradle-
-      - name: Build for MacOS
-        if: matrix.os == 'macOS-latest'
+      - name: Build
         run: ./gradlew build --no-daemon --stacktrace --build-cache
         env:
           S3_BUILD_CACHE_AWS_REGION: ${{ secrets.S3_BUILD_CACHE_AWS_REGION }}
           S3_BUILD_CACHE_BUCKET_NAME: ${{ secrets.S3_BUILD_CACHE_BUCKET_NAME }}
           S3_BUILD_CACHE_ACCESS_KEY_ID: ${{ secrets.S3_BUILD_CACHE_ACCESS_KEY_ID }}
           S3_BUILD_CACHE_SECRET_KEY: ${{ secrets.S3_BUILD_CACHE_SECRET_KEY }}
           CI: "true"
-      - name: Build for Windows
-        if: matrix.os == 'windows-latest'
-        run: ./gradlew kotlinUpgradeYarnLock build -PenableWasm=false --no-daemon --stacktrace --build-cache
-        env:
-          S3_BUILD_CACHE_AWS_REGION: ${{ secrets.S3_BUILD_CACHE_AWS_REGION }}
-          S3_BUILD_CACHE_BUCKET_NAME: ${{ secrets.S3_BUILD_CACHE_BUCKET_NAME }}
-          S3_BUILD_CACHE_ACCESS_KEY_ID: ${{ secrets.S3_BUILD_CACHE_ACCESS_KEY_ID }}
-          S3_BUILD_CACHE_SECRET_KEY: ${{ secrets.S3_BUILD_CACHE_SECRET_KEY }}
-          CI: "true"
       - name: Local Publish For Samples
-        if: matrix.os == 'macOS-latest'
         run: ./gradlew publishToMavenLocal --no-daemon --stacktrace --build-cache -PRELEASE_SIGNING_ENABLED=false
         env:
           S3_BUILD_CACHE_AWS_REGION: ${{ secrets.S3_BUILD_CACHE_AWS_REGION }}
@@ -70,7 +49,6 @@ jobs:
           S3_BUILD_CACHE_SECRET_KEY: ${{ secrets.S3_BUILD_CACHE_SECRET_KEY }}
           CI: "true"
       - name: script
-        if: matrix.os == 'macOS-latest'
         env:
           S3_BUILD_CACHE_AWS_REGION: ${{ secrets.S3_BUILD_CACHE_AWS_REGION }}
           S3_BUILD_CACHE_BUCKET_NAME: ${{ secrets.S3_BUILD_CACHE_BUCKET_NAME }}

.github/workflows/build_win.yml

@@ -0,0 +1,51 @@
+name: build Windows
+on:
+  pull_request:
+  push:
+    branches:
+      - main
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: windows-latest
+    steps:
+      - name: Checkout the repo
+        uses: actions/checkout@v2
+      - uses: actions/setup-java@v2
+        with:
+          distribution: "adopt"
+          java-version: "17"
+      - name: Install msys2
+        uses: msys2/setup-msys2@v2
+        with:
+          msystem: MINGW64
+          update: true
+          install: git mingw-w64-x86_64-toolchain
+      - name: Validate Gradle Wrapper
+        uses: gradle/wrapper-validation-action@v1
+      - name: Cache gradle
+        uses: actions/cache@v2
+        with:
+          path: ~/.gradle/caches
+          key: ${{ runner.os }}-gradle-${{ hashFiles('*.gradle.kts') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+      - name: Cache konan
+        uses: actions/cache@v2
+        with:
+          path: ~/.konan
+          key: ${{ runner.os }}-gradle-${{ hashFiles('*.gradle.kts') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+      - name: Build
+        run: ./gradlew mingwX64Test --no-daemon --stacktrace --build-cache
+        env:
+          S3_BUILD_CACHE_AWS_REGION: ${{ secrets.S3_BUILD_CACHE_AWS_REGION }}
+          S3_BUILD_CACHE_BUCKET_NAME: ${{ secrets.S3_BUILD_CACHE_BUCKET_NAME }}
+          S3_BUILD_CACHE_ACCESS_KEY_ID: ${{ secrets.S3_BUILD_CACHE_ACCESS_KEY_ID }}
+          S3_BUILD_CACHE_SECRET_KEY: ${{ secrets.S3_BUILD_CACHE_SECRET_KEY }}
+          CI: "true"
+
+env:
+  GRADLE_OPTS: -Dkotlin.incremental=false -Dorg.gradle.jvmargs="-Xmx3g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:MaxMetaspaceSize=512m"

.gitignore

@@ -17,4 +17,6 @@ build/
 
 local.properties
 
-Pods
+Pods
+# Intermediate klibs
+.kotlin

gradle/libs.versions.toml

@@ -4,8 +4,8 @@ minSdk = "21"
 compileSdk = "34"
 
 # Dependencies
-kotlin = "1.9.22"
-binaryCompatability = "0.13.2"
+kotlin = "2.0.21"
+binaryCompatability = "0.16.3"
 
 androidx-core = "1.12.0"
 androidx-appcompat = "1.6.1"
@@ -69,9 +69,6 @@ coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", ve
 android-junitTest = { module = "androidx.test.ext:junit", version.ref = "android-junitTest" }
 junitTest = { module = "junit:junit", version.ref = "junit" }
 
-# For convention-plugins
-kotlin-gradlePlugin = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin", version.ref = "kotlin" }
-
 [plugins]
 maven-publish = { id = "com.vanniktech.maven.publish", version.ref = "mavenPublish" }
 kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }

kermit-core/build.gradle.kts

@@ -11,13 +11,13 @@
  * the License.
  */
 
+import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
     id("com.android.library")
     kotlin("multiplatform")
     id("com.vanniktech.maven.publish")
-    id("wasm-setup")
 }
 
 kotlin {
@@ -29,6 +29,15 @@ kotlin {
         browser()
         nodejs()
     }
+    val wasmEnabled = project.findProperty("enableWasm") == "true"
+    if (wasmEnabled) {
+        @OptIn(ExperimentalWasmDsl::class)
+        wasmJs {
+            browser()
+            nodejs()
+            binaries.executable()
+        }
+    }
 
     macosX64()
     macosArm64()
@@ -71,6 +80,16 @@ kotlin {
             implementation(project(":kermit-test"))
         }
 
+        val jsAndWasmJsMain by creating {
+            dependsOn(commonMain.get())
+        }
+        jsMain {
+            dependsOn(jsAndWasmJsMain)
+        }
+        wasmJsMain {
+            dependsOn(jsAndWasmJsMain)
+        }
+
         getByName("commonJvmTest").dependencies {
             implementation(kotlin("test-junit"))
         }
@@ -102,4 +121,4 @@ android {
 
 tasks.withType<KotlinCompile> {
     kotlinOptions.jvmTarget = "1.8"
-}
+}

kermit-core/src/jsAndWasmJsMain/kotlin/co/touchlab/kermit/ConsoleWriter.kt

@@ -11,7 +11,7 @@
  * the License.
  */
 
-@file:Suppress("unused")
+@file:Suppress("unused", "EXPECT_ACTUAL_CLASSIFIERS_ARE_IN_BETA_WARNING")
 
 package co.touchlab.kermit
 
@@ -49,4 +49,9 @@ internal interface ConsoleIntf {
     fun log(output: String)
 }
 
-internal expect object ConsoleActual : ConsoleIntf
+internal expect object ConsoleActual : ConsoleIntf {
+    override fun error(output: String)
+    override fun warn(output: String)
+    override fun info(output: String)
+    override fun log(output: String)
+}

kermit-core/src/jsMain/kotlin/co/touchlab/kermit/Js.ConsoleActual.kt

@@ -11,19 +11,19 @@
 package co.touchlab.kermit
 
 internal actual object ConsoleActual : ConsoleIntf {
-    override fun error(output: String) {
+    actual override fun error(output: String) {
         console.error(output)
     }
 
-    override fun warn(output: String) {
+    actual override fun warn(output: String) {
         console.warn(output)
     }
 
-    override fun info(output: String) {
+    actual override fun info(output: String) {
         console.info(output)
     }
 
-    override fun log(output: String) {
+    actual override fun log(output: String) {
         console.log(output)
     }
 }

kermit-core/src/wasmJsMain/kotlin/co/touchlab/kermit/Wasm.ConsoleActual.kt

@@ -23,19 +23,19 @@ external fun consoleInfo(output: String)
 external fun consoleLog(output: String)
 
 internal actual object ConsoleActual : ConsoleIntf {
-    override fun error(output: String) {
+    actual override fun error(output: String) {
         consoleError(output)
     }
 
-    override fun warn(output: String) {
+    actual override fun warn(output: String) {
         consoleWarn(output)
     }
 
-    override fun info(output: String) {
+    actual override fun info(output: String) {
         consoleInfo(output)
     }
 
-    override fun log(output: String) {
+    actual override fun log(output: String) {
         consoleLog(output)
     }
 }

kermit-simple/build.gradle.kts

@@ -1,3 +1,6 @@
+import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
+import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackConfig
+
 /*
  * Copyright (c) 2024 Touchlab
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
@@ -14,14 +17,22 @@
 plugins {
     kotlin("multiplatform")
     id("com.vanniktech.maven.publish")
-    id("wasm-setup")
 }
 
 kotlin {
     js {
         browser()
         nodejs()
     }
+    val wasmEnabled = project.findProperty("enableWasm") == "true"
+    if (wasmEnabled) {
+        @OptIn(ExperimentalWasmDsl::class)
+        wasmJs {
+            browser()
+            nodejs()
+            binaries.executable()
+        }
+    }
 
     macosX64()
     macosArm64()
@@ -62,9 +73,6 @@ kotlin {
             dependsOn(commonTest.get())
         }
 
-        getByName("jsAndWasmJsMain").dependsOn(nonKotlinMain)
-        getByName("jsAndWasmJsTest").dependsOn(nonKotlinTest)
-
         targets.withType<org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget>().all {
             val mainSourceSet = compilations.getByName("main").defaultSourceSet
             val testSourceSet = compilations.getByName("test").defaultSourceSet