Skip to content

Commit 7c30b41

Browse files
committed
Rename DependencyFactory service to avoid method name clashes
1 parent 8d865a8 commit 7c30b41

File tree

1 file changed

+2
-5
lines changed
  • gradleutils-shared/src/main/java/net/minecraftforge/gradleutils/shared

1 file changed

+2
-5
lines changed

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,7 @@
3131
import org.gradle.api.tasks.JavaExec;
3232
import org.gradle.api.tasks.Nested;
3333
import org.gradle.api.tasks.Optional;
34-
import org.gradle.api.tasks.OutputFile;
3534
import org.gradle.api.tasks.TaskAction;
36-
import org.gradle.internal.logging.StandardOutputCapture;
3735
import org.gradle.jvm.toolchain.JavaLanguageVersion;
3836
import org.gradle.jvm.toolchain.JavaLauncher;
3937
import org.gradle.jvm.toolchain.JavaToolchainService;
@@ -54,7 +52,6 @@
5452
import java.util.Locale;
5553
import java.util.Map;
5654
import java.util.concurrent.Callable;
57-
import java.util.stream.Collectors;
5855

5956
/// This tool execution task is a template on top of [JavaExec] to make executing [tools][Tool] much easier and more
6057
/// consistent between plugins.
@@ -111,7 +108,7 @@ public abstract class ToolExecBase<P extends EnhancedProblems> extends DefaultTa
111108

112109
protected abstract @Inject ExecOperations getExecOperations();
113110

114-
protected abstract @Inject DependencyFactory getDependencies();
111+
protected abstract @Inject DependencyFactory getDependencyFactory();
115112

116113
protected abstract @Inject JavaToolchainService getJavaToolchains();
117114

@@ -148,7 +145,7 @@ protected ToolExecBase(Tool tool) {
148145
}
149146

150147
public final void using(CharSequence dependency) {
151-
this.using(getDependencies().create(dependency));
148+
this.using(getDependencyFactory().create(dependency));
152149
}
153150

154151
public final void using(Provider<? extends Dependency> dependency) {

0 commit comments

Comments
 (0)