diff options
| author | shedaniel <daniel@shedaniel.me> | 2021-05-14 06:43:07 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2021-05-14 06:43:07 +0800 |
| commit | ec2b47fa140750c45038c0dfb8a4b06ac35cb456 (patch) | |
| tree | 105618ba8d41dce8e99dbe7521fe63ca92c04dd9 /src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java | |
| parent | 7d38e3bc9a1e22ecdac7d0b3a7fc7f77e30ee37f (diff) | |
| parent | 9fb167d50622af561efb9cc91150126ba87a66f2 (diff) | |
| download | architectury-loom-ec2b47fa140750c45038c0dfb8a4b06ac35cb456.tar.gz architectury-loom-ec2b47fa140750c45038c0dfb8a4b06ac35cb456.tar.bz2 architectury-loom-ec2b47fa140750c45038c0dfb8a4b06ac35cb456.zip | |
Merge remote-tracking branch 'FabricMC/dev/0.8' into dev/0.8
# Conflicts:
# README.md
# build.gradle
# src/main/java/net/fabricmc/loom/LoomGradlePlugin.java
# src/main/java/net/fabricmc/loom/build/mixin/AnnotationProcessorInvoker.java
# src/main/java/net/fabricmc/loom/configuration/DependencyProvider.java
# src/main/java/net/fabricmc/loom/configuration/mods/ModProcessor.java
# src/main/java/net/fabricmc/loom/configuration/providers/MinecraftProvider.java
# src/main/java/net/fabricmc/loom/configuration/providers/minecraft/assets/MinecraftAssetsProvider.java
# src/main/java/net/fabricmc/loom/task/GenVsCodeProjectTask.java
Diffstat (limited to 'src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java')
| -rw-r--r-- | src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java b/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java index bfb8e5f2..2b6ee858 100644 --- a/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java +++ b/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java @@ -102,7 +102,7 @@ public final class CompileConfiguration { data.createLazyConfiguration(Constants.Configurations.UNPICK_CLASSPATH); for (RemappedConfigurationEntry entry : Constants.MOD_COMPILE_ENTRIES) { - data.createLazyConfiguration(entry.getSourceConfiguration()) + data.createLazyConfiguration(entry.sourceConfiguration()) .configure(configuration -> configuration.setTransitive(true)); // Don't get transitive deps of already remapped mods @@ -112,7 +112,7 @@ public final class CompileConfiguration { extendsFrom(entry.getTargetConfiguration(configurations), entry.getRemappedConfiguration(), project); if (entry.isOnModCompileClasspath()) { - extendsFrom(Constants.Configurations.MOD_COMPILE_CLASSPATH, entry.getSourceConfiguration(), project); + extendsFrom(Constants.Configurations.MOD_COMPILE_CLASSPATH, entry.sourceConfiguration(), project); extendsFrom(Constants.Configurations.MOD_COMPILE_CLASSPATH_MAPPED, entry.getRemappedConfiguration(), project); } } |