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

Reject the unmapped dependency from the target configuration. Completes #679

Browse Source 
Prevents having duplicate dependencies on the classpath.
This commit is contained in:
modmuss50
2022-06-29 18:22:21 +01:00
parent da34ea4bf0
commit 1e77bb0404
1 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/net/fabricmc/loom/configuration/mods/ModConfigurationRemapper.java
View File

@@ -35,6 +35,7 @@ import com.google.common.io.Files;
import org.gradle.api.Project;
import org.gradle.api.artifacts.Configuration;
import org.gradle.api.artifacts.FileCollectionDependency;
import org.gradle.api.artifacts.MutableVersionConstraint;
import org.gradle.api.artifacts.ResolvedArtifact;
import org.gradle.api.artifacts.dsl.DependencyHandler;
import org.gradle.api.artifacts.query.ArtifactResolutionQuery;
@@ -124,6 +125,20 @@ public class ModConfigurationRemapper {
// Add all of the remapped mods onto the config
for (ModDependencyInfo info : modDependencies) {
project.getDependencies().add(info.targetConfig.getName(), info.getRemappedNotation());
if (info.getArtifact() instanceof ArtifactRef.ResolvedArtifactRef mavenArtifact) {
final String dependencyCoordinate = "%s:%s".formatted(mavenArtifact.group(), mavenArtifact.name());
// Prevent adding the same un-remapped dependency to the target configuration.
targetConfig.getDependencyConstraints().add(dependencies.getConstraints().create(dependencyCoordinate, constraint -> {
constraint.because("configuration (%s) already contains the remapped module from configuration (%s)".formatted(
targetConfig.getName(),
sourceConfig.getName()
));
constraint.version(MutableVersionConstraint::rejectAll);
}));
}
}
// Export to other projects