feat: both WasmWasi and WasmJS can be used together since Kotlin 2.0

Signed-off-by: Artyom Shendrik <[email protected]>

.github/workflows/build.yml

@@ -87,7 +87,7 @@ jobs:
         uses: github/codeql-action/upload-sarif@v2
         continue-on-error: true
         with:
-          sarif_file: fluxo-kmp-conf/build/reports/detekt/detekt.sarif
+          sarif_file: build/detekt-merged.sarif
           category: detekt
 
       - name: 'Run check-main'

CHANGELOG.md

@@ -8,6 +8,7 @@
 ### Added
 - highlight publication setup in logs.
 - verify that publication artifact version is set.
+- both WasmWasi and WasmJS can be used together since Kotlin 2.0.
 
 ### Changed
 - remove tests & checks from the `release` CI workflow.

fluxo-kmp-conf/src/main/kotlin/fluxo/conf/dsl/container/impl/KmpConfigurationContainerDslImpl.kt

@@ -111,8 +111,9 @@ internal class KmpConfigurationContainerDslImpl(
         ) {
             wasmJs()
 
-            // Usage of both Wasi and JS targets lead to problems atm.
-            if (ENABLE_WASM_WASI && kotlinPluginVersion >= KOTLIN_1_9_20) {
+            // WASI target is available since Kotlin 1.9.20.
+            // Both WASI and JS can be used together since Kotlin 2.0.
+            if (ENABLE_WASM_WASI && kotlinPluginVersion >= KOTLIN_2_0) {
                 wasmWasi()
             }
         }
@@ -132,7 +133,8 @@ internal class KmpConfigurationContainerDslImpl(
 
     // https://docs.gradle.org/current/userguide/validation_problems.html#implicit_dependency
     private fun isGradleNotFailingOnImplicitTaskDependencies() =
-        GradleVersion.version(holder.project.gradle.gradleVersion) < GradleVersion.version("8.0")
+        GradleVersion.current() < GradleVersion.version("8.0")
 }
 
 private const val ENABLE_WASM_WASI = false
+