Fix configuration cache, run configs, and macOS variant mismatching (#998)

Author: Jonathing

build.gradle

@@ -15,10 +15,11 @@ plugins {
 
 gradleutils.displayName = 'ForgeGradle'
 description = "Forge's Gradle plugin for Mod development"
-base.archivesName = 'forgegradle'
 group = 'net.minecraftforge'
 version = gitversion.tagOffset
 
+println "Version: $version"
+
 java {
     toolchain.languageVersion = JavaLanguageVersion.of(17)
     withSourcesJar()

gradle.properties

@@ -8,8 +8,5 @@ org.gradle.configuration-cache.problems=warn
 
 systemProp.org.gradle.unsafe.suppress-gradle-api=true
 
-net.minecraftforge.gradleutils.publishing.use-base-archives-name=true
 net.minecraftforge.gradleutils.ide.automatic.sources=true
 net.minecraftforge.gradleutils.compilation.defaults=true
-
-net.minecraftforge.gitversion.log.version=true

settings.gradle

@@ -20,12 +20,12 @@ gradle.beforeProject { Project project ->
 
 //@formatter:off
 dependencyResolutionManagement.versionCatalogs.register('libs') {
-    version 'gradleutils', '3.3.20'
+    version 'gradleutils', '3.3.21'
 
     plugin 'licenser',       'net.minecraftforge.licenser'    version '1.2.0' // https://plugins.gradle.org/plugin/net.minecraftforge.licenser
     plugin 'gradleutils',    'net.minecraftforge.gradleutils' versionRef 'gradleutils'
-    plugin 'gitversion',     'net.minecraftforge.gitversion'  version '3.1.1' // https://plugins.gradle.org/plugin/net.minecraftforge.changelog
-    plugin 'changelog',      'net.minecraftforge.changelog'   version '3.1.2' // https://plugins.gradle.org/plugin/net.minecraftforge.changelog
+    plugin 'gitversion',     'net.minecraftforge.gitversion'  version '3.1.6' // https://plugins.gradle.org/plugin/net.minecraftforge.changelog
+    plugin 'changelog',      'net.minecraftforge.changelog'   version '3.1.3' // https://plugins.gradle.org/plugin/net.minecraftforge.changelog
     plugin 'plugin-publish', 'com.gradle.plugin-publish'      version '2.0.0' // https://plugins.gradle.org/plugin/com.gradle.plugin-publish
     plugin 'shadow',         'com.gradleup.shadow'            version '9.2.2' // https://plugins.gradle.org/plugin/com.gradleup.shadow
 
@@ -45,9 +45,10 @@ dependencyResolutionManagement.versionCatalogs.register('libs') {
     // https://plugins.gradle.org/plugin/net.minecraftforge.accesstransformers
     library 'accesstransformers-gradle', 'net.minecraftforge.accesstransformers', 'net.minecraftforge.accesstransformers.gradle.plugin' version '5.0.1'
 
-    library 'utils-data',     'net.minecraftforge', 'json-data-utils' version '0.3.0'  // https://files.minecraftforge.net/net/minecraftforge/json-data-utils/index.html
-    library 'utils-hash',     'net.minecraftforge', 'hash-utils'      version '0.1.10' // https://files.minecraftforge.net/net/minecraftforge/hash-utils/index.html
-    library 'utils-download', 'net.minecraftforge', 'download-utils'  version '0.3.2'  // https://files.minecraftforge.net/net/minecraftforge/download-utils/index.html
-    bundle 'utils', ['utils-data', 'utils-hash', 'utils-download']
+    library 'utils-data',     'net.minecraftforge', 'json-data-utils' version '0.4.0'  // https://files.minecraftforge.net/net/minecraftforge/json-data-utils/index.html
+    library 'utils-os',       'net.minecraftforge', 'os-utils'        version '0.1.0'  // https://files.minecraftforge.net/net/minecraftforge/os-utils/index.html
+    library 'utils-hash',     'net.minecraftforge', 'hash-utils'      version '0.1.12' // https://files.minecraftforge.net/net/minecraftforge/hash-utils/index.html
+    library 'utils-download', 'net.minecraftforge', 'download-utils'  version '0.4.0'  // https://files.minecraftforge.net/net/minecraftforge/download-utils/index.html
+    bundle 'utils', ['utils-data', 'utils-os', 'utils-hash', 'utils-download']
 }
 //@formatter:on

src/main/java/net/minecraftforge/gradle/Constants.java

@@ -18,9 +18,9 @@ final class Constants {
     static final String SLIMELAUNCHER_MAIN = "net.minecraftforge.launcher.Main";
 
     static final String MAVENIZER_NAME = "mavenizer";
-    static final String MAVENIZER_VERSION = "0.3.25";
+    static final String MAVENIZER_VERSION = "0.4.0";
     static final String MAVENIZER_DL_URL = "https://maven.minecraftforge.net/net/minecraftforge/minecraft-mavenizer/" + MAVENIZER_VERSION + "/minecraft-mavenizer-" + MAVENIZER_VERSION + ".jar";
-    static final int MAVENIZER_JAVA_VERSION = 21;
+    static final int MAVENIZER_JAVA_VERSION = 25;
     static final String MAVENIZER_MAIN = "net.minecraftforge.mcmaven.cli.Main";
 
     /// Use these with [java.text.MessageFormat#format(String, Object...)].

src/main/java/net/minecraftforge/gradle/ForgeGradleProblems.java

@@ -124,7 +124,7 @@ RuntimeException changingMinecraftDependency(Dependency dependency) {
     //endregion
 
     //region Minecraft Maven
-    RuntimeException mavenizerOutOfDateCompile(Dependency dependency) {
+    RuntimeException mavenizerOutOfDateCompile(Object dependency) {
         return this.throwing(new IllegalStateException(), "mavenizer-out-of-date", "Minecraft Mavenizer is out-of-date", spec -> spec
             .details("""
                 Gradle cannot compile your sources because the Minecraft Mavenizer is out-of-date.

src/main/java/net/minecraftforge/gradle/MinecraftDependencyImpl.java

@@ -10,20 +10,21 @@
 import groovy.transform.NamedVariant;
 import net.minecraftforge.accesstransformers.gradle.ArtifactAccessTransformer;
 import net.minecraftforge.gradleutils.shared.Closures;
+import net.minecraftforge.util.os.OS;
 import org.gradle.api.Action;
 import org.gradle.api.InvalidUserCodeException;
 import org.gradle.api.Project;
 import org.gradle.api.artifacts.Configuration;
 import org.gradle.api.artifacts.Dependency;
 import org.gradle.api.artifacts.ExternalModuleDependency;
+import org.gradle.api.artifacts.ModuleIdentifier;
 import org.gradle.api.artifacts.type.ArtifactTypeDefinition;
 import org.gradle.api.attributes.Attribute;
 import org.gradle.api.attributes.AttributeContainer;
 import org.gradle.api.attributes.Category;
 import org.gradle.api.file.Directory;
 import org.gradle.api.file.ProjectLayout;
 import org.gradle.api.file.RegularFileProperty;
-import org.gradle.api.logging.LogLevel;
 import org.gradle.api.model.ObjectFactory;
 import org.gradle.api.plugins.ExtensionAware;
 import org.gradle.api.plugins.JavaPluginExtension;
@@ -33,19 +34,22 @@
 import org.gradle.api.tasks.SourceSet;
 import org.gradle.api.tasks.TaskProvider;
 import org.gradle.api.tasks.compile.JavaCompile;
-import org.gradle.internal.os.OperatingSystem;
-import org.gradle.nativeplatform.OperatingSystemFamily;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.annotations.UnknownNullability;
 
 import javax.inject.Inject;
 import java.io.File;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Set;
 
 abstract class MinecraftDependencyImpl implements MinecraftDependencyInternal {
-    private @UnknownNullability ExternalModuleDependency delegate;
-    private @UnknownNullability TaskProvider<SyncMavenizer> mavenizer;
+    private transient @Nullable("configuration cache") ExternalModuleDependency delegate;
+    private transient @Nullable("configuration cache") TaskProvider<SyncMavenizer> mavenizer;
+
+    final Property<String> asString = getObjects().property(String.class);
+    final Property<String> asPath = getObjects().property(String.class);
+    final Property<ModuleIdentifier> module = getObjects().property(ModuleIdentifier.class);
+    final Property<String> version = getObjects().property(String.class);
 
     private final Provider<? extends Directory> mavenizerOutput;
     private final Property<MinecraftMappings> mappings;
@@ -70,12 +74,12 @@ public MinecraftDependencyImpl(Provider<? extends Directory> mavenizerOutput) {
     }
 
     @Override
-    public ExternalModuleDependency asDependency() {
+    public @Nullable("configuration cache") ExternalModuleDependency asDependency() {
         return this.delegate;
     }
 
     @Override
-    public TaskProvider<SyncMavenizer> asTask() {
+    public @Nullable("configuration cache") TaskProvider<SyncMavenizer> asTask() {
         return this.mavenizer;
     }
 
@@ -97,13 +101,18 @@ public ExternalModuleDependency init(Object dependencyNotation, Closure<?> closu
 
         this.mavenizer = SyncMavenizer.register(getProject(), dependency, this.mappings, mavenizerOutput);
 
+        this.asString.set(dependency.toString());
+        this.asPath.set(Util.pathify(dependency));
+        this.module.set(dependency.getModule());
+        this.version.set(dependency.getVersion());
+
         return this.delegate = dependency;
     }
 
     @Override
     public Action<? super AttributeContainer> addAttributes() {
         return attributes -> {
-            attributes.attribute(MinecraftExtension.Attributes.os, this.getObjects().named(OperatingSystemFamily.class, OperatingSystem.current().getFamilyName()));
+            attributes.attributeProvider(MinecraftExtension.Attributes.os, getProviders().of(OperatingSystemName.class, spec -> spec.parameters(parameters -> parameters.getAllowedOperatingSystems().set(Set.of(OS.WINDOWS, OS.MACOS, OS.LINUX)))));
             attributes.attributeProvider(MinecraftExtension.Attributes.mappingsChannel, mappings.map(MinecraftMappings::channel));
             attributes.attributeProvider(MinecraftExtension.Attributes.mappingsVersion, mappings.map(MinecraftMappings::version));
         };
@@ -114,9 +123,8 @@ public void handle(Configuration configuration) {
         if (!configuration.isCanBeResolved()) return;
 
         this.mappings.finalizeValue();
-        var dependency = this.asDependency();
         configuration.getResolutionStrategy().dependencySubstitution(s -> {
-            var moduleSelector = "%s:%s".formatted(dependency.getModule(), dependency.getVersion());
+            var moduleSelector = "%s:%s".formatted(this.module.get(), this.version.get());
             var module = s.module(moduleSelector);
             try {
                 s.substitute(module)
@@ -127,12 +135,15 @@ public void handle(Configuration configuration) {
             }
         });
 
+        var asDependency = this.asDependency();
+        if (asDependency == null) return;
+
         var hierarchy = configuration.getHierarchy();
 
         var sourceSet = Util.getSourceSet(
             getProject().getConfigurations().matching(hierarchy::contains),
             getProject().getExtensions().getByType(JavaPluginExtension.class).getSourceSets(),
-            this.asDependency()
+            asDependency
         );
 
         // Hope that this is handled elsewhere, and that we are transitive.
@@ -145,9 +156,9 @@ public void handle(Configuration configuration) {
     public void handle(SourceSet sourceSet) {
         getProject().getTasks().named(sourceSet.getCompileJavaTaskName(), JavaCompile.class, task -> {
             task.doFirst(t -> {
-                var file = this.mavenizerOutput.map(dir -> dir.dir(Util.pathify(asDependency()))).get().getAsFile();
+                var file = this.mavenizerOutput.map(dir -> dir.dir(this.asPath)).get().get().getAsFile();
                 if (!file.exists())
-                    throw this.problems.mavenizerOutOfDateCompile(asDependency());
+                    throw this.problems.mavenizerOutOfDateCompile(this.asString.get());
             });
         });
 
@@ -223,7 +234,10 @@ public Action<? super AttributeContainer> addAttributes() {
         public void handle(SourceSet sourceSet) {
             super.handle(sourceSet);
 
-            if (!Util.contains(getProject().getConfigurations(), sourceSet, false, this.asDependency())) return;
+            var asDependency = this.asDependency();
+            if (asDependency == null) return;
+
+            if (!Util.contains(getProject().getConfigurations(), sourceSet, false, asDependency)) return;
             if (!this.atPath.isPresent()) return;
 
             var itor = sourceSet.getResources().getSrcDirs().iterator();
@@ -235,7 +249,7 @@ public void handle(SourceSet sourceSet) {
                 this.atFile.convention(this.getProjectLayout().getProjectDirectory().file(this.getProviders().provider(() -> "src/%s/resources/%s".formatted(sourceSet.getName(), this.atPath.get()))).get());
             }
 
-            ArtifactAccessTransformer.validateConfig(getProject(), this.asDependency(), this.atFile);
+            ArtifactAccessTransformer.validateConfig(getProject(), asDependency, this.atFile);
         }
 
         private Attribute<Boolean> registerTransform() {

src/main/java/net/minecraftforge/gradle/MinecraftDependencyInternal.java

@@ -46,9 +46,9 @@ static boolean is(Dependency dependency) {
 
     ExternalModuleDependency init(Object dependencyNotation, Closure<?> closure);
 
-    ExternalModuleDependency asDependency();
+    @Nullable("configuration cache") ExternalModuleDependency asDependency();
 
-    TaskProvider<SyncMavenizer> asTask();
+    @Nullable("configuration cache") TaskProvider<SyncMavenizer> asTask();
 
     Action<? super AttributeContainer> addAttributes();
 

src/main/java/net/minecraftforge/gradle/MinecraftExtension.java

@@ -80,7 +80,7 @@ sealed interface Attributes permits MinecraftExtensionInternal.AttributesInterna
         /// The [operating system family][OperatingSystemFamily] of the project's host.
         ///
         /// This is used to filter natives from the Minecraft repo.
-        Attribute<OperatingSystemFamily> os = Attribute.of("net.minecraftforge.native.operatingSystem", OperatingSystemFamily.class);
+        Attribute<String> os = Attribute.of("net.minecraftforge.native.operatingSystem", String.class);
         /// The requested mappings channel of the project.
         ///
         /// This is determined using [MinecraftMappings#channel()] via [#getMappings()]

src/main/java/net/minecraftforge/gradle/MinecraftExtensionImpl.java

@@ -271,7 +271,10 @@ private void finish(Project project) {
             if (!this.minecraftDependencies.isEmpty()) {
                 var syncMavenizer = project.getTasks().register("syncMavenizer", task -> task.setGroup("Build Setup"));
                 for (var minecraftDependency : this.minecraftDependencies) {
-                    syncMavenizer.configure(task -> task.dependsOn(minecraftDependency.asTask()));
+                    var mavenizer = minecraftDependency.asTask();
+                    if (mavenizer == null) continue;
+
+                    syncMavenizer.configure(task -> task.dependsOn(mavenizer));
                 }
 
                 project.getPluginManager().withPlugin("eclipse", eclipsePlugin -> {
@@ -302,8 +305,8 @@ private void finish(Project project) {
                         // This can never be null in production and is only here to make the IDE happy.
                         assert minecraftDependency != null;
 
-                        var dependency = minecraftDependency.asDependency();
-                        this.runs.forEach(options -> SlimeLauncherExec.register(project, sourceSet, options, dependency, single));
+                        var impl = (MinecraftDependencyImpl) minecraftDependency;
+                        this.runs.forEach(options -> SlimeLauncherExec.register(project, sourceSet, options, impl.module.get(), impl.version.get(), impl.asPath.get(), impl.asString.get(), single));
                     }
                 });
             }

src/main/java/net/minecraftforge/gradle/OperatingSystemName.java

@@ -0,0 +1,26 @@
+package net.minecraftforge.gradle;
+
+import net.minecraftforge.util.os.OS;
+import org.gradle.api.provider.SetProperty;
+import org.gradle.api.provider.ValueSource;
+import org.gradle.api.provider.ValueSourceParameters;
+import org.jspecify.annotations.Nullable;
+
+import javax.inject.Inject;
+
+abstract class OperatingSystemName implements ValueSource<String, OperatingSystemName.Parameters> {
+    interface Parameters extends ValueSourceParameters {
+        SetProperty<OS> getAllowedOperatingSystems();
+    }
+
+    @Inject
+    public OperatingSystemName() { }
+
+    @Override
+    public @Nullable String obtain() {
+        var allowed = getParameters().getAllowedOperatingSystems().get().toArray(new OS[0]);
+        return allowed.length > 0
+            ? OS.current(allowed).key()
+            : OS.current().key();
+    }
+}