Merge pull request #1001 from KyoriPowered/renovate/gradle-and-github…

…-actions

chore(deps): Update gradle and github actions

build-logic/src/main/kotlin/adventure.common-conventions.gradle.kts

@@ -90,7 +90,7 @@ tasks {
     dependsOn(test)
   }
 
-  withType(JavaCompile::class) {
+  withType(JavaCompile::class).configureEach {
     options.errorprone {
       disable("InvalidBlockTag") // we use custom block tags
       disable("InlineMeSuggester") // we don't use errorprone annotations

build-logic/src/main/kotlin/adventure.json-impl-conventions.gradle.kts

@@ -5,11 +5,7 @@ plugins {
   id("adventure.common-conventions")
 }
 
-val sharedTests by configurations.registering {
-  isVisible = false
-  isCanBeResolved = false
-  isCanBeConsumed = false
-}
+val sharedTests = configurations.dependencyScope("sharedTests")
 
 val sharedTestDirs by configurations.registering {
   isVisible = false

gradle/libs.versions.toml

@@ -75,5 +75,5 @@ zJmh = { module = "org.openjdk.jmh:jmh-core", version.ref = "jmh" }
 [plugins]
 indra-sonatype = { id = "net.kyori.indra.publishing.sonatype", version.ref = "indra" }
 jmh = { id = "me.champeau.jmh", version.ref = "jmhPlugin" }
-kotlin = "org.jetbrains.kotlin.jvm:1.9.20"
-nexusPublish = { id = "io.github.gradle-nexus.publish-plugin", version = "2.0.0-rc-1" }
+kotlin = "org.jetbrains.kotlin.jvm:1.9.24"
+nexusPublish = { id = "io.github.gradle-nexus.publish-plugin", version = "2.0.0" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -55,7 +55,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/.

gradlew.bat

@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 

settings.gradle.kts

@@ -14,7 +14,7 @@ pluginManagement {
 }
 
 plugins {
-  id("org.gradle.toolchains.foojay-resolver-convention") version "0.7.0"
+  id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
 }
 
 enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")

text-serializer-json/build.gradle.kts

@@ -14,25 +14,27 @@ val jmhJar by tasks.registering(Jar::class) {
   from(jmh.map { it.output })
 }
 
-configurations.register("jmh") {
-  attributes {
-    attribute(Category.CATEGORY_ATTRIBUTE, objects.named(Category.LIBRARY))
-    attribute(Usage.USAGE_ATTRIBUTE, objects.named(Usage.JAVA_RUNTIME))
-    attribute(Bundling.BUNDLING_ATTRIBUTE, objects.named(Bundling.EXTERNAL))
-    attribute(LibraryElements.LIBRARY_ELEMENTS_ATTRIBUTE, objects.named(LibraryElements.JAR))
-  }
+configurations {
+  consumable("jmh") {
+    attributes {
+      attribute(Category.CATEGORY_ATTRIBUTE, objects.named(Category.LIBRARY))
+      attribute(Usage.USAGE_ATTRIBUTE, objects.named(Usage.JAVA_RUNTIME))
+      attribute(Bundling.BUNDLING_ATTRIBUTE, objects.named(Bundling.EXTERNAL))
+      attribute(LibraryElements.LIBRARY_ELEMENTS_ATTRIBUTE, objects.named(LibraryElements.JAR))
+    }
 
-  outgoing {
-    capabilities.clear()
-    capability("${project.group}:${project.name}-benchmarks:${project.version}")
+    outgoing {
+      capabilities.clear()
+      capability("${project.group}:${project.name}-benchmarks:${project.version}")
 
-    artifact(jmhJar.flatMap { it.archiveFile })
-    variants.create("classes") {
-      attributes {
-        attribute(LibraryElements.LIBRARY_ELEMENTS_ATTRIBUTE, objects.named(LibraryElements.CLASSES))
-      }
-      artifact(jmh.map { it.output.classesDirs.singleFile }) {
-        type = "directory"
+      artifact(jmhJar.flatMap { it.archiveFile })
+      variants.create("classes") {
+        attributes {
+          attribute(LibraryElements.LIBRARY_ELEMENTS_ATTRIBUTE, objects.named(LibraryElements.CLASSES))
+        }
+        artifact(jmh.map { it.output.classesDirs.singleFile }) {
+          type = "directory"
+        }
       }
     }
   }