Skip to content

Commit cab319a

Browse files
PaintNinjaLexManos
authored andcommitted
Gradle 9.2, GradleUtils 3.3
1 parent 04ca4bd commit cab319a

File tree

7 files changed

+15
-11
lines changed

7 files changed

+15
-11
lines changed

build.gradle

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ plugins {
66
id 'maven-publish'
77
alias libs.plugins.modules
88
alias libs.plugins.gradleutils
9+
alias libs.plugins.gitversion
10+
alias libs.plugins.changelog
911
alias libs.plugins.licenser
1012

1113
// Enforce jSpecify annotations at compile-time
@@ -73,9 +75,6 @@ tasks.named('jar', Jar) {
7375
'Implementation-Vendor' : projectVendor
7476
])
7577
}
76-
77-
reproducibleFileOrder = true
78-
preserveFileTimestamps = false
7978
}
8079

8180
license {
@@ -91,7 +90,7 @@ publishing {
9190
name = projectDisplayName
9291
description = project.description
9392

94-
gradleutils.pom.gitHubDetails = pom
93+
gradleutils.pom.addRemoteDetails(pom)
9594

9695
licenses {
9796
license gradleutils.pom.licenses.LGPLv2_1

gradle.properties

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,6 @@ org.gradle.caching=true
22
#org.gradle.parallel=true
33
org.gradle.configureondemand=true
44
org.gradle.configuration-cache=true
5+
org.gradle.configuration-cache.parallel=true
6+
7+
net.minecraftforge.gradleutils.compilation.defaults=true

gradle/wrapper/gradle-wrapper.jar

1.71 KB
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22

33
#
4-
# Copyright © 2015-2021 the original authors.
4+
# Copyright © 2015 the original authors.
55
#
66
# Licensed under the Apache License, Version 2.0 (the "License");
77
# you may not use this file except in compliance with the License.
@@ -114,7 +114,7 @@ case "$( uname )" in #(
114114
NONSTOP* ) nonstop=true ;;
115115
esac
116116

117-
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
117+
CLASSPATH="\\\"\\\""
118118

119119

120120
# Determine the Java command to use to start the JVM.
@@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
213213
set -- \
214214
"-Dorg.gradle.appname=$APP_BASE_NAME" \
215215
-classpath "$CLASSPATH" \
216-
org.gradle.wrapper.GradleWrapperMain \
216+
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
217217
"$@"
218218

219219
# Stop when "xargs" is not available.

gradlew.bat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,11 @@ goto fail
7070
:execute
7171
@rem Setup the command line
7272

73-
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
73+
set CLASSPATH=
7474

7575

7676
@rem Execute Gradle
77-
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
77+
"%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" %*
7878

7979
:end
8080
@rem End local scope for the variables with windows NT shell

settings.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,10 @@ dependencyResolutionManagement {
1212
//@formatter:off
1313
versionCatalogs.register('libs') {
1414
plugin 'modules', 'org.gradlex.extra-java-module-info' version '1.13.1'
15-
plugin 'gradleutils', 'net.minecraftforge.gradleutils' version '2.5.1'
15+
plugin 'gradleutils', 'net.minecraftforge.gradleutils' version '3.3.39'
16+
plugin 'gitversion', 'net.minecraftforge.gitversion' version '3.1.7'
1617
plugin 'licenser', 'net.minecraftforge.licenser' version '1.2.0'
18+
plugin 'changelog', 'net.minecraftforge.changelog' version '3.2.1'
1719

1820
plugin 'errorprone', 'net.ltgt.errorprone' version '4.3.0'
1921
plugin 'nullaway', 'net.ltgt.nullaway' version '2.3.0'

0 commit comments

Comments
 (0)