Skip to content

Commit

Permalink
Update dependencies to latest versions (#279)
Browse files Browse the repository at this point in the history
* Update Gradle to 8.11
  • Loading branch information
whyoleg authored Nov 30, 2024
1 parent 66873a3 commit dc76dc4
Show file tree
Hide file tree
Showing 16 changed files with 29 additions and 45 deletions.
1 change: 0 additions & 1 deletion build-logic/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
20 changes: 0 additions & 20 deletions build-logic/src/main/kotlin/rsocketbuild.atomicfu.gradle.kts

This file was deleted.

4 changes: 2 additions & 2 deletions build-settings/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
1 change: 1 addition & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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> {
Expand Down
1 change: 0 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
21 changes: 11 additions & 10 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -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" }
Expand Down Expand Up @@ -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" }
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
Expand Down
7 changes: 5 additions & 2 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
# SPDX-License-Identifier: Apache-2.0
#

##############################################################################
#
Expand Down Expand Up @@ -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/.
Expand Down Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -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 ##########################################################################
Expand Down
2 changes: 1 addition & 1 deletion rsocket-core/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import rsocketbuild.*

plugins {
id("rsocketbuild.multiplatform-library")
id("rsocketbuild.atomicfu")
alias(libs.plugins.kotlinx.atomicfu)
}

description = "rsocket-kotlin core functionality"
Expand Down
2 changes: 1 addition & 1 deletion rsocket-test/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import rsocketbuild.*

plugins {
id("rsocketbuild.multiplatform-base")
id("rsocketbuild.atomicfu")
alias(libs.plugins.kotlinx.atomicfu)
}

@OptIn(ExperimentalKotlinGradlePluginApi::class)
Expand Down
2 changes: 1 addition & 1 deletion rsocket-transport-tests/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import rsocketbuild.*

plugins {
id("rsocketbuild.multiplatform-base")
id("rsocketbuild.atomicfu")
alias(libs.plugins.kotlinx.atomicfu)
}

@OptIn(ExperimentalKotlinGradlePluginApi::class)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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() }
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion rsocket-transports/local/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit dc76dc4

Please sign in to comment.