Merge pull request #174 from KyoriPowered/chore/bump-deps

chore(deps): Update various deps without updating Spotless
KyoriPowered · Aug 25, 2024 · eb48180 · eb48180
2 parents 27cf999 + 45a4e27
commit eb48180
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 23 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -31,8 +31,8 @@ mammoth = { module = "net.kyori:mammoth", version.ref = "mammoth" }
 
 asm = { module = "org.ow2.asm:asm", version.ref = "asm" }
 cadixLicenser = "gradle.plugin.org.cadixdev.gradle:licenser:0.6.1"
-# https://github.com/gradlex-org/java-ecosystem-capabilities
-javaEcosystemCapabilities = { module = "org.gradlex:java-ecosystem-capabilities", version = "1.3.1" }
+# https://github.com/gradlex-org/jvm-dependency-conflict-resolution/
+jvmDependencyConflictResolution = { module = "org.gradlex:jvm-dependency-conflict-resolution", version = "2.1.2" }
 kotlinPlugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
 
 # git
@@ -45,7 +45,7 @@ gradlePluginPublish = { module = "com.gradle.publish:plugin-publish-plugin", ver
 
 # publishing-sonatype
 
-nexusPublishPlugin = { module = "io.github.gradle-nexus:publish-plugin", version = "1.3.0" }
+nexusPublishPlugin = { module = "io.github.gradle-nexus:publish-plugin", version = "2.0.0" }
 
 # spotless-licenser
 spotless = { module = "com.diffplug.spotless:spotless-plugin-gradle", version.ref = "spotless" }

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,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.10-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/gradlew b/gradlew
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -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/.
@@ -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

diff --git a/gradlew.bat b/gradlew.bat
@@ -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 ##########################################################################
@@ -43,11 +45,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 +59,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
 

diff --git a/indra-common/build.gradle b/indra-common/build.gradle
@@ -19,7 +19,7 @@ dependencies {
   compileOnlyApi libs.immutables.builder
   compileOnlyApi libs.jetbrainsAnnotations
   api project(":indra-git")
-  implementation libs.javaEcosystemCapabilities
+  implementation libs.jvmDependencyConflictResolution
   implementation libs.asm
   api libs.mammoth
   testImplementation project(":indra-testlib")

diff --git a/indra-common/src/main/java/net/kyori/indra/IndraPlugin.java b/indra-common/src/main/java/net/kyori/indra/IndraPlugin.java
@@ -1,7 +1,7 @@
 /*
  * This file is part of indra, licensed under the MIT License.
  *
- * Copyright (c) 2020-2023 KyoriPowered
+ * Copyright (c) 2020-2024 KyoriPowered
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -90,10 +90,10 @@ public class IndraPlugin implements ProjectPlugin {
   @Override
   public void apply(final @NotNull Project project, final @NotNull PluginContainer plugins, final @NotNull ExtensionContainer extensions, final @NotNull TaskContainer tasks) {
     plugins.apply(JavaLibraryPlugin.class);
-    if (GradleVersion.current().compareTo(GradleVersion.version("7.0")) >= 0) {
+    if (GradleVersion.current().compareTo(GradleVersion.version("7.0")) >= 0 && !project.getExtensions().getExtraProperties().has("net.kyori.indra.testing")) {
       // Fix a lot of JVM library artifact inconsistencies
       // Gradle <7.0 doesn't provide the necessary attributes for this to work effectively
-      plugins.apply("org.gradlex.java-ecosystem-capabilities");
+      plugins.apply("org.gradlex.jvm-dependency-conflict-resolution");
     }
 
     final IndraExtensionImpl indra = (IndraExtensionImpl) Indra.extension(extensions);

diff --git a/indra-testlib/src/main/java/net/kyori/indra/test/IndraTesting.java b/indra-testlib/src/main/java/net/kyori/indra/test/IndraTesting.java
@@ -1,7 +1,7 @@
 /*
  * This file is part of indra, licensed under the MIT License.
  *
- * Copyright (c) 2020-2022 KyoriPowered
+ * Copyright (c) 2020-2024 KyoriPowered
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -45,7 +45,9 @@ public static Project project(final @Nullable Consumer<ProjectBuilder> consumer)
     if(consumer != null) {
       consumer.accept(builder);
     }
-    return builder.build();
+    final Project ret = builder.build();
+    ret.getExtensions().getExtraProperties().set("net.kyori.indra.testing", true);
+    return ret;
   }
 
   public static String exec(final Path workingDir, final String... cli) throws IOException {

diff --git a/settings.gradle b/settings.gradle
@@ -11,7 +11,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"
 }
 
 dependencyResolutionManagement {