SpotlessCheck now pipes the actual encoding to the error message rather than just assuming UTF-8.

Author: nedtwigg

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

@@ -18,7 +18,6 @@
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -29,13 +28,18 @@
 import org.gradle.api.file.ConfigurableFileTree;
 import org.gradle.api.file.FileVisitDetails;
 import org.gradle.api.file.FileVisitor;
+import org.gradle.api.provider.Property;
+import org.gradle.api.tasks.Internal;
 import org.gradle.api.tasks.TaskAction;
 
 import com.diffplug.spotless.FileSignature;
 import com.diffplug.spotless.ThrowingEx;
 import com.diffplug.spotless.extra.integration.DiffMessageFormatter;
 
 public abstract class SpotlessCheck extends SpotlessTaskService.ClientTask {
+	@Internal
+	public abstract Property<String> getEncoding();
+
 	public void performActionTest() throws IOException {
 		performAction(true);
 	}
@@ -98,7 +102,7 @@ public void visitFile(FileVisitDetails fileVisitDetails) {
 						.formatterFolder(
 								getProject().getRootDir().toPath(),
 								getSpotlessOutDirectory().get().toPath(),
-								StandardCharsets.UTF_8.name())
+								getEncoding().get())
 						.problemFiles(problemFiles)
 						.getMessage());
 			}

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

@@ -112,8 +112,10 @@ protected void createFormatTasks(String name, FormatExtension formatExtension) {
 		});
 
 		TaskProvider<SpotlessCheck> checkTask = tasks.register(taskName + CHECK, SpotlessCheck.class, task -> {
-			task.getSpotlessOutDirectory().set(spotlessTask.get().getOutputDirectory());
+			SpotlessTask source = spotlessTask.get();
+			task.getSpotlessOutDirectory().set(source.getOutputDirectory());
 			task.getTaskService().set(taskService);
+			task.getEncoding().set(source.getEncoding());
 			task.setEnabled(!isIdeHook);
 			task.dependsOn(spotlessTask);
 

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

@@ -42,7 +42,7 @@
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.LineEnding;
 
-public class SpotlessTask extends DefaultTask {
+public abstract class SpotlessTask extends DefaultTask {
 	// set by SpotlessExtension, but possibly overridden by FormatExtension
 	protected String encoding = "UTF-8";
 

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

@@ -17,6 +17,7 @@
 
 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;
@@ -70,6 +71,7 @@ private SpotlessCheck createCheckTask(String name, SpotlessTask source) {
 			SpotlessCheck task = project.getTasks().create("spotless" + SpotlessPlugin.capitalize(name) + "Check", SpotlessCheck.class);
 			task.getSpotlessOutDirectory().set(source.getOutputDirectory());
 			task.getTaskService().set(taskService);
+			task.getEncoding().set(StandardCharsets.UTF_8.name());
 			return task;
 		}
 

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

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