Kotlin 2.0

.gitignore

@@ -6,6 +6,7 @@ syntax: glob
 !/.idea/codeStyles
 *.iml
 
+.kotlin
 .gradle
 classes
 build/

build-logic/src/main/kotlin/rsocketbuild.multiplatform-base.gradle.kts

@@ -32,16 +32,22 @@ plugins {
 @OptIn(ExperimentalKotlinGradlePluginApi::class)
 kotlin {
     compilerOptions {
-        // because of https://youtrack.jetbrains.com/issue/KT-64115/KGP-JVM-JS-WASM-The-same-library-can-be-passed-twice-to-the-compiler
-        // allWarningsAsErrors.set(true)
+        // because of INVISIBLE_REFERENCE suppression - will be removed after migration to kotlinx.io
+        if (project.name != "rsocket-test") {
+            allWarningsAsErrors.set(true)
+        }
         progressiveMode.set(true)
         freeCompilerArgs.add("-Xrender-internal-diagnostic-names")
+        optIn.addAll(OptIns.ExperimentalSubclassOptIn)
     }
 
     sourceSets.configureEach {
         languageSettings {
             if (name.contains("test", ignoreCase = true)) {
+                // for hex API
                 optIn(OptIns.ExperimentalStdlibApi)
+                // for channel.isClosedForSend - need to be replaced by testing via turbine or optIn in place
+                // and GlobalScope - need to be dropped
                 optIn(OptIns.DelicateCoroutinesApi)
 
                 // rsocket related
@@ -54,10 +60,8 @@ kotlin {
     }
 
     targets.withType<KotlinJvmTarget>().configureEach {
-        compilations.configureEach {
-            compilerOptions.configure {
-                freeCompilerArgs.add("-Xjvm-default=all")
-            }
+        compilerOptions {
+            freeCompilerArgs.add("-Xjvm-default=all")
         }
     }
 

build-logic/src/main/kotlin/rsocketbuild/OptIns.kt

@@ -18,6 +18,7 @@ package rsocketbuild
 
 @Suppress("ConstPropertyName")
 object OptIns {
+    const val ExperimentalSubclassOptIn = "kotlin.ExperimentalSubclassOptIn"
     const val ExperimentalStdlibApi = "kotlin.ExperimentalStdlibApi"
     const val ExperimentalCoroutinesApi = "kotlinx.coroutines.ExperimentalCoroutinesApi"
     const val DelicateCoroutinesApi = "kotlinx.coroutines.DelicateCoroutinesApi"

gradle/libs.versions.toml

@@ -1,5 +1,5 @@
 [versions]
-kotlin = "1.9.24"
+kotlin = "2.0.0"
 
 kotlinx-atomicfu = "0.24.0"
 kotlinx-coroutines = "1.8.1"

ktor-plugins/ktor-client-rsocket/src/commonMain/kotlin/io/rsocket/kotlin/ktor/client/RSocketSupport.kt

@@ -58,6 +58,7 @@ internal suspend fun HttpClient.connectRSocket(request: HttpRequestBuilder.() ->
     return config.connector.connect(RSocketSupportTarget(this, request))
 }
 
+@OptIn(RSocketTransportApi::class)
 private class RSocketSupportTarget(
     private val client: HttpClient,
     private val request: HttpRequestBuilder.() -> Unit,

rsocket-transports/ktor-tcp/src/commonMain/kotlin/io/rsocket/kotlin/transport/ktor/tcp/KtorTcpClientTransport.kt

@@ -23,6 +23,7 @@ import io.rsocket.kotlin.transport.*
 import kotlinx.coroutines.*
 import kotlin.coroutines.*
 
+@OptIn(RSocketTransportApi::class)
 public sealed interface KtorTcpClientTransport : RSocketTransport {
     public fun target(remoteAddress: SocketAddress): RSocketClientTarget
     public fun target(host: String, port: Int): RSocketClientTarget
@@ -31,6 +32,7 @@ public sealed interface KtorTcpClientTransport : RSocketTransport {
         RSocketTransportFactory<KtorTcpClientTransport, KtorTcpClientTransportBuilder>(::KtorTcpClientTransportBuilderImpl)
 }
 
+@OptIn(RSocketTransportApi::class)
 public sealed interface KtorTcpClientTransportBuilder : RSocketTransportBuilder<KtorTcpClientTransport> {
     public fun dispatcher(context: CoroutineContext)
     public fun inheritDispatcher(): Unit = dispatcher(EmptyCoroutineContext)
@@ -92,6 +94,7 @@ private class KtorTcpClientTransportImpl(
     override fun target(host: String, port: Int): RSocketClientTarget = target(InetSocketAddress(host, port))
 }
 
+@OptIn(RSocketTransportApi::class)
 private class KtorTcpClientTargetImpl(
     override val coroutineContext: CoroutineContext,
     private val socketOptions: SocketOptions.TCPClientSocketOptions.() -> Unit,

rsocket-transports/ktor-tcp/src/commonMain/kotlin/io/rsocket/kotlin/transport/ktor/tcp/KtorTcpServerTransport.kt

@@ -23,10 +23,12 @@ import io.rsocket.kotlin.transport.*
 import kotlinx.coroutines.*
 import kotlin.coroutines.*
 
+@OptIn(RSocketTransportApi::class)
 public sealed interface KtorTcpServerInstance : RSocketServerInstance {
     public val localAddress: SocketAddress
 }
 
+@OptIn(RSocketTransportApi::class)
 public sealed interface KtorTcpServerTransport : RSocketTransport {
     public fun target(localAddress: SocketAddress? = null): RSocketServerTarget<KtorTcpServerInstance>
     public fun target(host: String = "0.0.0.0", port: Int = 0): RSocketServerTarget<KtorTcpServerInstance>
@@ -35,6 +37,7 @@ public sealed interface KtorTcpServerTransport : RSocketTransport {
         RSocketTransportFactory<KtorTcpServerTransport, KtorTcpServerTransportBuilder>(::KtorTcpServerTransportBuilderImpl)
 }
 
+@OptIn(RSocketTransportApi::class)
 public sealed interface KtorTcpServerTransportBuilder : RSocketTransportBuilder<KtorTcpServerTransport> {
     public fun dispatcher(context: CoroutineContext)
     public fun inheritDispatcher(): Unit = dispatcher(EmptyCoroutineContext)
@@ -94,6 +97,7 @@ private class KtorTcpServerTransportImpl(
     override fun target(host: String, port: Int): RSocketServerTarget<KtorTcpServerInstance> = target(InetSocketAddress(host, port))
 }
 
+@OptIn(RSocketTransportApi::class)
 private class KtorTcpServerTargetImpl(
     override val coroutineContext: CoroutineContext,
     private val socketOptions: SocketOptions.AcceptorOptions.() -> Unit,

rsocket-transports/ktor-websocket-client/src/commonMain/kotlin/io/rsocket/kotlin/transport/ktor/websocket/client/KtorWebSocketClientTransport.kt

@@ -27,6 +27,7 @@ import io.rsocket.kotlin.transport.ktor.websocket.internal.*
 import kotlinx.coroutines.*
 import kotlin.coroutines.*
 
+@OptIn(RSocketTransportApi::class)
 public sealed interface KtorWebSocketClientTransport : RSocketTransport {
     public fun target(request: HttpRequestBuilder.() -> Unit): RSocketClientTarget
     public fun target(urlString: String, request: HttpRequestBuilder.() -> Unit = {}): RSocketClientTarget
@@ -43,6 +44,7 @@ public sealed interface KtorWebSocketClientTransport : RSocketTransport {
         RSocketTransportFactory<KtorWebSocketClientTransport, KtorWebSocketClientTransportBuilder>(::KtorWebSocketClientTransportBuilderImpl)
 }
 
+@OptIn(RSocketTransportApi::class)
 public sealed interface KtorWebSocketClientTransportBuilder : RSocketTransportBuilder<KtorWebSocketClientTransport> {
     public fun httpEngine(configure: HttpClientEngineConfig.() -> Unit)
     public fun httpEngine(engine: HttpClientEngine, configure: HttpClientEngineConfig.() -> Unit = {})
@@ -128,6 +130,7 @@ private class KtorWebSocketClientTransportImpl(
     }
 }
 
+@OptIn(RSocketTransportApi::class)
 private class KtorWebSocketClientTargetImpl(
     override val coroutineContext: CoroutineContext,
     private val httpClient: HttpClient,

rsocket-transports/ktor-websocket-server/src/commonMain/kotlin/io/rsocket/kotlin/transport/ktor/websocket/server/KtorWebSocketServerTransport.kt

@@ -26,12 +26,14 @@ import io.rsocket.kotlin.transport.ktor.websocket.internal.*
 import kotlinx.coroutines.*
 import kotlin.coroutines.*
 
+@OptIn(RSocketTransportApi::class)
 public sealed interface KtorWebSocketServerInstance : RSocketServerInstance {
     public val connectors: List<EngineConnectorConfig>
     public val path: String
     public val protocol: String?
 }
 
+@OptIn(RSocketTransportApi::class)
 public sealed interface KtorWebSocketServerTransport : RSocketTransport {
 
     public fun target(
@@ -63,6 +65,7 @@ public sealed interface KtorWebSocketServerTransport : RSocketTransport {
         RSocketTransportFactory<KtorWebSocketServerTransport, KtorWebSocketServerTransportBuilder>(::KtorWebSocketServerTransportBuilderImpl)
 }
 
+@OptIn(RSocketTransportApi::class)
 public sealed interface KtorWebSocketServerTransportBuilder : RSocketTransportBuilder<KtorWebSocketServerTransport> {
     public fun <A : ApplicationEngine, T : ApplicationEngine.Configuration> httpEngine(
         factory: ApplicationEngineFactory<A, T>,
@@ -137,6 +140,7 @@ private class KtorWebSocketServerTransportImpl(
     ): RSocketServerTarget<KtorWebSocketServerInstance> = target(listOf(connector), path, protocol)
 }
 
+@OptIn(RSocketTransportApi::class)
 private class KtorWebSocketServerTargetImpl(
     override val coroutineContext: CoroutineContext,
     private val factory: HttpServerFactory<*, *>,

rsocket-transports/local/src/commonMain/kotlin/io/rsocket/kotlin/transport/local/LocalClientTransport.kt

@@ -21,13 +21,15 @@ import io.rsocket.kotlin.transport.*
 import kotlinx.coroutines.*
 import kotlin.coroutines.*
 
+@OptIn(RSocketTransportApi::class)
 public sealed interface LocalClientTransport : RSocketTransport {
     public fun target(serverName: String): RSocketClientTarget
 
     public companion object Factory :
         RSocketTransportFactory<LocalClientTransport, LocalClientTransportBuilder>(::LocalClientTransportBuilderImpl)
 }
 
+@OptIn(RSocketTransportApi::class)
 public sealed interface LocalClientTransportBuilder : RSocketTransportBuilder<LocalClientTransport> {
     public fun dispatcher(context: CoroutineContext)
     public fun inheritDispatcher(): Unit = dispatcher(EmptyCoroutineContext)
@@ -56,6 +58,7 @@ private class LocalClientTransportImpl(
     )
 }
 
+@OptIn(RSocketTransportApi::class)
 private class LocalClientTargetImpl(
     override val coroutineContext: CoroutineContext,
     private val server: LocalServerInstanceImpl,

rsocket-transports/local/src/commonMain/kotlin/io/rsocket/kotlin/transport/local/LocalServerTransport.kt

@@ -24,10 +24,12 @@ import kotlin.coroutines.*
 import kotlin.random.*
 
 // TODO: rename to inprocess and more to another module/package later
+@OptIn(RSocketTransportApi::class)
 public sealed interface LocalServerInstance : RSocketServerInstance {
     public val serverName: String
 }
 
+@OptIn(RSocketTransportApi::class)
 public sealed interface LocalServerTransport : RSocketTransport {
     public fun target(): RSocketServerTarget<LocalServerInstance>
     public fun target(serverName: String): RSocketServerTarget<LocalServerInstance>
@@ -36,6 +38,7 @@ public sealed interface LocalServerTransport : RSocketTransport {
         RSocketTransportFactory<LocalServerTransport, LocalServerTransportBuilder>(::LocalServerTransportBuilderImpl)
 }
 
+@OptIn(RSocketTransportApi::class)
 public sealed interface LocalServerTransportBuilder : RSocketTransportBuilder<LocalServerTransport> {
     public fun dispatcher(context: CoroutineContext)
     public fun inheritDispatcher(): Unit = dispatcher(EmptyCoroutineContext)
@@ -90,6 +93,7 @@ private class LocalServerTransportImpl(
     )
 }
 
+@OptIn(RSocketTransportApi::class)
 private class LocalServerTargetImpl(
     override val coroutineContext: CoroutineContext,
     private val serverName: String,

rsocket-transports/netty-quic/src/jvmMain/kotlin/io/rsocket/kotlin/transport/netty/quic/NettyQuicClientTransport.kt

@@ -31,6 +31,7 @@ import java.net.*
 import kotlin.coroutines.*
 import kotlin.reflect.*
 
+@OptIn(RSocketTransportApi::class)
 public sealed interface NettyQuicClientTransport : RSocketTransport {
     public fun target(remoteAddress: InetSocketAddress): RSocketClientTarget
     public fun target(host: String, port: Int): RSocketClientTarget
@@ -39,6 +40,7 @@ public sealed interface NettyQuicClientTransport : RSocketTransport {
         RSocketTransportFactory<NettyQuicClientTransport, NettyQuicClientTransportBuilder>(::NettyQuicClientTransportBuilderImpl)
 }
 
+@OptIn(RSocketTransportApi::class)
 public sealed interface NettyQuicClientTransportBuilder : RSocketTransportBuilder<NettyQuicClientTransport> {
     public fun channel(cls: KClass<out DatagramChannel>)
     public fun channelFactory(factory: ChannelFactory<out DatagramChannel>)
@@ -137,6 +139,7 @@ private class NettyQuicClientTransportImpl(
     override fun target(host: String, port: Int): RSocketClientTarget = target(InetSocketAddress(host, port))
 }
 
+@OptIn(RSocketTransportApi::class)
 private class NettyQuicClientTargetImpl(
     override val coroutineContext: CoroutineContext,
     private val bootstrap: Bootstrap,

rsocket-transports/netty-quic/src/jvmMain/kotlin/io/rsocket/kotlin/transport/netty/quic/NettyQuicServerTransport.kt

@@ -32,10 +32,12 @@ import javax.net.ssl.*
 import kotlin.coroutines.*
 import kotlin.reflect.*
 
+@OptIn(RSocketTransportApi::class)
 public sealed interface NettyQuicServerInstance : RSocketServerInstance {
     public val localAddress: InetSocketAddress
 }
 
+@OptIn(RSocketTransportApi::class)
 public sealed interface NettyQuicServerTransport : RSocketTransport {
     public fun target(localAddress: InetSocketAddress? = null): RSocketServerTarget<NettyQuicServerInstance>
     public fun target(host: String = "127.0.0.1", port: Int = 0): RSocketServerTarget<NettyQuicServerInstance>
@@ -44,6 +46,7 @@ public sealed interface NettyQuicServerTransport : RSocketTransport {
         RSocketTransportFactory<NettyQuicServerTransport, NettyQuicServerTransportBuilder>(::NettyQuicServerTransportBuilderImpl)
 }
 
+@OptIn(RSocketTransportApi::class)
 public sealed interface NettyQuicServerTransportBuilder : RSocketTransportBuilder<NettyQuicServerTransport> {
     public fun channel(cls: KClass<out DatagramChannel>)
     public fun channelFactory(factory: ChannelFactory<out DatagramChannel>)
@@ -137,6 +140,7 @@ private class NettyQuicServerTransportImpl(
         target(InetSocketAddress(host, port))
 }
 
+@OptIn(RSocketTransportApi::class)
 private class NettyQuicServerTargetImpl(
     override val coroutineContext: CoroutineContext,
     private val bootstrap: Bootstrap,

rsocket-transports/netty-tcp/src/jvmMain/kotlin/io/rsocket/kotlin/transport/netty/tcp/NettyTcpClientTransport.kt

@@ -31,6 +31,7 @@ import java.net.*
 import kotlin.coroutines.*
 import kotlin.reflect.*
 
+@OptIn(RSocketTransportApi::class)
 public sealed interface NettyTcpClientTransport : RSocketTransport {
     public fun target(remoteAddress: SocketAddress): RSocketClientTarget
     public fun target(host: String, port: Int): RSocketClientTarget
@@ -39,6 +40,7 @@ public sealed interface NettyTcpClientTransport : RSocketTransport {
         RSocketTransportFactory<NettyTcpClientTransport, NettyTcpClientTransportBuilder>(::NettyTcpClientTransportBuilderImpl)
 }
 
+@OptIn(RSocketTransportApi::class)
 public sealed interface NettyTcpClientTransportBuilder : RSocketTransportBuilder<NettyTcpClientTransport> {
     public fun channel(cls: KClass<out DuplexChannel>)
     public fun channelFactory(factory: ChannelFactory<out DuplexChannel>)
@@ -119,6 +121,7 @@ private class NettyTcpClientTransportImpl(
     override fun target(host: String, port: Int): RSocketClientTarget = target(InetSocketAddress(host, port))
 }
 
+@OptIn(RSocketTransportApi::class)
 private class NettyTcpClientTargetImpl(
     override val coroutineContext: CoroutineContext,
     private val bootstrap: Bootstrap,

rsocket-transports/netty-tcp/src/jvmMain/kotlin/io/rsocket/kotlin/transport/netty/tcp/NettyTcpServerTransport.kt

@@ -31,10 +31,12 @@ import javax.net.ssl.*
 import kotlin.coroutines.*
 import kotlin.reflect.*
 
+@OptIn(RSocketTransportApi::class)
 public sealed interface NettyTcpServerInstance : RSocketServerInstance {
     public val localAddress: SocketAddress
 }
 
+@OptIn(RSocketTransportApi::class)
 public sealed interface NettyTcpServerTransport : RSocketTransport {
     public fun target(localAddress: SocketAddress? = null): RSocketServerTarget<NettyTcpServerInstance>
     public fun target(host: String = "0.0.0.0", port: Int = 0): RSocketServerTarget<NettyTcpServerInstance>
@@ -43,6 +45,7 @@ public sealed interface NettyTcpServerTransport : RSocketTransport {
         RSocketTransportFactory<NettyTcpServerTransport, NettyTcpServerTransportBuilder>(::NettyTcpServerTransportBuilderImpl)
 }
 
+@OptIn(RSocketTransportApi::class)
 public sealed interface NettyTcpServerTransportBuilder : RSocketTransportBuilder<NettyTcpServerTransport> {
     public fun channel(cls: KClass<out ServerChannel>)
     public fun channelFactory(factory: ChannelFactory<out ServerChannel>)
@@ -134,6 +137,7 @@ private class NettyTcpServerTransportImpl(
         target(InetSocketAddress(host, port))
 }
 
+@OptIn(RSocketTransportApi::class)
 private class NettyTcpServerTargetImpl(
     override val coroutineContext: CoroutineContext,
     private val bootstrap: ServerBootstrap,

rsocket-transports/netty-websocket/src/jvmMain/kotlin/io/rsocket/kotlin/transport/netty/websocket/NettyWebSocketClientTransport.kt

@@ -33,6 +33,7 @@ import java.net.*
 import kotlin.coroutines.*
 import kotlin.reflect.*
 
+@OptIn(RSocketTransportApi::class)
 public sealed interface NettyWebSocketClientTransport : RSocketTransport {
     public fun target(configure: WebSocketClientProtocolConfig.Builder.() -> Unit): RSocketClientTarget
     public fun target(uri: URI, configure: WebSocketClientProtocolConfig.Builder.() -> Unit = {}): RSocketClientTarget
@@ -49,6 +50,7 @@ public sealed interface NettyWebSocketClientTransport : RSocketTransport {
         RSocketTransportFactory<NettyWebSocketClientTransport, NettyWebSocketClientTransportBuilder>(::NettyWebSocketClientTransportBuilderImpl)
 }
 
+@OptIn(RSocketTransportApi::class)
 public sealed interface NettyWebSocketClientTransportBuilder : RSocketTransportBuilder<NettyWebSocketClientTransport> {
     public fun channel(cls: KClass<out DuplexChannel>)
     public fun channelFactory(factory: ChannelFactory<out DuplexChannel>)
@@ -174,6 +176,7 @@ private class NettyWebSocketClientTransportImpl(
     }
 }
 
+@OptIn(RSocketTransportApi::class)
 private class NettyWebSocketClientTransportTargetImpl(
     override val coroutineContext: CoroutineContext,
     private val bootstrap: Bootstrap,

rsocket-transports/netty-websocket/src/jvmMain/kotlin/io/rsocket/kotlin/transport/netty/websocket/NettyWebSocketServerTransport.kt

@@ -33,11 +33,13 @@ import javax.net.ssl.*
 import kotlin.coroutines.*
 import kotlin.reflect.*
 
+@OptIn(RSocketTransportApi::class)
 public sealed interface NettyWebSocketServerInstance : RSocketServerInstance {
     public val localAddress: InetSocketAddress
     public val webSocketProtocolConfig: WebSocketServerProtocolConfig
 }
 
+@OptIn(RSocketTransportApi::class)
 public sealed interface NettyWebSocketServerTransport : RSocketTransport {
 
     public fun target(
@@ -57,6 +59,7 @@ public sealed interface NettyWebSocketServerTransport : RSocketTransport {
         RSocketTransportFactory<NettyWebSocketServerTransport, NettyWebSocketServerTransportBuilder>(::NettyWebSocketServerTransportBuilderImpl)
 }
 
+@OptIn(RSocketTransportApi::class)
 public sealed interface NettyWebSocketServerTransportBuilder : RSocketTransportBuilder<NettyWebSocketServerTransport> {
     public fun channel(cls: KClass<out ServerChannel>)
     public fun channelFactory(factory: ChannelFactory<out ServerChannel>)
@@ -168,6 +171,7 @@ private class NettyWebSocketServerTransportImpl(
         target(InetSocketAddress(host, port), path, protocol)
 }
 
+@OptIn(RSocketTransportApi::class)
 private class NettyWebSocketServerTargetImpl(
     override val coroutineContext: CoroutineContext,
     private val bootstrap: ServerBootstrap,