diff options
Diffstat (limited to 'src/main/java/net')
| -rw-r--r-- | src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java | 7 | ||||
| -rw-r--r-- | src/main/java/net/fabricmc/loom/util/Constants.java | 1 |
2 files changed, 8 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 30b37236..b957068e 100644 --- a/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java +++ b/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java @@ -57,6 +57,10 @@ public final class CompileConfiguration { extension.createLazyConfiguration(Constants.Configurations.MINECRAFT).configure(configuration -> configuration.setTransitive(false)); extension.createLazyConfiguration(Constants.Configurations.INCLUDE).configure(configuration -> configuration.setTransitive(false)); // Dont get transitive deps extension.createLazyConfiguration(Constants.Configurations.MAPPING_CONSTANTS); + extension.createLazyConfiguration(Constants.Configurations.NAMED_ELEMENTS).configure(configuration -> { + configuration.setCanBeConsumed(true); + configuration.setCanBeResolved(false); + }); extendsFrom(JavaPlugin.COMPILE_ONLY_CONFIGURATION_NAME, Constants.Configurations.MAPPING_CONSTANTS, project); @@ -147,6 +151,9 @@ public final class CompileConfiguration { } }); + // Add the "dev" jar to the "namedElements" configuration + p.artifacts(artifactHandler -> artifactHandler.add(Constants.Configurations.NAMED_ELEMENTS, p.getTasks().getByName("jar"))); + if (p.getPluginManager().hasPlugin("org.jetbrains.kotlin.kapt")) { // If loom is applied after kapt, then kapt will use the AP arguments too early for loom to pass the arguments we need for mixin. throw new IllegalArgumentException("fabric-loom must be applied BEFORE kapt in the plugins { } block."); diff --git a/src/main/java/net/fabricmc/loom/util/Constants.java b/src/main/java/net/fabricmc/loom/util/Constants.java index a5e1ed9c..46c01b40 100644 --- a/src/main/java/net/fabricmc/loom/util/Constants.java +++ b/src/main/java/net/fabricmc/loom/util/Constants.java @@ -72,6 +72,7 @@ public class Constants { public static final String LOOM_DEVELOPMENT_DEPENDENCIES = "loomDevelopmentDependencies"; public static final String MAPPING_CONSTANTS = "mappingsConstants"; public static final String UNPICK_CLASSPATH = "unpick"; + public static final String NAMED_ELEMENTS = "namedElements"; private Configurations() { } |