Allow updating/replacing the classpath of ToolExecBase tasks

Author: Jonathing

gradleutils-shared/src/main/java/net/minecraftforge/gradleutils/shared/ToolExecBase.java

@@ -7,6 +7,8 @@
 import org.codehaus.groovy.runtime.DefaultGroovyMethods;
 import org.gradle.api.DefaultTask;
 import org.gradle.api.Transformer;
+import org.gradle.api.artifacts.Dependency;
+import org.gradle.api.artifacts.dsl.DependencyFactory;
 import org.gradle.api.file.ConfigurableFileCollection;
 import org.gradle.api.file.DirectoryProperty;
 import org.gradle.api.file.FileSystemLocation;
@@ -19,6 +21,7 @@
 import org.gradle.api.provider.ListProperty;
 import org.gradle.api.provider.Property;
 import org.gradle.api.provider.Provider;
+import org.gradle.api.provider.ProviderConvertible;
 import org.gradle.api.provider.ProviderFactory;
 import org.gradle.api.tasks.Classpath;
 import org.gradle.api.tasks.Console;
@@ -30,6 +33,7 @@
 import org.gradle.api.tasks.Optional;
 import org.gradle.api.tasks.OutputFile;
 import org.gradle.api.tasks.TaskAction;
+import org.gradle.internal.logging.StandardOutputCapture;
 import org.gradle.jvm.toolchain.JavaLanguageVersion;
 import org.gradle.jvm.toolchain.JavaLauncher;
 import org.gradle.jvm.toolchain.JavaToolchainService;
@@ -75,11 +79,11 @@ public abstract class ToolExecBase<P extends EnhancedProblems> extends DefaultTa
     }
 
     //region JavaExec
-    protected abstract @InputFiles @Classpath ConfigurableFileCollection getClasspath();
+    public abstract @InputFiles @Classpath ConfigurableFileCollection getClasspath();
 
-    protected abstract @Input @Optional Property<String> getMainClass();
+    public abstract @Input @Optional Property<String> getMainClass();
 
-    protected abstract @Nested Property<JavaLauncher> getJavaLauncher();
+    public abstract @Nested Property<JavaLauncher> getJavaLauncher();
 
     protected abstract @Nested Property<JavaLauncher> getToolchainLauncher();
 
@@ -107,6 +111,8 @@ public abstract class ToolExecBase<P extends EnhancedProblems> extends DefaultTa
 
     protected abstract @Inject ExecOperations getExecOperations();
 
+    protected abstract @Inject DependencyFactory getDependencies();
+
     protected abstract @Inject JavaToolchainService getJavaToolchains();
 
     /// Creates a new task instance using the given types and tool information.
@@ -141,6 +147,26 @@ protected ToolExecBase(Tool tool) {
         this.getLogFile().convention(this.getDefaultLogFile());
     }
 
+    public final void using(CharSequence dependency) {
+        this.using(getDependencies().create(dependency));
+    }
+
+    public final void using(Provider<? extends Dependency> dependency) {
+        this.getClasspath().setFrom(
+            getProject().getConfigurations().detachedConfiguration().withDependencies(d -> d.addLater(dependency))
+        );
+    }
+
+    public final void using(ProviderConvertible<? extends Dependency> dependency) {
+        this.using(dependency.asProvider());
+    }
+
+    public final void using(Dependency dependency) {
+        this.getClasspath().setFrom(
+            getProject().getConfigurations().detachedConfiguration(dependency)
+        );
+    }
+
     /// The enhanced problems instance to use for this task.
     ///
     /// @return The enhanced problems