diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 79defb7..668fefd 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -33,7 +33,7 @@ jobs: - os: windows-latest cmd: "./gradlew runKmp_xlogDebugExecutableMingwX64" - os: macos-latest - cmd: "./gradlew :example:shared:jsBrowserDistribution" + cmd: "./gradlew :example:shared:jsBrowserDistribution && ./gradlew :example:shared:wasmJsBrowserDistribution && ./gradlew :example:shared:wasmWasiNodeDevelopmentRun" runs-on: ${{ matrix.os }} steps: diff --git a/README.md b/README.md index 5ffda8e..526dffc 100644 --- a/README.md +++ b/README.md @@ -173,6 +173,7 @@ pod install ```bash # run on macOS, with Android NDK android-ndk-r23d-canary, # https://ci.android.com/builds/branches/aosp-ndk-release-r23/grid +# rename the folder as 23.3.12186248 ./scripts/build_xlog_android.sh # run on macOS ./scripts/build_xlog_apple.sh diff --git a/buildSrc/src/main/kotlin/Constants.kt b/buildSrc/src/main/kotlin/Constants.kt index f6e19f5..ce0625f 100644 --- a/buildSrc/src/main/kotlin/Constants.kt +++ b/buildSrc/src/main/kotlin/Constants.kt @@ -1,7 +1,7 @@ object Consts { const val releaseGroup = "com.piasy" const val releaseName = "kmp-xlog" - const val releaseVersion = "1.4.3" + const val releaseVersion = "1.5.0" val androidNS = "$releaseGroup.${releaseName.replace('-', '.')}" } diff --git a/example/shared/build.gradle.kts b/example/shared/build.gradle.kts index c026f96..79d21fc 100644 --- a/example/shared/build.gradle.kts +++ b/example/shared/build.gradle.kts @@ -1,3 +1,7 @@ +@file:OptIn(ExperimentalWasmDsl::class) + +import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl + plugins { alias(libs.plugins.kmp) @@ -36,9 +40,19 @@ kotlin { } } - js(IR) { - browser { - } + js { + browser() + nodejs() + binaries.executable() + } + wasmJs { + browser() + nodejs() + d8() + binaries.executable() + } + wasmWasi { + nodejs() binaries.executable() } diff --git a/example/shared/src/jsMain/kotlin/com/piasy/kmp/xlog/example/Platform.kt b/example/shared/src/jsMain/kotlin/com/piasy/kmp/xlog/example/Platform.kt index 1d6942e..17539c1 100644 --- a/example/shared/src/jsMain/kotlin/com/piasy/kmp/xlog/example/Platform.kt +++ b/example/shared/src/jsMain/kotlin/com/piasy/kmp/xlog/example/Platform.kt @@ -1,16 +1,16 @@ package com.piasy.kmp.xlog.example +import com.piasy.kmp.xlog.Logging import com.piasy.kmp.xlog.initializeConsoleLog -import kotlinx.browser.document class JsPlatform : Platform { - override val name: String = "JS" + override val name: String = "JS" } actual fun getPlatform(): Platform = JsPlatform() fun main() { - initializeConsoleLog(true) + initializeConsoleLog(true) - document.getElementById("text")?.innerHTML = Greeting().greeting() + Logging.info("XXPXX", Greeting().greeting()) } diff --git a/example/shared/src/wasmJsMain/kotlin/com/piasy/kmp/xlog/example/Platform.kt b/example/shared/src/wasmJsMain/kotlin/com/piasy/kmp/xlog/example/Platform.kt new file mode 100644 index 0000000..7608201 --- /dev/null +++ b/example/shared/src/wasmJsMain/kotlin/com/piasy/kmp/xlog/example/Platform.kt @@ -0,0 +1,16 @@ +package com.piasy.kmp.xlog.example + +import com.piasy.kmp.xlog.Logging +import com.piasy.kmp.xlog.initializeConsoleLog + +class WasmJsPlatform : Platform { + override val name: String = "WasmJS" +} + +actual fun getPlatform(): Platform = WasmJsPlatform() + +fun main() { + initializeConsoleLog(true) + + Logging.info("XXPXX", Greeting().greeting()) +} diff --git a/example/shared/src/wasmWasiMain/kotlin/com/piasy/kmp/xlog/example/Platform.kt b/example/shared/src/wasmWasiMain/kotlin/com/piasy/kmp/xlog/example/Platform.kt new file mode 100644 index 0000000..52127a3 --- /dev/null +++ b/example/shared/src/wasmWasiMain/kotlin/com/piasy/kmp/xlog/example/Platform.kt @@ -0,0 +1,15 @@ +package com.piasy.kmp.xlog.example + +import com.piasy.kmp.xlog.initializeConsoleLog + +class WasmWasiPlatform : Platform { + override val name: String = "WasmWasi" +} + +actual fun getPlatform(): Platform = WasmWasiPlatform() + +fun main() { + initializeConsoleLog(true) + + println(Greeting().greeting()) +} diff --git a/example/shared/src/jsMain/resources/index.html b/example/shared/src/webMain/resources/index.html similarity index 76% rename from example/shared/src/jsMain/resources/index.html rename to example/shared/src/webMain/resources/index.html index 8447392..4c4b26a 100644 --- a/example/shared/src/jsMain/resources/index.html +++ b/example/shared/src/webMain/resources/index.html @@ -5,7 +5,7 @@