diff options
| author | shedaniel <daniel@shedaniel.me> | 2021-07-20 23:44:11 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2021-07-20 23:44:11 +0800 |
| commit | 695863367fb42d6435a36aea9290cb9eb1638ced (patch) | |
| tree | a4f6b94be3632d880245c064dbf99ead5a64f83e /src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java | |
| parent | cea80b01195be2ab6bd5cdadbcf7fa7b2972e131 (diff) | |
| download | architectury-loom-695863367fb42d6435a36aea9290cb9eb1638ced.tar.gz architectury-loom-695863367fb42d6435a36aea9290cb9eb1638ced.tar.bz2 architectury-loom-695863367fb42d6435a36aea9290cb9eb1638ced.zip | |
Fix merge conflicts
Signed-off-by: shedaniel <daniel@shedaniel.me>
Diffstat (limited to 'src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java')
| -rw-r--r-- | src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java b/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java index 07a01118..42d6e0fd 100644 --- a/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java +++ b/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java @@ -61,11 +61,11 @@ public final class CompileConfiguration { LoomGradleExtension extension = LoomGradleExtension.get(project); project.afterEvaluate(project1 -> { - if (project.getExtensions().getByType(LoomGradleExtension.class).shouldGenerateSrgTiny()) { + if (extension.shouldGenerateSrgTiny()) { extension.createLazyConfiguration(Constants.Configurations.SRG).configure(configuration -> configuration.setTransitive(false)); } - if (project.getExtensions().getByType(LoomGradleExtension.class).isDataGenEnabled()) { + if (extension.isDataGenEnabled()) { project.getConvention().getPlugin(JavaPluginConvention.class).getSourceSets().getByName("main").resources(files -> { files.srcDir(project.file("src/generated/resources")); }); @@ -79,7 +79,7 @@ public final class CompileConfiguration { extension.createLazyConfiguration(Constants.Configurations.LOADER_DEPENDENCIES).configure(configuration -> configuration.setTransitive(false)); extension.createLazyConfiguration(Constants.Configurations.MINECRAFT).configure(configuration -> configuration.setTransitive(false)); - if (project.getExtensions().getByType(LoomGradleExtension.class).isForge()) { + if (extension.isForge()) { extension.createLazyConfiguration(Constants.Configurations.FORGE).configure(configuration -> configuration.setTransitive(false)); extension.createLazyConfiguration(Constants.Configurations.FORGE_USERDEV).configure(configuration -> configuration.setTransitive(false)); extension.createLazyConfiguration(Constants.Configurations.FORGE_INSTALLER).configure(configuration -> configuration.setTransitive(false)); @@ -96,7 +96,7 @@ public final class CompileConfiguration { extendsFrom(JavaPlugin.TEST_RUNTIME_CLASSPATH_CONFIGURATION_NAME, Constants.Configurations.FORGE_NAMED, project); } - if (project.getExtensions().getByType(LoomGradleExtension.class).supportsInclude()) { + if (extension.supportsInclude()) { extension.createLazyConfiguration(Constants.Configurations.INCLUDE).configure(configuration -> configuration.setTransitive(false)); // Dont get transitive deps } |