diff options
| author | shedaniel <daniel@shedaniel.me> | 2021-10-13 15:09:08 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2021-10-13 15:13:02 +0800 |
| commit | 72295a81969f129a6ef5e2339b6a4f78d7cbc240 (patch) | |
| tree | cfdaf150718eecc1116b163b7c8ae199048493c9 /src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java | |
| parent | 64f10eb47bd6b0411e62566cbcf692946b9fa812 (diff) | |
| parent | d8675e056b7b16fd9b8307191301a06d931ecd1f (diff) | |
| download | architectury-loom-72295a81969f129a6ef5e2339b6a4f78d7cbc240.tar.gz architectury-loom-72295a81969f129a6ef5e2339b6a4f78d7cbc240.tar.bz2 architectury-loom-72295a81969f129a6ef5e2339b6a4f78d7cbc240.zip | |
Merge remote-tracking branch 'FabricMC/dev/0.10' into dev/0.10.0
Signed-off-by: shedaniel <daniel@shedaniel.me>
# Conflicts:
# .github/workflows/test.yml
# src/main/java/net/fabricmc/loom/configuration/RemapConfiguration.java
# src/main/java/net/fabricmc/loom/configuration/ide/RunConfig.java
# src/main/java/net/fabricmc/loom/configuration/providers/MinecraftProviderImpl.java
# src/main/java/net/fabricmc/loom/configuration/providers/minecraft/assets/MinecraftAssetsProvider.java
# src/main/java/net/fabricmc/loom/decompilers/fernflower/AbstractFernFlowerDecompiler.java
# src/main/java/net/fabricmc/loom/decompilers/fernflower/ForkingJavaExec.java
# src/main/java/net/fabricmc/loom/task/GenVsCodeProjectTask.java
# src/main/java/net/fabricmc/loom/task/GenerateSourcesTask.java
# src/main/java/net/fabricmc/loom/util/SourceRemapper.java
# src/test/resources/projects/parchment/build.gradle
Diffstat (limited to 'src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java')
| -rw-r--r-- | src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java b/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java index b0aaa53b..6852945b 100644 --- a/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java +++ b/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java @@ -123,10 +123,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()) { |