Skip to content

Commit 373efef

Browse files
chore(deps): Update dependency gradle to v8 (#7)
* chore(deps): Update dependency gradle to v8 * chore(build): Resolve deprecations in our buildscript --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: zml <[email protected]>
1 parent 30ef142 commit 373efef

File tree

6 files changed

+25
-16
lines changed

6 files changed

+25
-16
lines changed

build.gradle

+2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,10 @@ dependencies {
1616
api "org.junit.jupiter:junit-jupiter-api:$junitVersion"
1717
implementation "cpw.mods:modlauncher:$modlauncherVersion"
1818

19+
testImplementation platform(libs.junit.bom)
1920
testImplementation libs.junit.api
2021
testRuntimeOnly libs.junit.engine
22+
testRuntimeOnly libs.junit.launcher
2123
errorprone libs.errorprone
2224
errorprone libs.errorprone.annotations
2325
}

gradle/libs.versions.toml

+4-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,10 @@ spotless = "6.21.0"
1313
errorprone = { module = "com.google.errorprone:error_prone_core", version.ref = "errorprone" }
1414
errorprone-annotations = { module = "com.google.errorprone:error_prone_annotations", version.ref = "errorprone" }
1515

16-
junit-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "junit" }
17-
junit-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junit" }
16+
junit-api = { module = "org.junit.jupiter:junit-jupiter-api" }
17+
junit-bom = { module = "org.junit:junit-bom", version.ref = "junit" }
18+
junit-engine = { module = "org.junit.jupiter:junit-jupiter-engine" }
19+
junit-launcher = { module = "org.junit.platform:junit-platform-launcher" }
1820

1921
[plugins]
2022
errorprone = { id = "net.ltgt.errorprone", version.ref = "errorproneGradle" }

gradle/wrapper/gradle-wrapper.jar

2.05 KB
Binary file not shown.
+2-1
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-7.6.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
44
networkTimeout=10000
5+
validateDistributionUrl=true
56
zipStoreBase=GRADLE_USER_HOME
67
zipStorePath=wrapper/dists

gradlew

+12-7
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,8 @@ done
8383
# This is normally unused
8484
# shellcheck disable=SC2034
8585
APP_BASE_NAME=${0##*/}
86-
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
87-
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"'
86+
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
87+
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
9088

9189
# Use the maximum available, or set MAX_FD != -1 to use that value.
9290
MAX_FD=maximum
@@ -133,26 +131,29 @@ location of your Java installation."
133131
fi
134132
else
135133
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.
134+
if ! command -v java >/dev/null 2>&1
135+
then
136+
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
137137
138138
Please set the JAVA_HOME variable in your environment to match the
139139
location of your Java installation."
140+
fi
140141
fi
141142

142143
# Increase the maximum file descriptors if we can.
143144
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
144145
case $MAX_FD in #(
145146
max*)
146147
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
147-
# shellcheck disable=SC3045
148+
# shellcheck disable=SC3045
148149
MAX_FD=$( ulimit -H -n ) ||
149150
warn "Could not query maximum file descriptor limit"
150151
esac
151152
case $MAX_FD in #(
152153
'' | soft) :;; #(
153154
*)
154155
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
155-
# shellcheck disable=SC3045
156+
# shellcheck disable=SC3045
156157
ulimit -n "$MAX_FD" ||
157158
warn "Could not set maximum file descriptor limit to $MAX_FD"
158159
esac
@@ -197,6 +198,10 @@ if "$cygwin" || "$msys" ; then
197198
done
198199
fi
199200

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

settings.gradle

+5-6
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,13 @@ pluginManagement {
99
}
1010
}
1111

12+
plugins {
13+
id "org.gradle.toolchains.foojay-resolver-convention" version "0.7.0"
14+
}
15+
1216
dependencyResolutionManagement {
1317
repositoriesMode = RepositoriesMode.FAIL_ON_PROJECT_REPOS
14-
repositories {
15-
maven {
16-
url = "https://repo.spongepowered.org/repository/maven-public"
17-
name = "sponge"
18-
}
19-
}
18+
pluginManagement.repositories.each(repositories.&add)
2019
}
2120

2221
rootProject.name = 'modlauncher-injector-junit'

0 commit comments

Comments
 (0)