imports/architectury-loom
1
0
Fork 0
mirror of https://github.com/architectury/architectury-loom.git synced 2026-03-30 05:05:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

Ensure the Mojang maven repo is added before maven central. Close #621 (#625)

Browse Source
This commit is contained in:
Jared
2022-04-14 00:35:27 +02:00
committed by GitHub
parent ccc70f134d
commit ff6e7a23b9
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/net/fabricmc/loom/LoomRepositoryPlugin.java
View File

@@ -26,7 +26,9 @@ package net.fabricmc.loom;
import org.gradle.api.Plugin;
import org.gradle.api.Project;
import org.gradle.api.artifacts.ArtifactRepositoryContainer;
import org.gradle.api.artifacts.dsl.RepositoryHandler;
import org.gradle.api.artifacts.repositories.ArtifactRepository;
import org.gradle.api.artifacts.repositories.IvyArtifactRepository;
import org.gradle.api.artifacts.repositories.MavenArtifactRepository;
import org.gradle.api.initialization.Settings;
@@ -68,7 +70,8 @@ public class LoomRepositoryPlugin implements Plugin<PluginAware> {
repo.setName("Fabric");
repo.setUrl(MirrorUtil.getFabricRepository(target));
});
repositories.maven(repo -> {
MavenArtifactRepository mojangRepo = repositories.maven(repo -> {
repo.setName("Mojang");
repo.setUrl(MirrorUtil.getLibrariesBase(target));
@@ -79,6 +82,16 @@ public class LoomRepositoryPlugin implements Plugin<PluginAware> {
sources.ignoreGradleMetadataRedirection();
});
});
// If a mavenCentral repo is already defined, remove the mojang repo and add it back before the mavenCentral repo so that it will be checked first.
// See: https://github.com/FabricMC/fabric-loom/issues/621
ArtifactRepository mavenCentral = repositories.findByName(ArtifactRepositoryContainer.DEFAULT_MAVEN_CENTRAL_REPO_NAME);
if (mavenCentral != null) {
repositories.remove(mojangRepo);
repositories.add(repositories.indexOf(mavenCentral), mojangRepo);
}
repositories.mavenCentral();
repositories.ivy(repo -> {