Skip to content

Commit

Permalink
Update dependencies (#943)
Browse files Browse the repository at this point in the history
* Gradle 8.6 -> 8.7
* Kotlin 1.9.22 -> 1.9.24
* Ktor 2.3.9 -> 2.3.11
* kotlinx.coroutines 1.8.0 -> 1.8.1
* kotlinx-datetime 0.5.0 -> 0.6.0
* kotlin-logging 6.0.3 -> 6.0.9
* SLF4J 2.0.12 -> 2.0.13
* kotlin-node 20.11.5-pre.706 -> 20.11.30-pre.751
* Stately 2.0.6 -> 2.0.7
* KSP 1.9.22-1.0.17 -> 1.9.24-1.0.20
* MockK 1.13.10 -> 1.13.11
* BSON 5.0.1 -> 5.1.0
* AtomicFU 0.23.2 -> 0.24.0
* Replace gradle/wrapper-validation-action with gradle/actions/wrapper-validation
  • Loading branch information
lukellmann authored May 21, 2024
1 parent 2518603 commit c9161de
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 32 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/gradle-wrapper-validation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Validate Gradle Wrapper
uses: gradle/wrapper-validation-action@v2
uses: gradle/actions/wrapper-validation@v3
13 changes: 0 additions & 13 deletions buildSrc/src/main/kotlin/Compiler.kt
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
import kotlinx.atomicfu.plugin.gradle.AtomicFUPluginExtension
import org.gradle.api.Project
import org.gradle.api.artifacts.VersionCatalogsExtension
import org.gradle.kotlin.dsl.assign
import org.gradle.kotlin.dsl.configure
import org.gradle.kotlin.dsl.getByType
import org.jetbrains.kotlin.gradle.dsl.KotlinCommonCompilerOptions
import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet

Expand Down Expand Up @@ -37,11 +32,3 @@ fun KotlinSourceSet.applyKordOptIns() {
kordOptIns.forEach(::optIn)
}
}

fun Project.configureAtomicFU() {
// https://github.com/Kotlin/kotlinx-atomicfu/issues/210
configure<AtomicFUPluginExtension> {
val libs = extensions.getByType<VersionCatalogsExtension>().named("libs")
dependenciesVersion = libs.findVersion("kotlinx-atomicfu").get().requiredVersion
}
}
2 changes: 0 additions & 2 deletions buildSrc/src/main/kotlin/kord-module.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@ kotlin {
}
}

configureAtomicFU()

tasks {
withType<Test>().configureEach {
useJUnitPlatform()
Expand Down
2 changes: 0 additions & 2 deletions buildSrc/src/main/kotlin/kord-multiplatform-module.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,6 @@ kotlin {
}
}

configureAtomicFU()

tasks {
withType<Test>().configureEach {
useJUnitPlatform()
Expand Down
24 changes: 12 additions & 12 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,36 +1,36 @@
[versions]

# api dependencies
kotlin = "1.9.22" # https://github.com/JetBrains/kotlin
ktor = "2.3.9" # https://github.com/ktorio/ktor
kotlinx-coroutines = "1.8.0" # https://github.com/Kotlin/kotlinx.coroutines
kotlin = "1.9.24" # https://github.com/JetBrains/kotlin
ktor = "2.3.11" # https://github.com/ktorio/ktor
kotlinx-coroutines = "1.8.1" # https://github.com/Kotlin/kotlinx.coroutines
kotlinx-serialization = "1.6.3" # https://github.com/Kotlin/kotlinx.serialization
kotlinx-datetime = "0.5.0" # https://github.com/Kotlin/kotlinx-datetime
kotlinx-datetime = "0.6.0" # https://github.com/Kotlin/kotlinx-datetime
kord-cache = "0.4.0" # https://github.com/kordlib/cache

# implementation dependencies
kotlin-logging = "6.0.3" # https://github.com/oshai/kotlin-logging
kotlin-logging = "6.0.9" # https://github.com/oshai/kotlin-logging
kotlin-logging-old = "3.0.5" # TODO remove after dependency is removed in rest, gateway, voice and core
slf4j = "2.0.12" # https://www.slf4j.org
kotlin-node = "20.11.5-pre.706" # https://github.com/JetBrains/kotlin-wrappers
slf4j = "2.0.13" # https://www.slf4j.org
kotlin-node = "20.11.30-pre.751" # https://github.com/JetBrains/kotlin-wrappers
bignum = "0.3.9" # https://github.com/ionspin/kotlin-multiplatform-bignum
stately = "2.0.6" # https://github.com/touchlab/Stately
stately = "2.0.7" # https://github.com/touchlab/Stately
fastZlib = "2.0.1" # https://github.com/timotejroiko/fast-zlib

# code generation
ksp = "1.9.22-1.0.17" # https://github.com/google/ksp
ksp = "1.9.24-1.0.20" # https://github.com/google/ksp
kotlinpoet = "1.16.0" # https://github.com/square/kotlinpoet

# tests
junit-jupiter = "5.10.2" # https://github.com/junit-team/junit5
junit-platform = "1.10.2"
mockk = "1.13.10" # https://github.com/mockk/mockk
bson = "5.0.1" # https://github.com/mongodb/mongo-java-driver
mockk = "1.13.11" # https://github.com/mockk/mockk
bson = "5.1.0" # https://github.com/mongodb/mongo-java-driver
kbson = "0.5.0" # https://github.com/jershell/kbson

# plugins
dokka = "1.9.20" # https://github.com/Kotlin/dokka
kotlinx-atomicfu = "0.23.2" # https://github.com/Kotlin/kotlinx-atomicfu
kotlinx-atomicfu = "0.24.0" # https://github.com/Kotlin/kotlinx-atomicfu
binary-compatibility-validator = "0.15.0-Beta.2" # https://github.com/Kotlin/binary-compatibility-validator
buildconfig = "5.3.5" # https://github.com/gmazzo/gradle-buildconfig-plugin

Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionSha256Sum=9631d53cf3e74bfa726893aee1f8994fee4e060c401335946dba2156f440f24c
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
distributionSha256Sum=544c35d6bd849ae8a5ed0bcea39ba677dc40f49df7d1835561582da2009b961d
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down

0 comments on commit c9161de

Please sign in to comment.