From cc31f1c8495274d17eaa52c0e5c795b7c5393ced Mon Sep 17 00:00:00 2001 From: modmuss Date: Fri, 25 Apr 2025 18:31:19 +0100 Subject: [PATCH] Update to Gradle 8.14 (#1292) * Update to Gradle 8.14 * Fix build --- gradle/libs.versions.toml | 2 +- gradle/runtime.libs.versions.toml | 4 ++-- gradle/test.libs.versions.toml | 10 +++++----- gradle/wrapper/gradle-wrapper.jar | Bin 43705 -> 43764 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 4 ++-- gradlew.bat | 4 ++-- .../loom/test/util/TestServiceFactory.groovy | 7 +++---- 8 files changed, 16 insertions(+), 17 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 3765d761..7145bcf1 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -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" diff --git a/gradle/runtime.libs.versions.toml b/gradle/runtime.libs.versions.toml index 4a94a206..ed108f5b 100644 --- a/gradle/runtime.libs.versions.toml +++ b/gradle/runtime.libs.versions.toml @@ -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 diff --git a/gradle/test.libs.versions.toml b/gradle/test.libs.versions.toml index 42c6dcaa..ee687b4e 100644 --- a/gradle/test.libs.versions.toml +++ b/gradle/test.libs.versions.toml @@ -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" } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 9bbc975c742b298b441bfb90dbc124400a3751b9..1b33c55baabb587c669f562ae36f953de2481846 100644 GIT binary patch delta 642 zcmdmamFde>rVZJA^}0Q$xegf!xPEW^+5YDM%iT2bEgct9o+jH~+sJas#HZ=szO|** z=Pj=X_vx?W&DSwKck|WWn~hffsvnQ+42*W$b7b0$SCcOoZ`{W{^$^pk;4>8-A*-)$ z?n(Po`1$6Jn_u?t-L+tsPyZ2#X}8T6OS8pAU;kdgd+_Hw4z4TW0p9E!T+=f7-c&O% zFic^X{7^$?^Ho04eona9n#mGMxKhA=~8B%JN`M zMhm5wc-2v)$``sY$!Q`9xiU@DhI73ZxiGEKg>yIPs)NmWwMdF-ngLXpZSqV5ez36n zVkxF2rjrjWR+_xr6e6@_u@s~2uv{9vi*1pj2)BjFD+-%@&pRVP1f{O1glxTOp2-62Ph;v z`N1+vCd)9ea)af*Ol1*JCfnp$%Uu}%OuoN7g2}3C@`L5FlP#(sA=|h@iixuZC?qp^ z=L$=v$ZoI}|87Wh=&h7udff{aieKr*l+zDp?pf)_bbRvUf>kn;HCDMXNlgbbo!QRK I1x7am0No)LiU0rr delta 584 zcmexzm1*ZyrVZJAexH5Moc8h7)w{^+t*dqJ%=yhh23L$9JpFV=_k`zJ-?Q4DI*eSe z+ES)HSrVnWLtJ&)lO%hRkV9zl5qqWRt0e;bb zPPo`)y?HTAyZI&u&X<|2$FDHCf4;!v8}p=?Tm`^F0`u(|1ttf~&t$qP3KUSD>@TJQ zRwJ}Pim6NzEc8KA6)e;S6gs8=7IIL8sQL*MYEuRYO;Uj<%3UbMbV&^&!Zvx+LKmjT z8Zch6rYP7Tw?$Hn(UTJwWiS=$f{lB(C=e*%usDV})0AQIK~sat=ND@+Gg*Pyij!rR z*fa02W|%BsV++>4W{DKDGSIUEHd2$P+8ct!RF+CHDowUuTEZOZ%rJSQv*qOXOSPDN zT|sP-$p*_3ncsWB*qoD7JQcyZ9xan%cJP6Tb4-?AZpr*F6v98hoNaPJm@HV`yya5N z))6pqFXn@}P(3T0nEzM8*c_9KtE9o|_pFd&K35GBXP^9Kg(b6GH-z8S4GDzIl~T+b zdLd#meKKHu$5u))8cu$=GKINkGDPOUD)!0$C(BH(U!}!-e;Q0ok8Sc?V1zRO04>ts AA^-pY diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ed4c299a..6514f919 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.13-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index faf93008..23d15a93 100755 --- a/gradlew +++ b/gradlew @@ -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 9d21a218..db3a6ac2 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/src/test/groovy/net/fabricmc/loom/test/util/TestServiceFactory.groovy b/src/test/groovy/net/fabricmc/loom/test/util/TestServiceFactory.groovy index 52518feb..2e4d1d26 100644 --- a/src/test/groovy/net/fabricmc/loom/test/util/TestServiceFactory.groovy +++ b/src/test/groovy/net/fabricmc/loom/test/util/TestServiceFactory.groovy @@ -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, + mock(PatternSetFactory), propertyFactory, filePropertyFactory, DefaultTaskDependencyFactory.withNoAssociatedProject(), @@ -145,7 +144,7 @@ class TestServiceFactory { fileResolver(), DefaultTaskDependencyFactory.withNoAssociatedProject(), mock(DirectoryFileTreeFactory), - mock(Factory) as Factory, + mock(PatternSetFactory), PropertyHost.NO_OP, mock(FileSystem)) }