Support bundles, keep provider dependencies lazy

Version bumped to 3.0.0 due to the heavily breaking binary and API changes. This was necessarily to progress ForgeGradle 7's development.

Author: Jonathing

at-gradle/src/main/java/net/minecraftforge/accesstransformers/gradle/AccessTransformersContainer.java

@@ -24,6 +24,7 @@
 import java.io.File;
 import java.util.Arrays;
 import java.util.function.Function;
+import java.util.function.UnaryOperator;
 
 /// Represents a container of dependencies that will be access transformed.
 ///
@@ -83,7 +84,7 @@ default Dependency dep(Object dependencyNotation, Action<? super Dependency> act
     /// @param dependencyNotation The dependency (notation)
     /// @return The dependency to be transformed
     default Dependency dep(Object dependencyNotation) {
-        return this.dep(dependencyNotation, Closures.empty(this));
+        return this.dep(dependencyNotation, Closures.<Dependency>unaryOperator(this, UnaryOperator.identity()));
     }
 
     /// Queues the given dependency to be transformed by AccessTransformers.
@@ -92,30 +93,28 @@ default Dependency dep(Object dependencyNotation) {
     /// @param closure            A configuring closure for the dependency
     /// @return The dependency to be transformed
     @SuppressWarnings("rawtypes") // public-facing closure
-    default Dependency dep(
+    Provider<?> dep(
         Provider<?> dependencyNotation,
         @DelegatesTo(Dependency.class)
         @ClosureParams(value = SimpleType.class, options = "org.gradle.api.artifacts.Dependency")
         Closure closure
-    ) {
-        return this.dep(dependencyNotation.get(), closure);
-    }
+    );
 
     /// Queues the given dependency to be transformed by AccessTransformers.
     ///
     /// @param dependencyNotation The dependency (notation)
     /// @param action             A configuring action for the dependency
     /// @return The dependency to be transformed
-    default Dependency dep(Provider<?> dependencyNotation, Action<? super Dependency> action) {
+    default Provider<?> dep(Provider<?> dependencyNotation, Action<? super Dependency> action) {
         return this.dep(dependencyNotation, Closures.action(this, action));
     }
 
     /// Queues the given dependency to be transformed by AccessTransformers.
     ///
     /// @param dependencyNotation The dependency (notation)
     /// @return The dependency to be transformed
-    default Dependency dep(Provider<?> dependencyNotation) {
-        return this.dep(dependencyNotation, Closures.empty(this));
+    default Provider<?> dep(Provider<?> dependencyNotation) {
+        return this.dep(dependencyNotation, Closures.<Dependency>unaryOperator(this, UnaryOperator.identity()));
     }
 
     /// Queues the given dependency to be transformed by AccessTransformers.
@@ -124,7 +123,7 @@ default Dependency dep(Provider<?> dependencyNotation) {
     /// @param closure            A configuring closure for the dependency
     /// @return The dependency to be transformed
     @SuppressWarnings("rawtypes") // public-facing closure
-    default Dependency dep(
+    default Provider<?> dep(
         ProviderConvertible<?> dependencyNotation,
         @DelegatesTo(Dependency.class)
         @ClosureParams(value = SimpleType.class, options = "org.gradle.api.artifacts.Dependency")
@@ -138,16 +137,16 @@ default Dependency dep(
     /// @param dependencyNotation The dependency (notation)
     /// @param action             A configuring action for the dependency
     /// @return The dependency to be transformed
-    default Dependency dep(ProviderConvertible<?> dependencyNotation, Action<? super Dependency> action) {
+    default Provider<?> dep(ProviderConvertible<?> dependencyNotation, Action<? super Dependency> action) {
         return this.dep(dependencyNotation, Closures.action(this, action));
     }
 
     /// Queues the given dependency to be transformed by AccessTransformers.
     ///
     /// @param dependencyNotation The dependency (notation)
     /// @return The dependency to be transformed
-    default Dependency dep(ProviderConvertible<?> dependencyNotation) {
-        return this.dep(dependencyNotation, Closures.empty(this));
+    default Provider<?> dep(ProviderConvertible<?> dependencyNotation) {
+        return this.dep(dependencyNotation, Closures.<Dependency>unaryOperator(this, UnaryOperator.identity()));
     }
 
     /// When initially registering an AccessTransformers container, the consumer must define key information regarding
@@ -203,7 +202,7 @@ default void setClasspath(
         ///
         /// @param dependencyNotation The dependency (notation) to use
         default void setClasspath(Object dependencyNotation) {
-            this.setClasspath(dependencyNotation, Closures.empty(this));
+            this.setClasspath(dependencyNotation, Closures.<Dependency>unaryOperator(this, UnaryOperator.identity()));
         }
 
         /// Sets the dependency to use as the classpath for AccessTransformers.
@@ -235,7 +234,7 @@ default void setClasspath(
         ///
         /// @param dependencyNotation The dependency (notation) to use
         default void setClasspath(Provider<?> dependencyNotation) {
-            this.setClasspath(dependencyNotation, Closures.empty(this));
+            this.setClasspath(dependencyNotation, Closures.<Dependency>unaryOperator(this, UnaryOperator.identity()));
         }
 
         /// Sets the dependency to use as the classpath for AccessTransformers.
@@ -267,7 +266,7 @@ default void setClasspath(
         ///
         /// @param dependencyNotation The dependency (notation) to use
         default void setClasspath(ProviderConvertible<?> dependencyNotation) {
-            this.setClasspath(dependencyNotation, Closures.empty(this));
+            this.setClasspath(dependencyNotation, Closures.<Dependency>unaryOperator(this, UnaryOperator.identity()));
         }
 
         /// Sets the main class to invoke when running AccessTransformers.

at-gradle/src/main/java/net/minecraftforge/accesstransformers/gradle/AccessTransformersContainerImpl.java

@@ -9,10 +9,13 @@
 import groovy.transform.stc.ClosureParams;
 import groovy.transform.stc.SimpleType;
 import net.minecraftforge.gradleutils.shared.Closures;
+import org.codehaus.groovy.runtime.DefaultGroovyMethods;
 import org.gradle.api.Action;
 import org.gradle.api.PathValidation;
 import org.gradle.api.Project;
 import org.gradle.api.artifacts.Dependency;
+import org.gradle.api.artifacts.ExternalModuleDependencyBundle;
+import org.gradle.api.artifacts.MinimalExternalModuleDependency;
 import org.gradle.api.artifacts.dsl.DependencyHandler;
 import org.gradle.api.artifacts.type.ArtifactTypeDefinition;
 import org.gradle.api.attributes.Attribute;
@@ -31,6 +34,8 @@
 
 import javax.inject.Inject;
 import java.io.File;
+import java.io.Serial;
+import java.util.ArrayList;
 import java.util.Objects;
 
 abstract class AccessTransformersContainerImpl implements AccessTransformersContainerInternal {
@@ -42,6 +47,7 @@ abstract class AccessTransformersContainerImpl implements AccessTransformersCont
     private final OptionsImpl options;
 
     protected abstract @Inject ObjectFactory getObjects();
+    protected abstract @Inject ProviderFactory getProviders();
 
     @Inject
     public AccessTransformersContainerImpl(
@@ -107,20 +113,56 @@ public void options(Action<? super AccessTransformersContainer.Options> action)
     }
 
     @Override
-    @SuppressWarnings("rawtypes") // public-facing closure
+    @SuppressWarnings("rawtypes")
     public Dependency dep(
         Object dependencyNotation,
         @DelegatesTo(Dependency.class)
         @ClosureParams(value = SimpleType.class, options = "org.gradle.api.artifacts.Dependency")
         Closure closure
     ) {
-        var dependency = project.getDependencies().create(dependencyNotation, closure);
-        if (dependency instanceof HasConfigurableAttributes<?>) {
-            ((HasConfigurableAttributes<?>) dependency).attributes(a -> a.attribute(this.attribute, true));
+        return this.project.getDependencies().create(dependencyNotation, closure.compose(Closures.<Dependency>unaryOperator(dependency -> {
+            if (dependency instanceof HasConfigurableAttributes<?> d) {
+                d.attributes(a -> a.attribute(this.attribute, true));
+            } else {
+                this.problems.reportIllegalTargetDependency(dependency);
+            }
+
+            return dependency;
+        })));
+    }
+
+    @Override
+    @SuppressWarnings("rawtypes")
+    public Provider<?> dep(
+        Provider<?> dependencyNotation,
+        @DelegatesTo(Dependency.class)
+        @ClosureParams(value = SimpleType.class, options = "org.gradle.api.artifacts.Dependency")
+        Closure closure
+    ) {
+        if (dependencyNotation.isPresent() && dependencyNotation.get() instanceof ExternalModuleDependencyBundle bundle) {
+            // this provider MUST return ExternalModuleDependencyBundle
+            // The only way to coerce the type of it is to use a property, since we can set the type manually on creation.
+            // ProviderInternal#getType uses the generic argument to determine what type it is.
+            // Provider#map and #flatMap do NOT preserve the resultant type, which fucks with adding bundles to configurations.
+            return this.getObjects().property(ExternalModuleDependencyBundle.class).value(this.getProviders().provider(
+                () -> DefaultGroovyMethods.collect(
+                    bundle,
+                    new MappedExternalModuleDependencyBundle(),
+                    Closures.unaryOperator(d -> (MinimalExternalModuleDependency) this.dep(d, closure))
+                )
+            ));
         } else {
-            this.problems.reportIllegalTargetDependency(dependency);
+            // Rationale: single dependencies may have additional data that must be calculated at configuration time
+            // The most obvious example being usage of DependencyHandler#variantOf.
+            // If the dependency isn't created immediately, that information is lost when copying the base dependency (i don't know why)
+            // It's a rather negligible performance hit and FG6 was already doing this anyway, so it's not a big deal.
+            // Still going to return a Provider<?> though, since we also handle bundles in this method
+            return this.getObjects().property(Dependency.class).value(dependencyNotation.map(d -> this.dep(d, closure)));
         }
-        return dependency;
+    }
+
+    private static class MappedExternalModuleDependencyBundle extends ArrayList<MinimalExternalModuleDependency> implements ExternalModuleDependencyBundle {
+        private static final @Serial long serialVersionUID = -5641567719847374245L;
     }
 
     static abstract class OptionsImpl implements AccessTransformersContainerInternal.Options {

at-gradle/src/main/java/net/minecraftforge/accesstransformers/gradle/AccessTransformersExtensionImpl.java

@@ -12,6 +12,7 @@
 import org.gradle.api.Project;
 import org.gradle.api.artifacts.Dependency;
 import org.gradle.api.attributes.Attribute;
+import org.gradle.api.provider.Provider;
 import org.jetbrains.annotations.Nullable;
 
 import javax.inject.Inject;
@@ -63,4 +64,15 @@ public Dependency dep(
     ) {
         return this.getContainer().dep(dependencyNotation, closure);
     }
+
+    @Override
+    @SuppressWarnings("rawtypes") // public-facing closure
+    public Provider<?> dep(
+        Provider<?> dependencyNotation,
+        @DelegatesTo(Dependency.class)
+        @ClosureParams(value = SimpleType.class, options = "org.gradle.api.artifacts.Dependency")
+        Closure closure
+    ) {
+        return this.getContainer().dep(dependencyNotation, closure);
+    }
 }

at-gradle/src/main/java/net/minecraftforge/accesstransformers/gradle/Constants.java

@@ -4,17 +4,15 @@
  */
 package net.minecraftforge.accesstransformers.gradle;
 
-import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 
 final class Constants {
     private Constants() { }
 
-    static final List<String> AT_DEFAULT_ARGS = Collections.unmodifiableList(Arrays.asList(
+    static final List<String> AT_DEFAULT_ARGS = List.of(
         "--inJar", "{inJar}",
         "--atFile", "{atFile}",
         "--outJar", "{outJar}",
         "--logFile", "{logFile}"
-    ));
+    );
 }