enableConfigCacheDaemonLocal is too long, jvmLocalCache is better.

Author: nedtwigg

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

@@ -41,16 +41,13 @@ public abstract class RegisterDependenciesTask extends DefaultTask {
 	static final String TASK_NAME = "spotlessInternalRegisterDependencies";
 
 	void hookSubprojectTask(SpotlessTask task) {
-		// TODO: in the future, we might use this hook to add an optional perf improvement
-		// spotlessRoot {
+		// TODO: in the future, we might use this hook to implement #984
+		// spotlessSetup {
 		//    java { googleJavaFormat('1.2') }
 		//    ...etc
 		// }
-		// The point would be to reuse configurations from the root project,
-		// with the restriction that you have to declare every formatter in
-		// the root, and you'd get an error if you used a formatter somewhere
-		// which you didn't declare in the root. That's a problem for the future
-		// though, not today!
+		// it's also needed to make sure that jvmLocalCache gets set
+		// in the SpotlessTaskService before any spotless tasks run
 		task.dependsOn(this);
 	}
 
@@ -62,11 +59,11 @@ void setup() {
 		getBuildEventsListenerRegistry().onTaskCompletion(getTaskService());
 	}
 
-	boolean enableConfigCacheDaemonLocal;
+	boolean jvmLocalCache;
 
 	@Input
-	public boolean getEnableConfigCacheDaemonLocal() {
-		return enableConfigCacheDaemonLocal;
+	public boolean getJvmLocalCache() {
+		return jvmLocalCache;
 	}
 
 	@TaskAction

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

@@ -27,11 +27,11 @@ public SpotlessSetup(Project project) {
 		task = (TaskProvider<RegisterDependenciesTask>) (Object) project.getTasks().named(RegisterDependenciesTask.TASK_NAME);
 	}
 
-	public boolean isEnableConfigCacheDaemonLocal() {
-		return task.get().getEnableConfigCacheDaemonLocal();
+	public boolean isJvmLocalCache() {
+		return task.get().getJvmLocalCache();
 	}
 
-	public boolean setEnableConfigCacheDaemonLocal(boolean enabled) {
-		return task.get().enableConfigCacheDaemonLocal = enabled;
+	public boolean setJvmLocalCache(boolean enabled) {
+		return task.get().jvmLocalCache = enabled;
 	}
 }

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

@@ -50,7 +50,7 @@ public abstract class SpotlessTaskService implements BuildService<BuildServicePa
 	private Map<String, Provisioner> provisioner = Collections.synchronizedMap(new HashMap<>());
 
 	void registerDependenciesTask(RegisterDependenciesTask task) {
-		enableConfigCacheDaemonLocal = task.getEnableConfigCacheDaemonLocal();
+		enableConfigCacheDaemonLocal = task.getJvmLocalCache();
 	}
 
 	void registerSourceAlreadyRan(SpotlessTask task) {

plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ConfigurationCacheDaemonLocalTest.java renamed to plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ConfigurationCacheJvmLocalTest.java

@@ -21,7 +21,7 @@
 import org.gradle.testkit.runner.GradleRunner;
 import org.junit.jupiter.api.Test;
 
-public class ConfigurationCacheDaemonLocalTest extends GradleIntegrationHarness {
+public class ConfigurationCacheJvmLocalTest extends GradleIntegrationHarness {
 	@Override
 	protected GradleRunner gradleRunner() throws IOException {
 		setFile("gradle.properties").toContent("org.gradle.unsafe.configuration-cache=true");
@@ -37,7 +37,7 @@ public void gjf() throws IOException {
 				"}",
 				"repositories { mavenCentral() }",
 				"spotlessSetup {",
-				"    enableConfigCacheDaemonLocal = true",
+				"    jvmLocalCache = true",
 				"}",
 				"spotless {",
 				"    java {",

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

@@ -65,7 +65,7 @@ void singleProjectExhaustive(int useConfigCache) throws Exception {
 					"  id 'com.diffplug.spotless'",
 					"  id 'com.diffplug.spotless-setup'",
 					"}",
-					"spotlessSetup { enableConfigCacheDaemonLocal = true }",
+					"spotlessSetup { jvmLocalCache = true }",
 					"spotless {",
 					"  ratchetFrom 'baseline'",
 					"  format 'misc', {",
@@ -150,7 +150,7 @@ private BuildResultAssertion assertFail(String... tasks) throws Exception {
 		return new BuildResultAssertion(gradleRunner().withArguments(tasks).buildAndFail());
 	}
 
-	private static final String BASELINE_ROOT = "a5efb43a0da929853e596a85c1f225a60ae0acfd";
+	private static final String BASELINE_ROOT = "71a2671ed452d52625245e5101cbf8467e905865";
 	private static final String BASELINE_CLEAN = "65fdd75c1ae00c0646f6487d68c44ddca51f0841";
 	private static final String BASELINE_DIRTY = "4cfc3358ccbf186738b82a60276b1e5306bc3870";
 
@@ -181,7 +181,7 @@ void multiProject(int useConfigCache) throws Exception {
 			setFile(".gitignore").toContent("build/\n.gradle\n*.properties\n");
 			setFile("build.gradle").toLines(
 					"apply plugin: 'com.diffplug.spotless-setup'",
-					"spotlessSetup { enableConfigCacheDaemonLocal = true }",
+					"spotlessSetup { jvmLocalCache = true }",
 					"apply from: rootProject.file('spotless.gradle') // root");
 			setFile(TEST_PATH).toContent("HELLO");
 			setFile("clean/build.gradle").toContent("apply from: rootProject.file('spotless.gradle') // clean");