Skip to content

Commit a5e72f1

Browse files
committed
Gradle 8.5, update deps
1 parent 97569b3 commit a5e72f1

File tree

5 files changed

+20
-15
lines changed

5 files changed

+20
-15
lines changed

build.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ plugins {
2424
id 'eclipse'
2525
id 'maven-publish'
2626
id 'org.jetbrains.gradle.plugin.idea-ext' version '1.1.7'
27-
id 'com.gtnewhorizons.retrofuturagradle' version '1.3.24'
28-
id 'net.darkhax.curseforgegradle' version '1.1.16' apply false
29-
id 'com.modrinth.minotaur' version '2.8.4' apply false
30-
id 'com.diffplug.spotless' version '6.13.0' apply false
27+
id 'com.gtnewhorizons.retrofuturagradle' version '1.3.25'
28+
id 'net.darkhax.curseforgegradle' version '1.1.17' apply false
29+
id 'com.modrinth.minotaur' version '2.8.6' apply false
30+
id 'com.diffplug.spotless' version '6.23.2' apply false
3131
id 'com.palantir.git-version' version '3.0.0' apply false
3232
id 'com.github.johnrengelman.shadow' version '8.1.1' apply false
3333
id 'org.jetbrains.kotlin.jvm' version '1.8.0' apply false
@@ -220,7 +220,7 @@ if (enableSpotless.toBoolean()) {
220220
removeUnusedImports()
221221
endWithNewline()
222222
//noinspection GroovyAssignabilityCheck
223-
eclipse('4.19.0').configFile(formatFile)
223+
eclipse('4.19').configFile(formatFile)
224224
}
225225
scala {
226226
target 'src/*/scala/**/*.scala'
@@ -1027,7 +1027,7 @@ def getChangelog() {
10271027

10281028
// Buildscript updating
10291029

1030-
def buildscriptGradleVersion = '8.2.1'
1030+
def buildscriptGradleVersion = '8.5'
10311031

10321032
tasks.named('wrapper', Wrapper).configure {
10331033
gradleVersion = buildscriptGradleVersion

gradle/wrapper/gradle-wrapper.jar

1.76 KB
Binary file not shown.
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
44
networkTimeout=10000
5+
validateDistributionUrl=true
56
zipStoreBase=GRADLE_USER_HOME
67
zipStorePath=wrapper/dists

gradlew

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,6 @@ done
8585
APP_BASE_NAME=${0##*/}
8686
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
8787

88-
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
89-
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
90-
9188
# Use the maximum available, or set MAX_FD != -1 to use that value.
9289
MAX_FD=maximum
9390

@@ -133,26 +130,29 @@ location of your Java installation."
133130
fi
134131
else
135132
JAVACMD=java
136-
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
133+
if ! command -v java >/dev/null 2>&1
134+
then
135+
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
137136
138137
Please set the JAVA_HOME variable in your environment to match the
139138
location of your Java installation."
139+
fi
140140
fi
141141

142142
# Increase the maximum file descriptors if we can.
143143
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
144144
case $MAX_FD in #(
145145
max*)
146146
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
147-
# shellcheck disable=SC3045
147+
# shellcheck disable=SC3045
148148
MAX_FD=$( ulimit -H -n ) ||
149149
warn "Could not query maximum file descriptor limit"
150150
esac
151151
case $MAX_FD in #(
152152
'' | soft) :;; #(
153153
*)
154154
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
155-
# shellcheck disable=SC3045
155+
# shellcheck disable=SC3045
156156
ulimit -n "$MAX_FD" ||
157157
warn "Could not set maximum file descriptor limit to $MAX_FD"
158158
esac
@@ -197,6 +197,10 @@ if "$cygwin" || "$msys" ; then
197197
done
198198
fi
199199

200+
201+
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
202+
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
203+
200204
# Collect all arguments for the java command;
201205
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
202206
# shell script including quotes and variable substitutions, so put them in

settings.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ pluginManagement {
1919
}
2020

2121
plugins {
22-
id 'com.diffplug.blowdryerSetup' version '1.6.0'
22+
id 'com.diffplug.blowdryerSetup' version '1.7.0'
2323
// Automatic toolchain provisioning
24-
id 'org.gradle.toolchains.foojay-resolver-convention' version '0.4.0'
24+
id 'org.gradle.toolchains.foojay-resolver-convention' version '0.7.0'
2525
}
2626

2727
blowdryerSetup {

0 commit comments

Comments
 (0)