Replace getProject() invocations with ObjectFactory and FileSystemOperations where it was easy to do so.

Author: nedtwigg

plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessApply.java

@@ -29,7 +29,7 @@ public abstract class SpotlessApply extends SpotlessTaskService.ClientTask {
 	@TaskAction
 	public void performAction() {
 		getTaskService().get().registerApplyAlreadyRan(this);
-		ConfigurableFileTree files = getProject().fileTree(getSpotlessOutDirectory().get());
+		ConfigurableFileTree files = getConfigCacheWorkaround().fileTree().from(getSpotlessOutDirectory().get());
 		if (files.isEmpty()) {
 			getState().setDidWork(sourceDidWork());
 		} else {

plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessCheck.java

@@ -50,7 +50,7 @@ public void performAction() throws IOException {
 	}
 
 	private void performAction(boolean isTest) throws IOException {
-		ConfigurableFileTree files = getProject().fileTree(getSpotlessOutDirectory().get());
+		ConfigurableFileTree files = getConfigCacheWorkaround().fileTree().from(getSpotlessOutDirectory().get());
 		if (files.isEmpty()) {
 			getState().setDidWork(sourceDidWork());
 		} else if (!isTest && applyHasRun()) {

plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTaskImpl.java

@@ -20,9 +20,11 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardCopyOption;
-import java.util.Comparator;
+
+import javax.inject.Inject;
 
 import org.gradle.api.GradleException;
+import org.gradle.api.file.FileSystemOperations;
 import org.gradle.api.provider.Property;
 import org.gradle.api.tasks.CacheableTask;
 import org.gradle.api.tasks.Internal;
@@ -40,6 +42,9 @@ public abstract class SpotlessTaskImpl extends SpotlessTask {
 	@Internal
 	abstract Property<SpotlessTaskService> getTaskService();
 
+	@Inject
+	protected abstract FileSystemOperations getFs();
+
 	@TaskAction
 	public void performAction(InputChanges inputs) throws Exception {
 		getTaskService().get().registerSourceAlreadyRan(this);
@@ -49,7 +54,7 @@ public void performAction(InputChanges inputs) throws Exception {
 
 		if (!inputs.isIncremental()) {
 			getLogger().info("Not incremental: removing prior outputs");
-			getProject().delete(outputDirectory);
+			getFs().delete(d -> d.delete(outputDirectory));
 			Files.createDirectories(outputDirectory.toPath());
 		}
 
@@ -96,10 +101,7 @@ private void processInputFile(Formatter formatter, File input) throws IOExceptio
 	private void deletePreviousResult(File input) throws IOException {
 		File output = getOutputFile(input);
 		if (output.isDirectory()) {
-			Files.walk(output.toPath())
-					.sorted(Comparator.reverseOrder())
-					.map(Path::toFile)
-					.forEach(File::delete);
+			getFs().delete(d -> d.delete(output));
 		} else {
 			Files.deleteIfExists(output.toPath());
 		}

plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTaskService.java

@@ -20,7 +20,10 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import javax.inject.Inject;
+
 import org.gradle.api.DefaultTask;
+import org.gradle.api.model.ObjectFactory;
 import org.gradle.api.provider.Property;
 import org.gradle.api.services.BuildService;
 import org.gradle.api.services.BuildServiceParameters;
@@ -49,13 +52,16 @@ public void registerApplyAlreadyRan(SpotlessApply task) {
 
 	static String INDEPENDENT_HELPER = "Helper";
 
-	public static abstract class ClientTask extends DefaultTask {
+	static abstract class ClientTask extends DefaultTask {
 		@Internal
 		abstract Property<File> getSpotlessOutDirectory();
 
 		@Internal
 		abstract Property<SpotlessTaskService> getTaskService();
 
+		@Inject
+		protected abstract ObjectFactory getConfigCacheWorkaround();
+
 		String sourceTaskPath() {
 			String path = getPath();
 			if (this instanceof SpotlessApply) {