Update Kotlin, Gradle and some other minor versions (#286)

* Gradle 8.12.1 * Kotlin 2.1.10
rsocket · Jan 30, 2025 · aeaf294 · aeaf294
1 parent ed67b75
commit aeaf294
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 18 deletions.
diff --git a/build-settings/build.gradle.kts b/build-settings/build.gradle.kts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2024 the original author or authors.
+ * Copyright 2015-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@ plugins {
 }
 
 dependencies {
-    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")
+    implementation("com.gradle:gradle-enterprise-gradle-plugin:3.19.1")
+    implementation("com.gradle:common-custom-user-data-gradle-plugin:2.1")
+    implementation("org.gradle.toolchains:foojay-resolver:0.9.0")
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,19 +1,19 @@
 [versions]
-kotlin = "2.1.0"
+kotlin = "2.1.10"
 
 kotlinx-io = "0.6.0"
-kotlinx-atomicfu = "0.26.0"
-kotlinx-coroutines = "1.9.0"
+kotlinx-atomicfu = "0.27.0"
+kotlinx-coroutines = "1.10.1"
 kotlinx-benchmark = "0.4.8"
-kotlinx-bcv = "0.16.3"
+kotlinx-bcv = "0.17.0"
 
-ktor = "3.0.2"
+ktor = "3.0.3"
 
-netty = "4.1.115.Final"
-netty-quic = "0.0.69.Final"
+netty = "4.1.117.Final"
+netty-quic = "0.0.70.Final"
 
 # for netty TLS tests
-bouncycastle = "1.79"
+bouncycastle = "1.80"
 
 turbine = "1.2.0"
 

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.11-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/gradlew b/gradlew
@@ -86,8 +86,7 @@ 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 -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

diff --git a/rsocket-core/api/rsocket-core.api b/rsocket-core/api/rsocket-core.api
@@ -46,12 +46,9 @@ public final class io/rsocket/kotlin/PrefetchStrategy : io/rsocket/kotlin/Reques
 
 public abstract interface class io/rsocket/kotlin/RSocket : kotlinx/coroutines/CoroutineScope {
 	public fun fireAndForget (Lio/rsocket/kotlin/payload/Payload;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun fireAndForget$suspendImpl (Lio/rsocket/kotlin/RSocket;Lio/rsocket/kotlin/payload/Payload;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun metadataPush (Lkotlinx/io/Buffer;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun metadataPush$suspendImpl (Lio/rsocket/kotlin/RSocket;Lkotlinx/io/Buffer;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun requestChannel (Lio/rsocket/kotlin/payload/Payload;Lkotlinx/coroutines/flow/Flow;)Lkotlinx/coroutines/flow/Flow;
 	public fun requestResponse (Lio/rsocket/kotlin/payload/Payload;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static synthetic fun requestResponse$suspendImpl (Lio/rsocket/kotlin/RSocket;Lio/rsocket/kotlin/payload/Payload;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun requestStream (Lio/rsocket/kotlin/payload/Payload;)Lkotlinx/coroutines/flow/Flow;
 }