Update dependencies to latest versions

rsocket · Nov 11, 2024 · 353fe93 · 353fe93
1 parent 3fbf0f0
commit 353fe93
Show file tree

Hide file tree

Showing 12 changed files with 21 additions and 42 deletions.
diff --git a/build-logic/build.gradle.kts b/build-logic/build.gradle.kts
@@ -21,6 +21,5 @@ plugins {
 dependencies {
     implementation(libs.kotlin.gradle.plugin)
     implementation(libs.kotlinx.bcv.gradle.plugin)
-    implementation(libs.kotlinx.atomicfu.gradle.plugin)
     implementation(libs.maven.publish.gradle.plugin)
 }
diff --git a/build-logic/src/main/kotlin/rsocketbuild.atomicfu.gradle.kts b/build-logic/src/main/kotlin/rsocketbuild.atomicfu.gradle.kts
diff --git a/build-settings/build.gradle.kts b/build-settings/build.gradle.kts
@@ -19,7 +19,7 @@ plugins {
 }
 
 dependencies {
-    implementation("com.gradle:gradle-enterprise-gradle-plugin:3.17.3")
-    implementation("com.gradle:common-custom-user-data-gradle-plugin:2.0.1")
+    implementation("com.gradle:gradle-enterprise-gradle-plugin:3.18.1")
+    implementation("com.gradle:common-custom-user-data-gradle-plugin:2.0.2")
     implementation("org.gradle.toolchains:foojay-resolver:0.8.0")
 }
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -19,6 +19,7 @@ import org.jetbrains.kotlin.gradle.targets.js.npm.*
 
 plugins {
     alias(libs.plugins.kotlin.multiplatform) apply false
+    alias(libs.plugins.kotlinx.atomicfu) apply false
 }
 
 plugins.withType<NodeJsRootPlugin> {

diff --git a/gradle.properties b/gradle.properties
@@ -18,7 +18,6 @@ version=0.16.0
 #Kotlin
 kotlin.mpp.import.enableKgpDependencyResolution=true
 kotlin.native.ignoreDisabledTargets=true
-kotlin.native.ignoreIncorrectDependencies=true
 kotlin.js.yarn=false
 kotlinx.atomicfu.enableJvmIrTransformation=true
 kotlinx.atomicfu.enableJsIrTransformation=true

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,26 +1,26 @@
 [versions]
-kotlin = "2.0.0"
+kotlin = "2.0.21"
 
-kotlinx-atomicfu = "0.24.0"
-kotlinx-coroutines = "1.8.1"
+kotlinx-atomicfu = "0.26.0"
+kotlinx-coroutines = "1.9.0"
 kotlinx-benchmark = "0.4.8"
-kotlinx-bcv = "0.14.0"
+kotlinx-bcv = "0.16.3"
 
-ktor = "2.3.11"
+ktor = "2.3.12"
 
-netty = "4.1.110.Final"
-netty-quic = "0.0.63.Final"
+netty = "4.1.114.Final"
+netty-quic = "0.0.68.Final"
 
 # for netty TLS tests
-bouncycastle = "1.78.1"
+bouncycastle = "1.79"
 
-turbine = "1.1.0"
+turbine = "1.2.0"
 
 rsocket-java = "1.1.3"
 
 jmh = "1.36"
 
-maven-publish = "0.28.0"
+maven-publish = "0.30.0"
 
 [libraries]
 kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" }
@@ -64,3 +64,4 @@ maven-publish-gradle-plugin = { module = "com.vanniktech:gradle-maven-publish-pl
 [plugins]
 kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
 kotlinx-benchmark = { id = "org.jetbrains.kotlinx.benchmark", version.ref = "kotlinx-benchmark" }
+kotlinx-atomicfu = { id = "org.jetbrains.kotlinx.atomicfu", version.ref = "kotlinx-atomicfu" }
diff --git a/rsocket-core/build.gradle.kts b/rsocket-core/build.gradle.kts
@@ -18,7 +18,7 @@ import rsocketbuild.*
 
 plugins {
     id("rsocketbuild.multiplatform-library")
-    id("rsocketbuild.atomicfu")
+    alias(libs.plugins.kotlinx.atomicfu)
 }
 
 description = "rsocket-kotlin core functionality"

diff --git a/rsocket-test/build.gradle.kts b/rsocket-test/build.gradle.kts
@@ -19,7 +19,7 @@ import rsocketbuild.*
 
 plugins {
     id("rsocketbuild.multiplatform-base")
-    id("rsocketbuild.atomicfu")
+    alias(libs.plugins.kotlinx.atomicfu)
 }
 
 @OptIn(ExperimentalKotlinGradlePluginApi::class)

diff --git a/rsocket-transport-tests/build.gradle.kts b/rsocket-transport-tests/build.gradle.kts
@@ -19,7 +19,7 @@ import rsocketbuild.*
 
 plugins {
     id("rsocketbuild.multiplatform-base")
-    id("rsocketbuild.atomicfu")
+    alias(libs.plugins.kotlinx.atomicfu)
 }
 
 @OptIn(ExperimentalKotlinGradlePluginApi::class)

diff --git a/...-tcp/src/commonMain/kotlin/io/rsocket/kotlin/transport/ktor/tcp/KtorTcpServerTransport.kt b/...-tcp/src/commonMain/kotlin/io/rsocket/kotlin/transport/ktor/tcp/KtorTcpServerTransport.kt
@@ -112,10 +112,9 @@ private class KtorTcpServerTargetImpl(
         return startKtorTcpServer(this, bindSocket(), handler)
     }
 
-    @OptIn(ExperimentalCoroutinesApi::class)
     private suspend fun bindSocket(): ServerSocket = launchCoroutine { cont ->
         val socket = aSocket(selectorManager).tcp().bind(localAddress, socketOptions)
-        cont.resume(socket) { socket.close() }
+        cont.resume(socket) { _, value, _ -> value.close() }
     }
 }
 

diff --git a/.../kotlin/io/rsocket/kotlin/transport/ktor/websocket/server/KtorWebSocketServerTransport.kt b/.../kotlin/io/rsocket/kotlin/transport/ktor/websocket/server/KtorWebSocketServerTransport.kt
@@ -189,9 +189,9 @@ private class KtorWebSocketServerTargetImpl(
         applicationEngine: ApplicationEngine,
     ): List<EngineConnectorConfig> = launchCoroutine { cont ->
         applicationEngine.start().stopServerOnCancellation()
-        cont.resume(applicationEngine.resolvedConnectors()) {
+        cont.resume(applicationEngine.resolvedConnectors()) { cause, _, _ ->
             // will cause stopping of the server
-            applicationEngine.environment.parentCoroutineContext.job.cancel("Cancelled", it)
+            applicationEngine.environment.parentCoroutineContext.job.cancel("Cancelled", cause)
         }
     }
 }

diff --git a/rsocket-transports/local/build.gradle.kts b/rsocket-transports/local/build.gradle.kts
@@ -18,7 +18,7 @@ import rsocketbuild.*
 
 plugins {
     id("rsocketbuild.multiplatform-library")
-    id("rsocketbuild.atomicfu")
+    alias(libs.plugins.kotlinx.atomicfu)
 }
 
 description = "rsocket-kotlin Local transport implementation"