Skip to content

Fix DependencyUtils failing to infer artifact classifier under some circumstances #257

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Technici4n merged 1 commit into from
Jun 5, 2025
Merged

Fix DependencyUtils failing to infer artifact classifier under some circumstances #257

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 13 additions & 6 deletions src/main/java/net/neoforged/moddevgradle/internal/utils/DependencyUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package net.neoforged.moddevgradle.internal.utils;

import org.gradle.api.artifacts.component.ModuleComponentIdentifier;
import org.gradle.api.artifacts.result.ResolvedArtifactResult;
import org.gradle.internal.component.external.model.ModuleComponentArtifactIdentifier;
import org.jetbrains.annotations.ApiStatus;

@ApiStatus.Internal
Expand All @@ -23,15 +23,15 @@ public static String guessMavenGav(ResolvedArtifactResult result) {
filename = filename.substring(0, startOfExt);
}

if (result.getId() instanceof ModuleComponentArtifactIdentifier moduleId) {
var artifact = moduleId.getComponentIdentifier().getModule();
var version = moduleId.getComponentIdentifier().getVersion();
if (result.getId().getComponentIdentifier() instanceof ModuleComponentIdentifier moduleId) {
var artifact = moduleId.getModule();
var version = moduleId.getVersion();
var expectedBasename = artifact + "-" + version;

if (filename.startsWith(expectedBasename + "-")) {
classifier = filename.substring((expectedBasename + "-").length());
}
artifactId = moduleId.getComponentIdentifier().getGroup() + ":" + artifact + ":" + version;
artifactId = moduleId.getGroup() + ":" + artifact + ":" + version;
} else {
// When we encounter a project reference, the component identifier does not expose the group or module name.
// But we can access the list of capabilities associated with the published variant the artifact originates from.
Expand All @@ -40,7 +40,14 @@ public static String guessMavenGav(ResolvedArtifactResult result) {
var capabilities = result.getVariant().getCapabilities();
if (capabilities.size() == 1) {
var capability = capabilities.get(0);
artifactId = capability.getGroup() + ":" + capability.getName() + ":" + capability.getVersion();
var artifact = capability.getName();
var version = capability.getVersion();
var expectedBasename = artifact + "-" + version;

if (filename.startsWith(expectedBasename + "-")) {
classifier = filename.substring((expectedBasename + "-").length());
}
artifactId = capability.getGroup() + ":" + artifact + ":" + version;
} else {
artifactId = result.getId().getComponentIdentifier().toString();
}
Expand Down
Loading