Update Kotlin and kotlin-wrappers (#18)

Author: martinbonnin

apollo-mockserver/build.gradle.kts

@@ -1,6 +1,5 @@
 import com.gradleup.librarian.gradle.librarianModule
 import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
-import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
 
 plugins {
   id("org.jetbrains.kotlin.multiplatform")
@@ -24,7 +23,7 @@ kotlin {
   js(IR) {
     nodejs()
   }
-  @OptIn(ExperimentalWasmDsl::class)
+  @Suppress("OPT_IN_USAGE")
   wasmJs {
     nodejs()
   }
@@ -80,6 +79,11 @@ kotlin {
         implementation(libs.ktor.client.js)
       }
     }
+    findByName("wasmJsMain")!!.apply {
+      dependencies {
+        implementation(libs.kotlin.stdlib.wasm.js)
+      }
+    }
 
     findByName("jvmTest")?.apply {
       dependencies {

apollo-mockserver/src/jsMain/kotlin/com/apollographql/mockserver/TcpServer.js.kt

@@ -2,31 +2,23 @@ package com.apollographql.mockserver
 
 import js.typedarrays.toUint8Array
 import kotlinx.coroutines.channels.Channel
-import node.buffer.Buffer
-import node.events.Event
+import node.events.once
 import node.net.AddressInfo
 import node.net.createServer
-import node.test.it
 import okio.IOException
-import kotlin.coroutines.resume
-import kotlin.coroutines.suspendCoroutine
+import org.w3c.dom.events.Event
 import node.net.Server as WrappedServer
 import node.net.Socket as WrappedSocket
 
 internal class NodeTcpSocket(private val netSocket: WrappedSocket) : TcpSocket {
   private val readQueue = Channel<ByteArray>(Channel.UNLIMITED)
 
   init {
-    netSocket.on(Event.DATA) { chunk ->
-      val bytes = when (chunk) {
-        is String -> chunk.encodeToByteArray()
-        is Buffer -> chunk.toByteArray()
-        else -> error("Unexpected chunk type: ${chunk::class}")
-      }
-      readQueue.trySend(bytes)
+    netSocket.dataEvent.addHandler { (chunk) ->
+      readQueue.trySend(chunk.toByteArray())
     }
 
-    netSocket.on(Event.CLOSE) { _ ->
+    netSocket.closeEvent.addHandler { _ ->
       readQueue.close(IOException("The socket was closed"))
     }
   }
@@ -69,17 +61,15 @@ internal class NodeTcpServer(private val port: Int) : TcpServer {
     require(!isClosed) { "Server is closed" }
     val server = requireNotNull(this.server) { "Server is not listening, please call listen() before calling address()" }
 
-    return address ?: suspendCoroutine { cont ->
-      server.once(Event.LISTENING) {
-        val server = requireNotNull(this.server) {
-          "close() was called during a call to address()"
-        }
-        val address = server.address().unsafeCast<AddressInfo>()
-        this.address = Address(address.address, address.port.toInt()).also {
-          cont.resume(it)
-        }
-      }
+    if (address != null) {
+      return address!!
     }
+
+    server.listeningEvent.once()
+
+    val ai = server.address().unsafeCast<AddressInfo>()
+    address = Address(ai.address, ai.port.toInt())
+    return address!!
   }
 
   override fun close() {

build.gradle.kts

@@ -1,8 +1,9 @@
 import com.gradleup.librarian.gradle.librarianRoot
 
 plugins {
-    id("org.jetbrains.kotlin.multiplatform").version("2.0.0").apply(false)
+    alias(libs.plugins.kgp).apply(false)
     id("com.gradleup.librarian").version("0.0.6").apply(false)
+    id("org.jetbrains.kotlinx.binary-compatibility-validator") version "0.16.3" apply false
 }
 
 librarianRoot()

gradle.properties

@@ -2,4 +2,3 @@ org.gradle.jvmargs=-Xmx8g
 
 #org.gradle.configuration-cache=true
 
-kotlin.wasm.stability.nowarn=true

gradle/libs.versions.toml

@@ -4,11 +4,13 @@ ktor = "3.0.0"
 atomicfu = "0.25.0"
 kotlinx-coroutines = "1.9.0"
 okhttp = "4.12.0"
+kotlin = "2.1.0"
 
 [libraries]
-kotlin-node = "org.jetbrains.kotlin-wrappers:kotlin-node:18.16.12-pre.634"
+kotlin-node = "org.jetbrains.kotlin-wrappers:kotlin-node:22.5.5-pre.844"
 kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" }
 kotlinx-coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref = "kotlinx-coroutines" }
+kotlin-stdlib-wasm-js = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib-wasm-js", version.ref = "kotlin" }
 okio = { group = "com.squareup.okio", name = "okio", version.ref = "okio" }
 atomicfu-library = { group = "org.jetbrains.kotlinx", name = "atomicfu", version.ref = "atomicfu" }
 ktor-server-core = { group = "io.ktor", name = "ktor-server-core", version.ref = "ktor" }
@@ -19,3 +21,6 @@ ktor-client-core = { group = "io.ktor", name= "ktor-client-core", version.ref =
 ktor-client-cio = { group = "io.ktor", name= "ktor-client-cio", version.ref = "ktor" }
 ktor-client-js = { group = "io.ktor", name= "ktor-client-js", version.ref = "ktor" }
 okhttp = { group = "com.squareup.okhttp3", name = "okhttp", version.ref = "okhttp" }
+
+[plugins]
+kgp = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin"}