Merge branch 'refs/heads/main' into kotlin-k2

# Conflicts: # buildSrc/src/main/kotlin/Compiler.kt # gradle/libs.versions.toml
kordlib · May 21, 2024 · cd5af59 · cd5af59
2 parents e6bfb58 + c9161de
commit cd5af59
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 22 deletions.
diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
@@ -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
diff --git a/buildSrc/src/main/kotlin/Compiler.kt b/buildSrc/src/main/kotlin/Compiler.kt
@@ -1,10 +1,5 @@
-import kotlinx.atomicfu.plugin.gradle.AtomicFUPluginExtension
 import org.gradle.api.NamedDomainObjectSet
-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
 
@@ -33,11 +28,3 @@ internal fun NamedDomainObjectSet<KotlinSourceSet>.applyKordTestOptIns() {
         languageSettings.optIn("kotlinx.coroutines.ExperimentalCoroutinesApi")
     }
 }
-
-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
-    }
-}
diff --git a/buildSrc/src/main/kotlin/kord-module.gradle.kts b/buildSrc/src/main/kotlin/kord-module.gradle.kts
@@ -37,8 +37,6 @@ kotlin {
     }
 }
 
-configureAtomicFU()
-
 tasks {
     withType<Test>().configureEach {
         useJUnitPlatform()

diff --git a/buildSrc/src/main/kotlin/kord-multiplatform-module.gradle.kts b/buildSrc/src/main/kotlin/kord-multiplatform-module.gradle.kts
@@ -69,8 +69,6 @@ kotlin {
     }
 }
 
-configureAtomicFU()
-
 tasks {
     withType<Test>().configureEach {
         useJUnitPlatform()

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -12,7 +12,7 @@ kord-cache = "0.4.0" # https://github.com/kordlib/cache
 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.13" # https://www.slf4j.org
-kotlin-node = "20.11.30-pre.750" # https://github.com/JetBrains/kotlin-wrappers
+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.7" # https://github.com/touchlab/Stately
 fastZlib = "2.0.1" # https://github.com/timotejroiko/fast-zlib
@@ -30,7 +30,7 @@ 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
 

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,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