Upgrade to Kotlin 2.2.20 (#4545)

Author: dkhalanskyjb

README.md

@@ -4,12 +4,12 @@
 [![JetBrains official project](https://jb.gg/badges/official.svg)](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub)
 [![GitHub license](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg?style=flat)](https://www.apache.org/licenses/LICENSE-2.0)
 [![Download](https://img.shields.io/maven-central/v/org.jetbrains.kotlinx/kotlinx-coroutines-core/1.10.2)](https://central.sonatype.com/artifact/org.jetbrains.kotlinx/kotlinx-coroutines-core/1.10.2)
-[![Kotlin](https://img.shields.io/badge/kotlin-2.2.0-blue.svg?logo=kotlin)](http://kotlinlang.org)
+[![Kotlin](https://img.shields.io/badge/kotlin-2.2.20-blue.svg?logo=kotlin)](http://kotlinlang.org)
 [![KDoc link](https://img.shields.io/badge/API_reference-KDoc-blue)](https://kotlinlang.org/api/kotlinx.coroutines/)
 [![Slack channel](https://img.shields.io/badge/chat-slack-green.svg?logo=slack)](https://kotlinlang.slack.com/messages/coroutines/)
 
 Library support for Kotlin coroutines with [multiplatform](#multiplatform) support.
-This is a companion version for the Kotlin `2.2.0` release.
+This is a companion version for the Kotlin `2.2.20` release.
 
 ```kotlin
 suspend fun main() = coroutineScope {
@@ -94,7 +94,7 @@ And make sure that you use the latest Kotlin version:
 
 ```xml
 <properties>
-    <kotlin.version>2.2.0</kotlin.version>
+    <kotlin.version>2.2.20</kotlin.version>
 </properties>
 ```
 
@@ -113,10 +113,10 @@ And make sure that you use the latest Kotlin version:
 ```kotlin
 plugins {
     // For build.gradle.kts (Kotlin DSL)
-    kotlin("jvm") version "2.2.0"
+    kotlin("jvm") version "2.2.20"
 
     // For build.gradle (Groovy DSL)
-    id "org.jetbrains.kotlin.jvm" version "2.2.0"
+    id "org.jetbrains.kotlin.jvm" version "2.2.20"
 }
 ```
 

buildSrc/src/main/kotlin/kotlin-multiplatform-conventions.gradle.kts

@@ -131,8 +131,7 @@ kotlin {
                 api("org.jetbrains.kotlin:kotlin-test-wasm-wasi:${version("kotlin")}")
             }
         }
-        groupSourceSets("jsAndWasmJsShared", listOf("js", "wasmJs"), emptyList())
-        groupSourceSets("jsAndWasmShared", listOf("jsAndWasmJsShared", "wasmWasi"), listOf("common"))
+        groupSourceSets("jsAndWasmShared", listOf("web", "wasmWasi"), listOf("common"))
     }
 
     @OptIn(org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi::class)

gradle.properties

@@ -4,7 +4,7 @@ group=org.jetbrains.kotlinx
 # First-party dependencies.
 # ONLY rename these properties alongside adapting kotlinx.train build chain
 # and the `firstPartyDependencies` list in `buildSrc`.
-kotlin_version=2.2.0
+kotlin_version=2.2.20
 atomicfu_version=0.26.1
 
 # Dependencies

integration-testing/gradle.properties

@@ -1,4 +1,4 @@
-kotlin_version=2.2.0
+kotlin_version=2.2.20
 coroutines_version=1.10.2-SNAPSHOT
 asm_version=9.3
 junit5_version=5.7.0

kotlinx-coroutines-core/build.gradle.kts

@@ -24,7 +24,7 @@ apply(plugin = "pub-conventions")
 
      TARGETS                            SOURCE SETS
      ------------------------------------------------------------
-     wasmJs \------> jsAndWasmJsShared ----+
+     wasmJs \-----------> web -------------+
      js     /                              |
                                            V
      wasmWasi --------------------> jsAndWasmShared ----------+

kotlinx-coroutines-core/js/src/internal/CoroutineExceptionHandlerImpl.kt

@@ -1,12 +1,17 @@
 package kotlinx.coroutines
 
+import kotlin.js.*
+
+@OptIn(ExperimentalWasmJsInterop::class)
 internal external interface JsProcess : JsAny {
     fun nextTick(handler: () -> Unit)
 }
 
+@OptIn(ExperimentalWasmJsInterop::class)
 internal fun tryGetProcess(): JsProcess? =
     js("(typeof(process) !== 'undefined' && typeof(process.nextTick) === 'function') ? process : null")
 
+@OptIn(ExperimentalWasmJsInterop::class)
 internal fun tryGetWindow(): W3CWindow? =
     js("(typeof(window) !== 'undefined' && window != null && typeof(window.addEventListener) === 'function') ? window : null")
 

kotlinx-coroutines-core/jsAndWasmJsShared/src/internal/CoroutineExceptionHandlerImpl.kt

@@ -40,6 +40,7 @@ internal class NodeDispatcher(private val process: JsProcess) : SetTimeoutBasedD
     }
 }
 
+@OptIn(ExperimentalWasmJsInterop::class)
 @Suppress("UNUSED_PARAMETER")
 private fun subscribeToWindowMessages(window: W3CWindow, process: () -> Unit): Unit = js("""{
     const handler = (event) => {
@@ -51,10 +52,12 @@ private fun subscribeToWindowMessages(window: W3CWindow, process: () -> Unit): U
     window.addEventListener('message', handler, true);
 }""")
 
+@OptIn(ExperimentalWasmJsInterop::class)
 @Suppress("UNUSED_PARAMETER")
 private fun createRescheduleMessagePoster(window: W3CWindow): () -> Unit =
     js("() => window.postMessage('dispatchCoroutine', '*')")
 
+@OptIn(ExperimentalWasmJsInterop::class)
 @Suppress("UNUSED_PARAMETER")
 private fun createScheduleMessagePoster(process: () -> Unit): () -> Unit =
     js("() => Promise.resolve(0).then(process)")
@@ -80,10 +83,12 @@ internal actual class WindowMessageQueue actual constructor(window: W3CWindow) :
 private external fun setTimeout(handler: () -> Unit, timeout: Int): Int
 
 // d8 doesn't have clearTimeout
+@OptIn(ExperimentalWasmJsInterop::class)
 @Suppress("UNUSED_PARAMETER")
 private fun clearTimeout(handle: Int): Unit =
     js("{ if (typeof clearTimeout !== 'undefined') clearTimeout(handle); }")
 
+@OptIn(ExperimentalWasmJsInterop::class)
 @Suppress("UNUSED_PARAMETER")
 private fun setTimeout(window: W3CWindow, handler: () -> Unit, timeout: Int): Int =
     js("window.setTimeout(handler, timeout)")

kotlinx-coroutines-core/wasmJs/src/CoroutineContext.kt

@@ -3,10 +3,12 @@ package kotlinx.coroutines
 import kotlin.coroutines.*
 import kotlin.js.*
 
+@OptIn(ExperimentalWasmJsInterop::class)
 @Suppress("UNUSED_PARAMETER")
 internal fun promiseSetDeferred(promise: Promise<JsAny?>, deferred: JsAny): Unit =
     js("promise.deferred = deferred")
 
+@OptIn(ExperimentalWasmJsInterop::class)
 @Suppress("UNUSED_PARAMETER")
 internal fun promiseGetDeferred(promise: Promise<JsAny?>): JsAny? = js("""{
     console.assert(promise instanceof Promise, "promiseGetDeferred must receive a promise, but got ", promise);
@@ -29,6 +31,7 @@ internal fun promiseGetDeferred(promise: Promise<JsAny?>): JsAny? = js("""{
  * @param start coroutine start option. The default value is [CoroutineStart.DEFAULT].
  * @param block the coroutine code.
  */
+@ExperimentalWasmJsInterop
 public fun <T> CoroutineScope.promise(
     context: CoroutineContext = EmptyCoroutineContext,
     start: CoroutineStart = CoroutineStart.DEFAULT,
@@ -39,6 +42,7 @@ public fun <T> CoroutineScope.promise(
 /**
  * Converts this deferred value to the instance of [Promise<JsAny?>].
  */
+@ExperimentalWasmJsInterop
 public fun <T> Deferred<T>.asPromise(): Promise<JsAny?> {
     val promise = Promise<JsAny?> { resolve, reject ->
         invokeOnCompletion {
@@ -57,6 +61,7 @@ public fun <T> Deferred<T>.asPromise(): Promise<JsAny?> {
 /**
  * Converts this promise value to the instance of [Deferred].
  */
+@ExperimentalWasmJsInterop
 @Suppress("UNCHECKED_CAST_TO_EXTERNAL_INTERFACE", "UNCHECKED_CAST")
 public fun <T> Promise<JsAny?>.asDeferred(): Deferred<T> {
     val deferred = promiseGetDeferred(this) as? JsReference<Deferred<T>>
@@ -71,6 +76,7 @@ public fun <T> Promise<JsAny?>.asDeferred(): Deferred<T> {
  * There is a **prompt cancellation guarantee**: even if this function is ready to return the result, but was cancelled
  * while suspended, [CancellationException] will be thrown. See [suspendCancellableCoroutine] for low-level details.
  */
+@ExperimentalWasmJsInterop
 @Suppress("UNCHECKED_CAST")
 public suspend fun <T> Promise<JsAny?>.await(): T = suspendCancellableCoroutine { cont: CancellableContinuation<T> ->
     this@await.then(