diff --git a/.github/renovate.json b/.github/renovate.json index 24daaac..7c6ba45 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -4,6 +4,16 @@ "github>neoforged/actions:renovate_preset" ], "baseBranches": ["main", "/^\\d+\\.x/"], + "packageRules": [ + { + "matchDatasources": ["maven"], + "matchPackagePatterns": [ + "^curse\\.maven(\\.|:)", + "^mezz\\.jei(\\.|:)" + ], + "enabled": false + } + ], "customManagers": [ { "customType": "regex", diff --git a/src/main/java/net/neoforged/moddevgradle/internal/utils/DependencyUtils.java b/src/main/java/net/neoforged/moddevgradle/internal/utils/DependencyUtils.java index 44231e9..e55dc88 100644 --- a/src/main/java/net/neoforged/moddevgradle/internal/utils/DependencyUtils.java +++ b/src/main/java/net/neoforged/moddevgradle/internal/utils/DependencyUtils.java @@ -11,7 +11,7 @@ private DependencyUtils() {} /** * Given a resolved artifact, try to guess which Maven GAV it was resolved from. */ - public static String guessMavenGav(ResolvedArtifactResult result) { + public static String guessMavenGav(ResolvedArtifactResult result, boolean useWildcardVersionForProjectRefs) { String artifactId; String ext = ""; String classifier = null; @@ -40,7 +40,12 @@ 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(); + artifactId = capability.getGroup() + ":" + capability.getName() + ":"; + if (useWildcardVersionForProjectRefs) { + artifactId += "*"; + } else { + artifactId += capability.getVersion(); + } } else { artifactId = result.getId().getComponentIdentifier().toString(); } diff --git a/src/main/java/net/neoforged/nfrtgradle/ArtifactManifestEntry.java b/src/main/java/net/neoforged/nfrtgradle/ArtifactManifestEntry.java index cf3f635..277b86b 100644 --- a/src/main/java/net/neoforged/nfrtgradle/ArtifactManifestEntry.java +++ b/src/main/java/net/neoforged/nfrtgradle/ArtifactManifestEntry.java @@ -20,7 +20,7 @@ final class ArtifactManifestEntry implements Serializable { private final File file; ArtifactManifestEntry(ResolvedArtifactResult artifactResult) { - this.artifactId = DependencyUtils.guessMavenGav(artifactResult); + this.artifactId = DependencyUtils.guessMavenGav(artifactResult, true); this.file = artifactResult.getFile(); } diff --git a/src/main/java/net/neoforged/nfrtgradle/NeoFormRuntimeExtension.java b/src/main/java/net/neoforged/nfrtgradle/NeoFormRuntimeExtension.java index 3b277fb..ee09ec1 100644 --- a/src/main/java/net/neoforged/nfrtgradle/NeoFormRuntimeExtension.java +++ b/src/main/java/net/neoforged/nfrtgradle/NeoFormRuntimeExtension.java @@ -12,7 +12,7 @@ public abstract class NeoFormRuntimeExtension { public static final String NAME = "neoFormRuntime"; - private static final String DEFAULT_NFRT_VERSION = "1.0.13"; + private static final String DEFAULT_NFRT_VERSION = "1.0.17"; @Inject public NeoFormRuntimeExtension(Project project) {