aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/net/fabricmc/loom/configuration/LoomDependencyManager.java
diff options
context:
space:
mode:
authorLogicFan <38597904+LogicFan@users.noreply.github.com>2021-05-22 18:28:42 -0400
committerGitHub <noreply@github.com>2021-05-22 23:28:42 +0100
commite955ebb8c56378b166adbd440f237999a346099e (patch)
tree7effc5bfb093afdfceafb3410ae5de2f19417436 /src/main/java/net/fabricmc/loom/configuration/LoomDependencyManager.java
parentde665ab4989bceb4ff323ebc0851ef781a0ef5de (diff)
downloadarchitectury-loom-e955ebb8c56378b166adbd440f237999a346099e.tar.gz
architectury-loom-e955ebb8c56378b166adbd440f237999a346099e.tar.bz2
architectury-loom-e955ebb8c56378b166adbd440f237999a346099e.zip
add support for new dependencyResolutionManagement (#400)
* move repo declartions - Move repository declartions in MavenConfiguration.java to LoomRepositoryPlugin.java * move repo declartions - Move repository declartions in MinecraftMappedProvider.java to LoomRepositoryPlugin.java * move repo declartions - Move repository declarations in MinecraftProcessedProvider.java to LoomRepositoryPlugin.java * do not add repositories if dependencyResolutionManagement is used * Simplify the change on LoomGradlePlugin - this is the suggestion from liach * change name to follow fabric naming convension - change getProjectUUID to getProjectUuid - change PROJECT_MAPPED_CLASSIFIER to projectMappedClassifier * remove MavenConfiguration.java - the file currently do nothing. * clean-up for all `instanceof` clause * add DependencyResolutionManagementTest * code cleanup * Update src/test/resources/projects/dependencyResolutionManagement/projmap/src/main/resources/modid.accesswidener * change project uuid to project full name Co-authored-by: modmuss50 <modmuss50@gmail.com>
Diffstat (limited to 'src/main/java/net/fabricmc/loom/configuration/LoomDependencyManager.java')
-rw-r--r--src/main/java/net/fabricmc/loom/configuration/LoomDependencyManager.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/main/java/net/fabricmc/loom/configuration/LoomDependencyManager.java b/src/main/java/net/fabricmc/loom/configuration/LoomDependencyManager.java
index 397908c5..55c544cf 100644
--- a/src/main/java/net/fabricmc/loom/configuration/LoomDependencyManager.java
+++ b/src/main/java/net/fabricmc/loom/configuration/LoomDependencyManager.java
@@ -45,6 +45,7 @@ import net.fabricmc.loom.configuration.mods.ModProcessor;
import net.fabricmc.loom.configuration.providers.mappings.MappingsProvider;
import net.fabricmc.loom.util.Constants;
import net.fabricmc.loom.util.SourceRemapper;
+import net.fabricmc.loom.LoomRepositoryPlugin;
public class LoomDependencyManager {
private static class ProviderList {
@@ -193,7 +194,9 @@ public class LoomDependencyManager {
project.getLogger().debug("Loom adding " + name + " from installer JSON");
- if (jsonElement.getAsJsonObject().has("url")) {
+ // If user choose to use dependencyResolutionManagement, then they should declare
+ // these repositories manually in the settings file.
+ if (jsonElement.getAsJsonObject().has("url") && !project.getGradle().getPlugins().hasPlugin(LoomRepositoryPlugin.class)) {
String url = jsonElement.getAsJsonObject().get("url").getAsString();
long count = project.getRepositories().stream().filter(artifactRepository -> artifactRepository instanceof MavenArtifactRepository)
.map(artifactRepository -> (MavenArtifactRepository) artifactRepository)