MIscellaneous cleanup.

Author: nedtwigg

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

@@ -116,6 +116,7 @@ public void visitFile(FileVisitDetails fileVisitDetails) {
 	void init(SpotlessTaskImpl impl) {
 		super.init(impl);
 		getProjectPath().set(getProject().getPath());
+		getEncoding().set(impl.getEncoding());
 	}
 
 	private String getTaskPathPrefix() {

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

@@ -112,10 +112,9 @@ protected void createFormatTasks(String name, FormatExtension formatExtension) {
 
 		TaskProvider<SpotlessCheck> checkTask = tasks.register(taskName + CHECK, SpotlessCheck.class, task -> {
 			SpotlessTaskImpl source = spotlessTask.get();
-			task.init(spotlessTask.get());
-			task.getEncoding().set(source.getEncoding());
+			task.init(source);
 			task.setEnabled(!isIdeHook);
-			task.dependsOn(spotlessTask);
+			task.dependsOn(source);
 
 			// if the user runs both, make sure that apply happens first,
 			task.mustRunAfter(applyTask);

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

@@ -42,13 +42,13 @@
 @CacheableTask
 public abstract class SpotlessTaskImpl extends SpotlessTask {
 	@Internal
-	abstract Property<SpotlessTaskService> getTakService();
+	abstract Property<SpotlessTaskService> getTaskService();
 
 	@Internal
 	abstract DirectoryProperty getProjectDir();
 
 	void init(Provider<SpotlessTaskService> service) {
-		getTakService().set(service);
+		getTaskService().set(service);
 		getProjectDir().set(getProject().getProjectDir());
 	}
 
@@ -57,7 +57,7 @@ void init(Provider<SpotlessTaskService> service) {
 
 	@TaskAction
 	public void performAction(InputChanges inputs) throws Exception {
-		getTakService().get().registerSourceAlreadyRan(this);
+		getTaskService().get().registerSourceAlreadyRan(this);
 		if (target == null) {
 			throw new GradleException("You must specify 'Iterable<File> target'");
 		}
@@ -122,7 +122,7 @@ private File getOutputFile(File input) {
 		String outputFileName = FormatExtension.relativize(projectDir, input);
 		if (outputFileName == null) {
 			throw new IllegalArgumentException(StringPrinter.buildString(printer -> {
-				printer.println("Spotless error! All target files must be within the project root.");
+				printer.println("Spotless error! All target files must be within the project dir.");
 				printer.println("  project dir: " + projectDir.getAbsolutePath());
 				printer.println("       target: " + input.getAbsolutePath());
 			}));

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

@@ -68,7 +68,7 @@ static abstract class ClientTask extends DefaultTask {
 
 		void init(SpotlessTaskImpl impl) {
 			getSpotlessOutDirectory().set(impl.getOutputDirectory());
-			getTaskService().set(impl.getTakService());
+			getTaskService().set(impl.getTaskService());
 			getProjectDir().set(impl.getProjectDir());
 		}
 

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

@@ -17,7 +17,6 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -71,7 +70,6 @@ private SpotlessTaskImpl createFormatTask(String name) {
 		private SpotlessCheck createCheckTask(String name, SpotlessTaskImpl source) {
 			SpotlessCheck task = project.getTasks().create("spotless" + SpotlessPlugin.capitalize(name) + "Check", SpotlessCheck.class);
 			task.init(source);
-			task.getEncoding().set(StandardCharsets.UTF_8.name());
 			return task;
 		}
 

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

@@ -26,7 +26,6 @@
 
 import org.assertj.core.api.AbstractStringAssert;
 import org.assertj.core.api.Assertions;
-import org.gradle.testkit.runner.BuildResult;
 import org.junit.jupiter.api.Test;
 
 import com.diffplug.common.base.Errors;
@@ -137,8 +136,7 @@ private String taskRanAgainst(String task, String... ranAgainst) throws IOExcept
 		String console = StringPrinter.buildString(Errors.rethrow().wrap(printer -> {
 			boolean expectFailure = task.equals("spotlessCheck") && !isClean();
 			if (expectFailure) {
-				BuildResult b = gradleRunner().withArguments(task, "--stacktrace").forwardStdOutput(printer.toWriter()).forwardStdError(printer.toWriter()).buildAndFail();
-				//				System.err.println(b.getOutput());
+				gradleRunner().withArguments(task).forwardStdOutput(printer.toWriter()).forwardStdError(printer.toWriter()).buildAndFail();
 			} else {
 				gradleRunner().withArguments(task).forwardStdOutput(printer.toWriter()).build();
 			}

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

@@ -19,7 +19,6 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.Collections;
 
@@ -75,7 +74,6 @@ private SpotlessTaskImpl createFormatTask(String name, FormatterStep step) {
 		private SpotlessCheck createCheckTask(String name, SpotlessTaskImpl source) {
 			SpotlessCheck task = project.getTasks().create("spotless" + SpotlessPlugin.capitalize(name) + "Check", SpotlessCheck.class);
 			task.init(source);
-			task.getEncoding().set(StandardCharsets.UTF_8.name());
 			return task;
 		}