Update to Gradle 8.14 (#1292)

* Update to Gradle 8.14

* Fix build
This commit is contained in:
modmuss
2025-04-25 18:31:19 +01:00
committed by GitHub
parent 6bd1b12b51
commit cc31f1c849
8 changed files with 16 additions and 17 deletions

View File

@@ -1,6 +1,6 @@
[versions]
kotlin = "2.0.21"
asm = "9.7.1"
asm = "9.8"
commons-io = "2.15.1"
gson = "2.10.1"
guava = "33.0.0-jre"

View File

@@ -8,9 +8,9 @@ vineflower = "1.11.1"
mixin-compile-extensions = "0.6.0"
dev-launch-injector = "0.2.1+build.8"
terminal-console-appender = "1.3.0"
jetbrains-annotations = "25.0.0"
jetbrains-annotations = "26.0.2"
native-support = "1.0.1"
fabric-installer = "1.0.1"
fabric-installer = "1.0.3"
[libraries]
# Decompilers

View File

@@ -1,14 +1,14 @@
[versions]
spock = "2.3-groovy-3.0"
junit = "5.11.3"
javalin = "6.3.0"
mockito = "5.14.2"
junit = "5.12.2"
javalin = "6.6.0"
mockito = "5.17.0"
java-debug = "0.52.0"
mixin = "0.15.3+mixin.0.8.7"
bouncycastle = "1.80"
gradle-nightly = "9.0-20250406001604+0000"
fabric-loader = "0.16.9"
gradle-nightly = "9.0-20250421234138+0000"
fabric-loader = "0.16.14"
[libraries]
spock = { module = "org.spockframework:spock-core", version.ref = "spock" }

Binary file not shown.

View File

@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-all.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME

4
gradlew vendored
View File

@@ -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.

4
gradlew.bat vendored
View File

@@ -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

View File

@@ -48,10 +48,9 @@ import org.gradle.api.internal.tasks.DefaultTaskDependencyFactory
import org.gradle.api.internal.tasks.properties.annotations.OutputPropertyRoleAnnotationHandler
import org.gradle.api.model.ObjectFactory
import org.gradle.api.provider.ProviderFactory
import org.gradle.api.tasks.util.PatternSet
import org.gradle.api.tasks.util.internal.PatternSetFactory
import org.gradle.cache.internal.CrossBuildInMemoryCacheFactory
import org.gradle.cache.internal.DefaultCrossBuildInMemoryCacheFactory
import org.gradle.internal.Factory
import org.gradle.internal.event.ListenerManager
import org.gradle.internal.instantiation.InstantiatorFactory
import org.gradle.internal.instantiation.generator.DefaultInstantiatorFactory
@@ -123,7 +122,7 @@ class TestServiceFactory {
instantiatorFactory.decorate(services),
namedObjectInstantiator,
mock(DirectoryFileTreeFactory),
mock(Factory) as Factory<PatternSet>,
mock(PatternSetFactory),
propertyFactory,
filePropertyFactory,
DefaultTaskDependencyFactory.withNoAssociatedProject(),
@@ -145,7 +144,7 @@ class TestServiceFactory {
fileResolver(),
DefaultTaskDependencyFactory.withNoAssociatedProject(),
mock(DirectoryFileTreeFactory),
mock(Factory) as Factory<PatternSet>,
mock(PatternSetFactory),
PropertyHost.NO_OP,
mock(FileSystem))
}