Add SpotlessTaskImpl.init to simplify that task as well.

Author: nedtwigg

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

@@ -763,7 +763,7 @@ public SpotlessApply createIndependentApplyTask(String taskName) {
 		Preconditions.checkArgument(!taskName.endsWith(SpotlessExtension.APPLY), "Task name must not end with " + SpotlessExtension.APPLY);
 		// create and setup the task
 		SpotlessTaskImpl spotlessTask = spotless.project.getTasks().create(taskName + SpotlessTaskService.INDEPENDENT_HELPER, SpotlessTaskImpl.class);
-		spotlessTask.getTaskService().set(spotless.getTaskService());
+		spotlessTask.init(spotless.getTaskService());
 		setupTask(spotlessTask);
 		// enforce the clean ordering
 		Task clean = spotless.project.getTasks().getByName(BasePlugin.CLEAN_TASK_NAME);

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

@@ -78,7 +78,7 @@ protected void createFormatTasks(String name, FormatExtension formatExtension) {
 		// create the SpotlessTask
 		String taskName = EXTENSION + SpotlessPlugin.capitalize(name);
 		TaskProvider<SpotlessTaskImpl> spotlessTask = tasks.register(taskName, SpotlessTaskImpl.class, task -> {
-			task.getTaskService().set(taskService);
+			task.init(taskService);
 			task.setEnabled(!isIdeHook);
 			// clean removes the SpotlessCache, so we have to run after clean
 			task.mustRunAfter(cleanTask);

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

@@ -24,8 +24,10 @@
 import javax.inject.Inject;
 
 import org.gradle.api.GradleException;
+import org.gradle.api.file.DirectoryProperty;
 import org.gradle.api.file.FileSystemOperations;
 import org.gradle.api.provider.Property;
+import org.gradle.api.provider.Provider;
 import org.gradle.api.tasks.CacheableTask;
 import org.gradle.api.tasks.Internal;
 import org.gradle.api.tasks.TaskAction;
@@ -40,14 +42,22 @@
 @CacheableTask
 public abstract class SpotlessTaskImpl extends SpotlessTask {
 	@Internal
-	abstract Property<SpotlessTaskService> getTaskService();
+	abstract Property<SpotlessTaskService> getTakService();
+
+	@Internal
+	abstract DirectoryProperty getProjectDir();
+
+	void init(Provider<SpotlessTaskService> service) {
+		getTakService().set(service);
+		getProjectDir().set(getProject().getProjectDir());
+	}
 
 	@Inject
 	protected abstract FileSystemOperations getFs();
 
 	@TaskAction
 	public void performAction(InputChanges inputs) throws Exception {
-		getTaskService().get().registerSourceAlreadyRan(this);
+		getTakService().get().registerSourceAlreadyRan(this);
 		if (target == null) {
 			throw new GradleException("You must specify 'Iterable<File> target'");
 		}

plugin-gradle/src/test/java/com/diffplug/gradle/spotless/DiffMessageFormatterTest.java

@@ -26,6 +26,7 @@
 
 import org.assertj.core.api.Assertions;
 import org.gradle.api.Project;
+import org.gradle.api.provider.Provider;
 import org.gradle.api.services.BuildServiceParameters;
 import org.junit.jupiter.api.Test;
 
@@ -41,12 +42,12 @@ class DiffMessageFormatterTest extends ResourceHarness {
 
 	private class Bundle {
 		Project project = TestProvisioner.gradleProject(rootFolder());
-		SpotlessTaskService taskService = new SpotlessTaskService() {
+		Provider<SpotlessTaskService> taskService = GradleIntegrationHarness.providerOf(new SpotlessTaskService() {
 			@Override
 			public BuildServiceParameters.None getParameters() {
 				return null;
 			}
-		};
+		});
 
 		File file;
 		SpotlessTaskImpl task;
@@ -61,7 +62,7 @@ public BuildServiceParameters.None getParameters() {
 
 		private SpotlessTaskImpl createFormatTask(String name) {
 			SpotlessTaskImpl task = project.getTasks().create("spotless" + SpotlessPlugin.capitalize(name), SpotlessTaskImpl.class);
-			task.getTaskService().set(taskService);
+			task.init(taskService);
 			task.setLineEndingsPolicy(LineEnding.UNIX.createPolicy());
 			task.setTarget(Collections.singletonList(file));
 			return task;

plugin-gradle/src/test/java/com/diffplug/gradle/spotless/FormatTaskTest.java

@@ -36,12 +36,12 @@ void createTask() {
 		Project project = TestProvisioner.gradleProject(rootFolder());
 		spotlessTask = project.getTasks().create("spotlessTaskUnderTest", SpotlessTaskImpl.class);
 		spotlessTask.setLineEndingsPolicy(LineEnding.UNIX.createPolicy());
-		spotlessTask.getTaskService().set(new SpotlessTaskService() {
+		spotlessTask.init(GradleIntegrationHarness.providerOf(new SpotlessTaskService() {
 			@Override
 			public BuildServiceParameters.None getParameters() {
 				return null;
 			}
-		});
+		}));
 	}
 
 	@Test

plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GradleIntegrationHarness.java

@@ -24,6 +24,7 @@
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
+import org.gradle.api.provider.Provider;
 import org.gradle.testkit.runner.BuildResult;
 import org.gradle.testkit.runner.BuildTask;
 import org.gradle.testkit.runner.GradleRunner;
@@ -59,6 +60,10 @@ public enum GradleVersionSupport {
 		}
 	}
 
+	public static <T> Provider<T> providerOf(T value) {
+		return org.gradle.api.internal.provider.Providers.of(value);
+	}
+
 	/**
 	 * Each test gets its own temp folder, and we create a gradle
 	 * build there and run it.

plugin-gradle/src/test/java/com/diffplug/gradle/spotless/PaddedCellTaskTest.java

@@ -24,6 +24,7 @@
 import java.util.Collections;
 
 import org.gradle.api.Project;
+import org.gradle.api.provider.Provider;
 import org.gradle.api.services.BuildServiceParameters;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
@@ -40,12 +41,12 @@ class PaddedCellTaskTest extends ResourceHarness {
 	private class Bundle {
 		String name;
 		Project project = TestProvisioner.gradleProject(rootFolder());
-		SpotlessTaskService taskService = new SpotlessTaskService() {
+		Provider<SpotlessTaskService> taskService = GradleIntegrationHarness.providerOf(new SpotlessTaskService() {
 			@Override
 			public BuildServiceParameters.None getParameters() {
 				return null;
 			}
-		};
+		});
 		File file;
 		File outputFile;
 		SpotlessTaskImpl source;
@@ -64,7 +65,7 @@ public BuildServiceParameters.None getParameters() {
 
 		private SpotlessTaskImpl createFormatTask(String name, FormatterStep step) {
 			SpotlessTaskImpl task = project.getTasks().create("spotless" + SpotlessPlugin.capitalize(name), SpotlessTaskImpl.class);
-			task.getTaskService().set(taskService);
+			task.init(taskService);
 			task.addStep(step);
 			task.setLineEndingsPolicy(LineEnding.UNIX.createPolicy());
 			task.setTarget(Collections.singletonList(file));