Update dependencies to latest versions (#279)

whyoleg · web-flow · commit dc76dc4342ba · 2024-11-30T09:15:46.000+02:00
* Update Gradle to 8.11
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.2")
+    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.1.0"
 
-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.115.Final"
+netty-quic = "0.0.69.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/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
diff --git a/gradlew.bat b/gradlew.bat
@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
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/rsocket-transports/ktor-tcp/src/commonMain/kotlin/io/rsocket/kotlin/transport/ktor/tcp/KtorTcpServerTransport.kt b/rsocket-transports/ktor-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/rsocket-transports/ktor-websocket-server/src/commonMain/kotlin/io/rsocket/kotlin/transport/ktor/websocket/server/KtorWebSocketServerTransport.kt b/rsocket-transports/ktor-websocket-server/src/commonMain/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"

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,5 @@ plugins {`
`21`	`21`	`dependencies {`
`22`	`22`	`implementation(libs.kotlin.gradle.plugin)`
`23`	`23`	`implementation(libs.kotlinx.bcv.gradle.plugin)`
`24`		`- implementation(libs.kotlinx.atomicfu.gradle.plugin)`
`25`	`24`	`implementation(libs.maven.publish.gradle.plugin)`
`26`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ plugins {`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`dependencies {`
`22`		`- implementation("com.gradle:gradle-enterprise-gradle-plugin:3.17.3")`
`23`		`- implementation("com.gradle:common-custom-user-data-gradle-plugin:2.0.1")`
	`22`	`+ implementation("com.gradle:gradle-enterprise-gradle-plugin:3.18.2")`
	`23`	`+ implementation("com.gradle:common-custom-user-data-gradle-plugin:2.0.2")`
`24`	`24`	`implementation("org.gradle.toolchains:foojay-resolver:0.8.0")`
`25`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@ import org.jetbrains.kotlin.gradle.targets.js.npm.*`
`19`	`19`
`20`	`20`	`plugins {`
`21`	`21`	`alias(libs.plugins.kotlin.multiplatform) apply false`
	`22`	`+ alias(libs.plugins.kotlinx.atomicfu) apply false`
`22`	`23`	`}`
`23`	`24`
`24`	`25`	`plugins.withType<NodeJsRootPlugin> {`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,8 @@`
`15`	`15`	`# See the License for the specific language governing permissions and`
`16`	`16`	`# limitations under the License.`
`17`	`17`	`#`
	`18`	`+# SPDX-License-Identifier: Apache-2.0`
	`19`	`+#`
`18`	`20`
`19`	`21`	`##############################################################################`
`20`	`22`	`#`
`@@ -55,7 +57,7 @@`
`55`	`57`	`# Darwin, MinGW, and NonStop.`
`56`	`58`	`#`
`57`	`59`	`# (3) This script is generated from the Groovy template`
`58`		`-# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt`
	`60`	`+# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt`
`59`	`61`	`# within the Gradle project.`
`60`	`62`	`#`
`61`	`63`	`# You can find Gradle at https://github.com/gradle/gradle/.`
`@@ -84,7 +86,8 @@ done`
`84`	`86`	`# shellcheck disable=SC2034`
`85`	`87`	`APP_BASE_NAME=${0##*/}`
`86`	`88`	`# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)`
`87`		`-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) \|\| exit`
	`89`	`+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s`
	`90`	`+' "$PWD" ) \|\| exit`
`88`	`91`
`89`	`92`	`# Use the maximum available, or set MAX_FD != -1 to use that value.`
`90`	`93`	`MAX_FD=maximum`