chore: Update Gradle, plugins, and some dependencies

nhubbard · Dec 26, 2024 · bf40436 · bf40436
1 parent 9a035b0
commit bf40436
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 19 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -39,8 +39,8 @@ val signPublication by extra { !System.getenv("JITPACK").toBoolean() }
 plugins {
     java
     signing
-    kotlin("jvm") version "2.0.20-RC2"
-    kotlin("plugin.allopen") version "2.0.20-RC2"
+    kotlin("jvm") version "2.1.0"
+    kotlin("plugin.allopen") version "2.1.0"
     alias(libs.plugins.dokka)
     alias(libs.plugins.kover)
     alias(libs.plugins.benchmark)
@@ -109,7 +109,9 @@ dependencies {
 
     // Core test dependencies
     testImplementation(kotlin("test"))
+    testImplementation(libs.junit.jupiter)
     testImplementation(libs.junit.params)
+    testRuntimeOnly(libs.junit.launcher)
     testImplementation(libs.spark)
     testRuntimeOnly(libs.slf4j.simple)
 
@@ -190,10 +192,9 @@ tasks.named<Jar>("javadocJar") {
 }
 
 // This makes sure that Gradle is always run using JDK 21, independent of the build requirements for Konf.
-tasks.updateDaemonJvm {
-    @Suppress("UnstableApiUsage")
-    jvmVersion = JavaVersion.VERSION_21
-}
+// tasks.updateDaemonJvm {
+//    jvmVersion = JavaVersion.VERSION_21
+// }
 
 kotlin {
     jvmToolchain(11)

diff --git a/gradle.properties b/gradle.properties
@@ -21,4 +21,5 @@ org.gradle.caching=true
 org.gradle.vfs.watch=true
 org.gradle.parallel=true
 org.gradle.configureondemand=true
-org.gradle.configuration-cache=true
+org.gradle.configuration-cache=true
+org.jetbrains.dokka.experimental.gradle.pluginMode=V2EnabledWithHelpers
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.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -26,8 +26,8 @@ pluginManagement {
 rootProject.name = "konf"
 
 plugins {
-    id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
-    id("com.gradle.develocity") version "3.17.6"
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.9.0"
+    id("com.gradle.develocity") version "3.19"
 }
 
 develocity {
@@ -49,16 +49,16 @@ dependencyResolutionManagement {
             version("graal", "22.3.5")
 
             // Gradle plugins
-            plugin("dokka", "org.jetbrains.dokka").version("1.9.20")
-            plugin("kover", "org.jetbrains.kotlinx.kover").version("0.8.3")
-            plugin("benchmark", "org.jetbrains.kotlinx.benchmark").version("0.4.11")
+            plugin("dokka", "org.jetbrains.dokka").version("2.0.0")
+            plugin("kover", "org.jetbrains.kotlinx.kover").version("0.9.0")
+            plugin("benchmark", "org.jetbrains.kotlinx.benchmark").version("0.4.13")
             plugin("sonatype-publisher", "net.thebugmc.gradle.sonatype-central-portal-publisher").version("1.2.4")
             plugin("solo-publisher", "ca.solo-studios.sonatype-publish").version("0.2.3")
 
             // Dependencies
-            library("kotlinx-coroutines-core", "org.jetbrains.kotlinx", "kotlinx-coroutines-core").version("1.9.0-RC.2")
+            library("kotlinx-coroutines-core", "org.jetbrains.kotlinx", "kotlinx-coroutines-core").version("1.10.1")
             library("reflections", "org.reflections", "reflections").version("0.10.2")
-            library("commons-text", "org.apache.commons", "commons-text").version("1.12.0")
+            library("commons-text", "org.apache.commons", "commons-text").version("1.13.0")
             library("jackson-core", "com.fasterxml.jackson.core", "jackson-core").versionRef("jackson")
             library("jackson-annotations", "com.fasterxml.jackson.core", "jackson-annotations").versionRef("jackson")
             library("jackson-databind", "com.fasterxml.jackson.core", "jackson-databind").versionRef("jackson")
@@ -71,15 +71,17 @@ dependencyResolutionManagement {
             library("toml", "com.moandjiezana.toml", "toml4j").version("0.7.2")
             library("dom4j", "org.dom4j", "dom4j").version("2.1.4")
             library("jaxen", "jaxen", "jaxen").version("2.0.0")
-            library("snakeyaml", "org.yaml", "snakeyaml").version("2.2")
+            library("snakeyaml", "org.yaml", "snakeyaml").version("2.3")
 
             // Test dependencies
-            library("junit-params", "org.junit.jupiter", "junit-jupiter-params").version("5.11.0")
+            library("junit-jupiter", "org.junit.jupiter", "junit-jupiter").version("5.11.4")
+            library("junit-params", "org.junit.jupiter", "junit-jupiter-params").version("5.11.4")
+            library("junit-launcher", "org.junit.platform", "junit-platform-launcher").version("1.11.4")
             library("spark", "com.sparkjava", "spark-core").version("2.9.4")
-            library("slf4j-simple", "org.slf4j", "slf4j-simple").version("2.1.0-alpha1")
+            library("slf4j-simple", "org.slf4j", "slf4j-simple").version("2.0.16")
 
             // Benchmark dependencies
-            library("kotlinx-benchmark-runtime", "org.jetbrains.kotlinx", "kotlinx-benchmark-runtime").version("0.4.11")
+            library("kotlinx-benchmark-runtime", "org.jetbrains.kotlinx", "kotlinx-benchmark-runtime").version("0.4.13")
 
             // Library bundles
             bundle("jackson", listOf("jackson-core", "jackson-annotations", "jackson-databind", "jackson-kotlin", "jackson-jsr310"))