diff --git a/build.gradle b/build.gradle index 7cf646e..e692a47 100644 --- a/build.gradle +++ b/build.gradle @@ -6,6 +6,8 @@ plugins { id 'maven-publish' alias libs.plugins.modules alias libs.plugins.gradleutils + alias libs.plugins.gitversion + alias libs.plugins.changelog alias libs.plugins.licenser // Enforce jSpecify annotations at compile-time @@ -73,9 +75,6 @@ tasks.named('jar', Jar) { 'Implementation-Vendor' : projectVendor ]) } - - reproducibleFileOrder = true - preserveFileTimestamps = false } license { @@ -91,7 +90,7 @@ publishing { name = projectDisplayName description = project.description - gradleutils.pom.gitHubDetails = pom + gradleutils.pom.addRemoteDetails(pom) licenses { license gradleutils.pom.licenses.LGPLv2_1 diff --git a/gradle.properties b/gradle.properties index c250e39..b1c3c70 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,3 +2,6 @@ org.gradle.caching=true #org.gradle.parallel=true org.gradle.configureondemand=true org.gradle.configuration-cache=true +org.gradle.configuration-cache.parallel=true + +net.minecraftforge.gradleutils.compilation.defaults=true diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 9bbc975..8bdaf60 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ff23a68..23449a2 100644 --- 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.14.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index faf9300..ef07e01 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright © 2015-2021 the original authors. +# Copyright © 2015 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -114,7 +114,7 @@ case "$( uname )" in #( NONSTOP* ) nonstop=true ;; esac -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar +CLASSPATH="\\\"\\\"" # Determine the Java command to use to start the JVM. @@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ "$@" # Stop when "xargs" is not available. diff --git a/gradlew.bat b/gradlew.bat index 9d21a21..db3a6ac 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -70,11 +70,11 @@ goto fail :execute @rem Setup the command line -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar +set CLASSPATH= @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* :end @rem End local scope for the variables with windows NT shell diff --git a/settings.gradle b/settings.gradle index e54affa..58a0ad7 100644 --- a/settings.gradle +++ b/settings.gradle @@ -12,8 +12,10 @@ dependencyResolutionManagement { //@formatter:off versionCatalogs.register('libs') { plugin 'modules', 'org.gradlex.extra-java-module-info' version '1.13.1' - plugin 'gradleutils', 'net.minecraftforge.gradleutils' version '2.5.1' + plugin 'gradleutils', 'net.minecraftforge.gradleutils' version '3.3.39' + plugin 'gitversion', 'net.minecraftforge.gitversion' version '3.1.7' plugin 'licenser', 'net.minecraftforge.licenser' version '1.2.0' + plugin 'changelog', 'net.minecraftforge.changelog' version '3.2.1' plugin 'errorprone', 'net.ltgt.errorprone' version '4.3.0' plugin 'nullaway', 'net.ltgt.nullaway' version '2.3.0'