Support kotlin 1.9.20+

Author: igoriakovlev

build.gradle

@@ -12,6 +12,7 @@ import org.jetbrains.kotlin.gradle.targets.js.yarn.YarnRootExtension
 import org.jetbrains.kotlin.konan.target.HostManager
 import org.jetbrains.dokka.gradle.DokkaTaskPartial
 
+import static KotlinVersion.isKotlinVersionAtLeast
 import static Projects.*
 
 apply plugin: 'jdk-convention'
@@ -160,7 +161,15 @@ configure(subprojects.findAll { !sourceless.contains(it.name) && it.name != core
         }
 
         apply from: rootProject.file("gradle/compile-js-multiplatform.gradle")
-        apply from: rootProject.file("gradle/compile-wasm-multiplatform.gradle")
+
+        // TODO: Wasm target names have been changed since 1.9.20, remove this after migration to 1.9.20
+        def isNewWasmTargetEnabled = isKotlinVersionAtLeast(ext.kotlin_version, 1, 9, 20)
+        if (isNewWasmTargetEnabled) {
+            apply from: rootProject.file("gradle/compile-wasm-multiplatform.gradle")
+        } else {
+            apply from: rootProject.file("gradle/compile-wasm-multiplatform19.gradle")
+        }
+
         kotlin.sourceSets.commonMain.dependencies {
             api project(":$coreModule")
         }

gradle/compile-wasm-multiplatform.gradle

@@ -3,28 +3,29 @@
  */
 
 kotlin {
-    wasm {
+    wasmJs {
         moduleName = project.name
         nodejs()
         compilations['main']?.dependencies {
-            api "org.jetbrains.kotlinx:atomicfu-wasm:$atomicfu_version"
+            api "org.jetbrains.kotlinx:atomicfu-wasm-js:$atomicfu_version"
         }
     }
 
     sourceSets {
-        wasmMain {
+        wasmJsMain {
             kotlin {
                 srcDir 'jsWasm/src'
+                srcDir 'wasm/src'
             }
         }
-        wasmTest {
+        wasmJsTest {
             kotlin {
                 srcDir 'jsWasm/test'
+                srcDir 'wasm/test'
             }
         }
-        wasmTest.dependencies {
-            api "org.jetbrains.kotlin:kotlin-test-wasm:$kotlin_version"
+        wasmJsTest.dependencies {
+            api "org.jetbrains.kotlin:kotlin-test-wasm-js:$kotlin_version"
         }
     }
-}
-
+}

gradle/compile-wasm-multiplatform19.gradle

@@ -0,0 +1,31 @@
+/*
+ * Copyright 2016-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+kotlin {
+    wasm {
+        moduleName = project.name
+        nodejs()
+        compilations['main']?.dependencies {
+            api "org.jetbrains.kotlinx:atomicfu-wasm:$atomicfu_version"
+        }
+    }
+
+    sourceSets {
+        wasmMain {
+            kotlin {
+                srcDir 'jsWasm/src'
+                srcDir 'wasm/src'
+            }
+        }
+        wasmTest {
+            kotlin {
+                srcDir 'jsWasm/test'
+                srcDir 'wasm/test'
+            }
+        }
+        wasmTest.dependencies {
+            api "org.jetbrains.kotlin:kotlin-test-wasm:$kotlin_version"
+        }
+    }
+}

kotlinx-coroutines-core/build.gradle

@@ -1,4 +1,5 @@
 import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin
+import static KotlinVersion.isKotlinVersionAtLeast
 
 /*
  * Copyright 2016-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
@@ -18,7 +19,14 @@ if (rootProject.ext.native_targets_enabled) {
 }
 
 apply from: rootProject.file("gradle/compile-js-multiplatform.gradle")
-apply from: rootProject.file("gradle/compile-wasm-multiplatform.gradle")
+
+// TODO: Wasm target names have been changed since 1.9.20, remove this after migration to 1.9.20
+def isNewWasmTargetEnabled = isKotlinVersionAtLeast(ext.kotlin_version, 1, 9, 20)
+if (isNewWasmTargetEnabled) {
+    apply from: rootProject.file("gradle/compile-wasm-multiplatform.gradle")
+} else {
+    apply from: rootProject.file("gradle/compile-wasm-multiplatform19.gradle")
+}
 
 apply from: rootProject.file('gradle/dokka.gradle.kts')
 apply from: rootProject.file('gradle/publish.gradle')
@@ -268,12 +276,20 @@ jvmTest {
 // Setup manifest for kotlinx-coroutines-core-jvm.jar
 jvmJar { setupManifest(it) }
 
-wasmNodeTest {
-    filter.with {
-        excludeTest("ChannelsTest", "testIterableAsReceiveChannel")
-        excludeTest("ChannelsTest", "testEmptyList")
-        excludeTest("ChannelsTest", "testToList")
-        excludeTest("ChannelBuildersFlowTest", "testConsumeAsFlowProduceBuffered")
+void addIngoreTestsForWasm(org.gradle.api.tasks.testing.TestFilter filter) {
+    filter.excludeTest("ChannelsTest", "testIterableAsReceiveChannel")
+    filter.excludeTest("ChannelsTest", "testEmptyList")
+    filter.excludeTest("ChannelsTest", "testToList")
+    filter.excludeTest("ChannelBuildersFlowTest", "testConsumeAsFlowProduceBuffered")
+}
+
+if (isNewWasmTargetEnabled) {
+    wasmJsNodeTest {
+        addIngoreTestsForWasm(filter)
+    }
+} else {
+    wasmNodeTest {
+        addIngoreTestsForWasm(filter)
     }
 }
 

kotlinx-coroutines-core/wasm/src/JSDispatcher.kt

@@ -78,20 +78,24 @@ private open class ClearTimeout(protected val handle: Int) : CancelHandler(), Di
 }
 
 @Suppress("UNUSED_PARAMETER")
-private fun toJsAnyCallback(handle: () -> Unit): JsAny = js("handle")
+private fun setTimeout(
+    window: WindowOrWorkerGlobalScope,
+    handler: () -> Unit,
+    timeout: Int,
+): Int = js("window.setTimeout(handler, timeout)")
 
 internal class WindowDispatcher(private val window: Window) : CoroutineDispatcher(), Delay {
     private val queue = WindowMessageQueue(window)
 
     override fun dispatch(context: CoroutineContext, block: Runnable) = queue.enqueue(block)
 
     override fun scheduleResumeAfterDelay(timeMillis: Long, continuation: CancellableContinuation<Unit>) {
-        val handle = window.setTimeout(toJsAnyCallback { with(continuation) { resumeUndispatched(Unit) } }, delayToInt(timeMillis))
+        val handle = setTimeout(window, { with(continuation) { resumeUndispatched(Unit) } }, delayToInt(timeMillis))
         continuation.invokeOnCancellation(handler = WindowClearTimeout(handle).asHandler)
     }
 
     override fun invokeOnTimeout(timeMillis: Long, block: Runnable, context: CoroutineContext): DisposableHandle {
-        val handle = window.setTimeout(toJsAnyCallback(block::run), delayToInt(timeMillis))
+        val handle = setTimeout(window, block::run, delayToInt(timeMillis))
         return WindowClearTimeout(handle)
     }
 

kotlinx-coroutines-core/wasm/test/TestBase.kt

@@ -15,6 +15,7 @@ public actual typealias TestResult = Promise<JsAny?>
 
 public actual val isNative = false
 
+@Suppress("NO_ACTUAL_CLASS_MEMBER_FOR_EXPECTED_CLASS") // Counterpart for @Suppress("ACTUAL_FUNCTION_WITH_DEFAULT_ARGUMENTS")
 public actual open class TestBase actual constructor() {
     public actual val isBoundByJsTestTimeout = true
     private var actionIndex = 0