Skip to content

Commit

Permalink
Merge remote-tracking branch 'FabricMC/dev/1.5' into dev/1.5
Browse files Browse the repository at this point in the history
  • Loading branch information
shedaniel committed Feb 29, 2024
2 parents 20b6396 + 3085bcf commit 5c8405f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ public String classifier() {
public void applyToConfiguration(Project project, Configuration configuration) {
final DependencyHandler dependencies = project.getDependencies();

Dependency dep = dependencies.module(artifact.getModuleVersion() + (artifact.getClassifier() == null ? "" : ':' + artifact.getClassifier())); // the owning module of the artifact
Dependency dep = dependencies.create(artifact.getModuleVersion() + (artifact.getClassifier() == null ? "" : ':' + artifact.getClassifier())); // the owning module of the artifact

if (dep instanceof ModuleDependency moduleDependency) {
moduleDependency.setTransitive(false);
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/net/fabricmc/loom/task/MigrateMappingsTask.java
Original file line number Diff line number Diff line change
Expand Up @@ -143,10 +143,10 @@ private File loadMappings() {
project.getLogger().info("Could not locate mappings, presuming V2 Yarn");

try {
files = project.getConfigurations().detachedConfiguration(project.getDependencies().module(ImmutableMap.of("group", "net.fabricmc", "name", "yarn", "version", mappings, "classifier", "v2"))).resolve();
files = project.getConfigurations().detachedConfiguration(project.getDependencies().create(ImmutableMap.of("group", "net.fabricmc", "name", "yarn", "version", mappings, "classifier", "v2"))).resolve();
} catch (GradleException ignored2) {
project.getLogger().info("Could not locate mappings, presuming V1 Yarn");
files = project.getConfigurations().detachedConfiguration(project.getDependencies().module(ImmutableMap.of("group", "net.fabricmc", "name", "yarn", "version", mappings))).resolve();
files = project.getConfigurations().detachedConfiguration(project.getDependencies().create(ImmutableMap.of("group", "net.fabricmc", "name", "yarn", "version", mappings))).resolve();
}
}

Expand Down

0 comments on commit 5c8405f

Please sign in to comment.