Skip to content

Commit 0b6e228

Browse files
committed
Update dependencies to latest versions
1 parent 7dd7ee9 commit 0b6e228

File tree

12 files changed

+21
-42
lines changed

12 files changed

+21
-42
lines changed

build-logic/build.gradle.kts

-1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,5 @@ plugins {
2121
dependencies {
2222
implementation(libs.kotlin.gradle.plugin)
2323
implementation(libs.kotlinx.bcv.gradle.plugin)
24-
implementation(libs.kotlinx.atomicfu.gradle.plugin)
2524
implementation(libs.maven.publish.gradle.plugin)
2625
}

build-logic/src/main/kotlin/rsocketbuild.atomicfu.gradle.kts

-20
This file was deleted.

build-settings/build.gradle.kts

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ plugins {
1919
}
2020

2121
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")
2424
implementation("org.gradle.toolchains:foojay-resolver:0.8.0")
2525
}

build.gradle.kts

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import org.jetbrains.kotlin.gradle.targets.js.npm.*
1919

2020
plugins {
2121
alias(libs.plugins.kotlin.multiplatform) apply false
22+
alias(libs.plugins.kotlinx.atomicfu) apply false
2223
}
2324

2425
plugins.withType<NodeJsRootPlugin> {

gradle.properties

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ version=0.16.0
1818
#Kotlin
1919
kotlin.mpp.import.enableKgpDependencyResolution=true
2020
kotlin.native.ignoreDisabledTargets=true
21-
kotlin.native.ignoreIncorrectDependencies=true
2221
kotlin.js.yarn=false
2322
kotlinx.atomicfu.enableJvmIrTransformation=true
2423
kotlinx.atomicfu.enableJsIrTransformation=true

gradle/libs.versions.toml

+11-10
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
[versions]
2-
kotlin = "2.0.0"
2+
kotlin = "2.1.0"
33

4-
kotlinx-atomicfu = "0.24.0"
5-
kotlinx-coroutines = "1.8.1"
4+
kotlinx-atomicfu = "0.26.0"
5+
kotlinx-coroutines = "1.9.0"
66
kotlinx-benchmark = "0.4.8"
7-
kotlinx-bcv = "0.14.0"
7+
kotlinx-bcv = "0.16.3"
88

9-
ktor = "2.3.11"
9+
ktor = "2.3.12"
1010

11-
netty = "4.1.110.Final"
12-
netty-quic = "0.0.63.Final"
11+
netty = "4.1.115.Final"
12+
netty-quic = "0.0.69.Final"
1313

1414
# for netty TLS tests
15-
bouncycastle = "1.78.1"
15+
bouncycastle = "1.79"
1616

17-
turbine = "1.1.0"
17+
turbine = "1.2.0"
1818

1919
rsocket-java = "1.1.3"
2020

2121
jmh = "1.36"
2222

23-
maven-publish = "0.28.0"
23+
maven-publish = "0.30.0"
2424

2525
[libraries]
2626
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
6464
[plugins]
6565
kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
6666
kotlinx-benchmark = { id = "org.jetbrains.kotlinx.benchmark", version.ref = "kotlinx-benchmark" }
67+
kotlinx-atomicfu = { id = "org.jetbrains.kotlinx.atomicfu", version.ref = "kotlinx-atomicfu" }

rsocket-core/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import rsocketbuild.*
1818

1919
plugins {
2020
id("rsocketbuild.multiplatform-library")
21-
id("rsocketbuild.atomicfu")
21+
alias(libs.plugins.kotlinx.atomicfu)
2222
}
2323

2424
description = "rsocket-kotlin core functionality"

rsocket-test/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import rsocketbuild.*
1919

2020
plugins {
2121
id("rsocketbuild.multiplatform-base")
22-
id("rsocketbuild.atomicfu")
22+
alias(libs.plugins.kotlinx.atomicfu)
2323
}
2424

2525
@OptIn(ExperimentalKotlinGradlePluginApi::class)

rsocket-transport-tests/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import rsocketbuild.*
1919

2020
plugins {
2121
id("rsocketbuild.multiplatform-base")
22-
id("rsocketbuild.atomicfu")
22+
alias(libs.plugins.kotlinx.atomicfu)
2323
}
2424

2525
@OptIn(ExperimentalKotlinGradlePluginApi::class)

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -112,10 +112,9 @@ private class KtorTcpServerTargetImpl(
112112
return startKtorTcpServer(this, bindSocket(), handler)
113113
}
114114

115-
@OptIn(ExperimentalCoroutinesApi::class)
116115
private suspend fun bindSocket(): ServerSocket = launchCoroutine { cont ->
117116
val socket = aSocket(selectorManager).tcp().bind(localAddress, socketOptions)
118-
cont.resume(socket) { socket.close() }
117+
cont.resume(socket) { _, value, _ -> value.close() }
119118
}
120119
}
121120

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -189,9 +189,9 @@ private class KtorWebSocketServerTargetImpl(
189189
applicationEngine: ApplicationEngine,
190190
): List<EngineConnectorConfig> = launchCoroutine { cont ->
191191
applicationEngine.start().stopServerOnCancellation()
192-
cont.resume(applicationEngine.resolvedConnectors()) {
192+
cont.resume(applicationEngine.resolvedConnectors()) { cause, _, _ ->
193193
// will cause stopping of the server
194-
applicationEngine.environment.parentCoroutineContext.job.cancel("Cancelled", it)
194+
applicationEngine.environment.parentCoroutineContext.job.cancel("Cancelled", cause)
195195
}
196196
}
197197
}

rsocket-transports/local/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import rsocketbuild.*
1818

1919
plugins {
2020
id("rsocketbuild.multiplatform-library")
21-
id("rsocketbuild.atomicfu")
21+
alias(libs.plugins.kotlinx.atomicfu)
2222
}
2323

2424
description = "rsocket-kotlin Local transport implementation"

0 commit comments

Comments
 (0)