From 6666b95b549256b98bc81ad58a10f0e65262f459 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Tue, 12 Oct 2021 13:31:12 +0100 Subject: [PATCH] Fix mod* configurations not being on the test compile/runtime configuration. Closes #488 --- .../loom/configuration/CompileConfiguration.java | 2 ++ .../net/fabricmc/loom/test/LoomTestConstants.groovy | 2 +- .../java/net/fabricmc/example/test/ExampleMod.java | 12 ++++++++++++ 3 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 src/test/resources/projects/simple/src/test/java/net/fabricmc/example/test/ExampleMod.java diff --git a/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java b/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java index 6fc6439..fad56a9 100644 --- a/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java +++ b/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java @@ -77,10 +77,12 @@ public final class CompileConfiguration { extendsFrom(Constants.Configurations.MOD_COMPILE_CLASSPATH, entry.sourceConfiguration(), project); extendsFrom(Constants.Configurations.MOD_COMPILE_CLASSPATH_MAPPED, entry.getRemappedConfiguration(), project); extendsFrom(JavaPlugin.COMPILE_CLASSPATH_CONFIGURATION_NAME, entry.getRemappedConfiguration(), project); + extendsFrom(JavaPlugin.TEST_COMPILE_CLASSPATH_CONFIGURATION_NAME, entry.getRemappedConfiguration(), project); } if (entry.runtimeClasspath()) { extendsFrom(JavaPlugin.RUNTIME_CLASSPATH_CONFIGURATION_NAME, entry.getRemappedConfiguration(), project); + extendsFrom(JavaPlugin.TEST_RUNTIME_CLASSPATH_CONFIGURATION_NAME, entry.getRemappedConfiguration(), project); } if (entry.hasConsumerConfiguration()) { diff --git a/src/test/groovy/net/fabricmc/loom/test/LoomTestConstants.groovy b/src/test/groovy/net/fabricmc/loom/test/LoomTestConstants.groovy index 8b25e0c..d198560 100644 --- a/src/test/groovy/net/fabricmc/loom/test/LoomTestConstants.groovy +++ b/src/test/groovy/net/fabricmc/loom/test/LoomTestConstants.groovy @@ -28,7 +28,7 @@ import org.gradle.util.GradleVersion class LoomTestConstants { public final static String DEFAULT_GRADLE = GradleVersion.current().getVersion() - public final static String PRE_RELEASE_GRADLE = "7.4-20211007220130+0000" + public final static String PRE_RELEASE_GRADLE = "7.4-20211011231946+0000" public final static String[] STANDARD_TEST_VERSIONS = [DEFAULT_GRADLE, PRE_RELEASE_GRADLE] } diff --git a/src/test/resources/projects/simple/src/test/java/net/fabricmc/example/test/ExampleMod.java b/src/test/resources/projects/simple/src/test/java/net/fabricmc/example/test/ExampleMod.java new file mode 100644 index 0000000..ae0a310 --- /dev/null +++ b/src/test/resources/projects/simple/src/test/java/net/fabricmc/example/test/ExampleMod.java @@ -0,0 +1,12 @@ +package net.fabricmc.example.test; + +import net.fabricmc.api.ModInitializer; +import net.minecraft.client.gui.screen.TitleScreen; + +// Just a simple class to ensure the tests can compile against loader and minecraft +public class ExampleMod implements ModInitializer { + @Override + public void onInitialize() { + TitleScreen screen = null; + } +}