diff --git a/common/src/main/java/net/neoforged/gradle/common/extensions/AccessTransformersExtension.java b/common/src/main/java/net/neoforged/gradle/common/extensions/AccessTransformersExtension.java index 14c197193..114e3b672 100644 --- a/common/src/main/java/net/neoforged/gradle/common/extensions/AccessTransformersExtension.java +++ b/common/src/main/java/net/neoforged/gradle/common/extensions/AccessTransformersExtension.java @@ -6,6 +6,7 @@ import org.gradle.api.Action; import org.gradle.api.Project; import org.gradle.api.artifacts.ConfigurablePublishArtifact; +import org.gradle.api.artifacts.Dependency; import org.gradle.api.artifacts.dsl.ArtifactHandler; import org.gradle.api.artifacts.dsl.DependencyHandler; @@ -24,17 +25,18 @@ public AccessTransformersExtension(Project project) { } @Override - public void consume(Object notation) { - this.projectDependencies.add(CommonProjectPlugin.ACCESS_TRANSFORMER_CONFIGURATION, notation); + public Dependency consume(Object notation) { + return this.projectDependencies.add(CommonProjectPlugin.ACCESS_TRANSFORMER_CONFIGURATION, notation); } @Override - public void consumeApi(Object notation) { - this.projectDependencies.add(CommonProjectPlugin.ACCESS_TRANSFORMER_API_CONFIGURATION, notation); + public Dependency consumeApi(Object notation) { + return this.projectDependencies.add(CommonProjectPlugin.ACCESS_TRANSFORMER_API_CONFIGURATION, notation); } @Override public void expose(Object path, Action action) { + file(path); projectArtifacts.add(CommonProjectPlugin.ACCESS_TRANSFORMER_ELEMENTS_CONFIGURATION, path, action); } @@ -42,4 +44,9 @@ public void expose(Object path, Action action) { public void expose(Object path) { expose(path, artifacts -> {}); } + + @Override + public void expose(Dependency dependency) { + projectDependencies.add(CommonProjectPlugin.ACCESS_TRANSFORMER_API_CONFIGURATION, dependency); + } } diff --git a/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/extensions/AccessTransformers.groovy b/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/extensions/AccessTransformers.groovy index 9755451aa..67065a1bf 100644 --- a/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/extensions/AccessTransformers.groovy +++ b/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/extensions/AccessTransformers.groovy @@ -4,6 +4,7 @@ import groovy.transform.CompileStatic import net.minecraftforge.gdi.BaseDSLElementWithFilesAndEntries import org.gradle.api.Action import org.gradle.api.artifacts.ConfigurablePublishArtifact +import org.gradle.api.artifacts.Dependency import org.gradle.api.artifacts.dsl.DependencyCollector /** @@ -11,9 +12,11 @@ import org.gradle.api.artifacts.dsl.DependencyCollector */ @CompileStatic interface AccessTransformers extends BaseDSLElementWithFilesAndEntries { - void consume(Object notation) + Dependency consume(Object notation) - void consumeApi(Object notation) + Dependency consumeApi(Object notation) + + void expose(Dependency dependency) void expose(Object path)