diff --git a/build.gradle b/build.gradle index f61b5ee0..0b4875e3 100644 --- a/build.gradle +++ b/build.gradle @@ -284,6 +284,16 @@ test { } } +// Workaround https://github.com/gradle/gradle/issues/25898 +tasks.withType(Test).configureEach { + jvmArgs = [ + '--add-opens=java.base/java.lang=ALL-UNNAMED', + '--add-opens=java.base/java.util=ALL-UNNAMED', + '--add-opens=java.base/java.lang.invoke=ALL-UNNAMED', + '--add-opens=java.base/java.net=ALL-UNNAMED' + ] +} + import org.gradle.api.internal.artifacts.configurations.ConfigurationRoles import org.gradle.launcher.cli.KotlinDslVersion diff --git a/gradle/test.libs.versions.toml b/gradle/test.libs.versions.toml index 8cc5457c..5de78a1f 100644 --- a/gradle/test.libs.versions.toml +++ b/gradle/test.libs.versions.toml @@ -6,7 +6,7 @@ mockito = "5.11.0" java-debug = "0.52.0" mixin = "0.12.5+mixin.0.8.5" -gradle-nightly = "8.9-20240426001649+0000" +gradle-nightly = "8.9-20240505002558+0000" fabric-loader = "0.15.10" fabric-installer = "1.0.1" diff --git a/src/main/java/net/fabricmc/loom/task/service/JarManifestService.java b/src/main/java/net/fabricmc/loom/task/service/JarManifestService.java index 08f17632..4858575b 100644 --- a/src/main/java/net/fabricmc/loom/task/service/JarManifestService.java +++ b/src/main/java/net/fabricmc/loom/task/service/JarManifestService.java @@ -103,7 +103,8 @@ public abstract class JarManifestService implements BuildService getMixinVersion(Project project) { return project.getConfigurations().named(Constants.Configurations.LOADER_DEPENDENCIES).map(configuration -> { diff --git a/src/test/groovy/net/fabricmc/loom/test/integration/ConfigurationCacheTest.groovy b/src/test/groovy/net/fabricmc/loom/test/integration/ConfigurationCacheTest.groovy index 8b900f30..a6af3e2d 100644 --- a/src/test/groovy/net/fabricmc/loom/test/integration/ConfigurationCacheTest.groovy +++ b/src/test/groovy/net/fabricmc/loom/test/integration/ConfigurationCacheTest.groovy @@ -54,8 +54,10 @@ class ConfigurationCacheTest extends Specification implements GradleProjectTestT result2.task(":${task}").outcome != FAILED where: - task | _ - "help" | _ - "configureClientLaunch" | _ + task | _ + "help" | _ + "configureClientLaunch" | _ + "jar" | _ + "check" | _ } }