We now fail-fast if the user tries to use configuration-cache.

Author: nedtwigg

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

@@ -50,6 +50,7 @@ public abstract class SpotlessTaskImpl extends SpotlessTask {
 	void init(Provider<SpotlessTaskService> service) {
 		getTaskService().set(service);
 		getProjectDir().set(getProject().getProjectDir());
+		service.get().registerSourceCreated(this);
 	}
 
 	@Inject
@@ -68,17 +69,21 @@ public void performAction(InputChanges inputs) throws Exception {
 			Files.createDirectories(outputDirectory.toPath());
 		}
 
-		try (Formatter formatter = buildFormatter()) {
-			for (FileChange fileChange : inputs.getFileChanges(target)) {
-				File input = fileChange.getFile();
-				if (fileChange.getChangeType() == ChangeType.REMOVED) {
-					deletePreviousResult(input);
-				} else {
-					if (input.isFile()) {
-						processInputFile(formatter, input);
+		if (getTaskService().get().sourceWasCreatedThisBuild(this)) {
+			try (Formatter formatter = buildFormatter()) {
+				for (FileChange fileChange : inputs.getFileChanges(target)) {
+					File input = fileChange.getFile();
+					if (fileChange.getChangeType() == ChangeType.REMOVED) {
+						deletePreviousResult(input);
+					} else {
+						if (input.isFile()) {
+							processInputFile(formatter, input);
+						}
 					}
 				}
 			}
+		} else {
+			throw new GradleException("Spotless doesn't support configuration cache yet");
 		}
 	}
 

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

@@ -42,21 +42,30 @@
  * apply already did).
  */
 public abstract class SpotlessTaskService implements BuildService<BuildServiceParameters.None> {
+	private final Map<String, SpotlessTask> sourceCreated = Collections.synchronizedMap(new HashMap<>());
 	private final Map<String, SpotlessApply> apply = Collections.synchronizedMap(new HashMap<>());
 	private final Map<String, SpotlessTask> source = Collections.synchronizedMap(new HashMap<>());
 	private final Map<String, Provisioner> provisioner = Collections.synchronizedMap(new HashMap<>());
 
-	public Provisioner provisionerFor(Project project) {
+	Provisioner provisionerFor(Project project) {
 		return provisioner.computeIfAbsent(project.getPath(), unused -> {
 			return GradleProvisioner.newDedupingProvisioner(project);
 		});
 	}
 
-	public void registerSourceAlreadyRan(SpotlessTask task) {
+	void registerSourceCreated(SpotlessTask spotlessTask) {
+		sourceCreated.put(spotlessTask.getPath(), spotlessTask);
+	}
+
+	boolean sourceWasCreatedThisBuild(SpotlessTask spotlessTask) {
+		return sourceCreated.containsKey(spotlessTask.getPath());
+	}
+
+	void registerSourceAlreadyRan(SpotlessTask task) {
 		source.put(task.getPath(), task);
 	}
 
-	public void registerApplyAlreadyRan(SpotlessApply task) {
+	void registerApplyAlreadyRan(SpotlessApply task) {
 		apply.put(task.sourceTaskPath(), task);
 	}
 

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

@@ -16,22 +16,16 @@
 package com.diffplug.gradle.spotless;
 
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
 
+import org.gradle.testkit.runner.BuildResult;
+import org.gradle.testkit.runner.GradleRunner;
 import org.junit.jupiter.api.Test;
 
 public class ConfigurationCacheTest extends GradleIntegrationHarness {
-	protected void runTasks(String... tasks) throws IOException {
+	@Override
+	protected GradleRunner gradleRunner() throws IOException {
 		setFile("gradle.properties").toContent("org.gradle.unsafe.configuration-cache=true");
-		List<String> args = new ArrayList<>();
-		args.addAll(Arrays.asList(tasks));
-		gradleRunner()
-				.withGradleVersion(GradleVersionSupport.CONFIGURATION_CACHE.version)
-				.withArguments(args)
-				.forwardOutput()
-				.build();
+		return super.gradleRunner().withGradleVersion(GradleVersionSupport.CONFIGURATION_CACHE.version);
 	}
 
 	@Test
@@ -47,7 +41,7 @@ public void helpConfigures() throws IOException {
 				"        googleJavaFormat('1.2')",
 				"    }",
 				"}");
-		runTasks("help");
+		gradleRunner().withArguments("help").build();
 	}
 
 	@Test
@@ -64,6 +58,31 @@ public void helpConfiguresIfTasksAreCreated() throws IOException {
 				"    }",
 				"}",
 				"tasks.named('spotlessJavaApply').get()");
-		runTasks("help");
+		gradleRunner().withArguments("help").build();
+	}
+
+	@Test
+	public void gjf() throws IOException {
+		setFile("build.gradle").toLines(
+				"plugins {",
+				"    id 'com.diffplug.spotless'",
+				"}",
+				"repositories { mavenCentral() }",
+				"apply plugin: 'java'",
+				"spotless {",
+				"    java {",
+				"        target file('test.java')",
+				"        googleJavaFormat('1.2')",
+				"    }",
+				"}");
+
+		// first run works
+		setFile("test.java").toResource("java/googlejavaformat/JavaCodeUnformatted.test");
+		gradleRunner().withArguments("spotlessApply").build();
+		assertFile("test.java").sameAsResource("java/googlejavaformat/JavaCodeFormatted.test");
+
+		// but the second fails
+		BuildResult failure = gradleRunner().withArguments("spotlessApply").buildAndFail();
+		failure.getOutput().contains("> Spotless doesn't support configuration cache yet");
 	}
 }

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

@@ -83,7 +83,7 @@ void gitAttributes() throws IOException {
 		setFile(".gitattributes").toContent("* text eol=lf");
 	}
 
-	protected final GradleRunner gradleRunner() throws IOException {
+	protected GradleRunner gradleRunner() throws IOException {
 		return GradleRunner.create()
 				.withGradleVersion(GradleVersionSupport.MINIMUM.version)
 				.withProjectDir(rootFolder())