It's hard to turn off JvmLocalCache, and there isn't a good reason to, so we don't have any need for the SpotlessSetup plugin anymore.

Author: nedtwigg

plugin-gradle/build.gradle

@@ -45,12 +45,6 @@ gradlePlugin {
 			displayName = 'Spotless formatting plugin'
 			description = project.description
 		}
-		spotlessSetupPlugin {
-			id = 'com.diffplug.spotless-setup'
-			implementationClass = 'com.diffplug.gradle.spotless.SpotlessSetupPlugin'
-			displayName = 'Spotless formatting plugin setup'
-			description = project.description
-		}
 		spotlessPluginLegacy {
 			id = 'com.diffplug.gradle.spotless'
 			implementationClass = 'com.diffplug.gradle.spotless.SpotlessPluginRedirect'
@@ -84,9 +78,6 @@ if (version.endsWith('-SNAPSHOT')) {
 			'clang-format'
 		]
 		plugins {
-			spotlessSetupPlugin {
-				id = 'com.diffplug.spotless-setup'
-			}
 			spotlessPlugin {
 				id = 'com.diffplug.spotless'
 			}

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

@@ -20,7 +20,6 @@
 import org.gradle.api.DefaultTask;
 import org.gradle.api.provider.Property;
 import org.gradle.api.services.BuildServiceRegistry;
-import org.gradle.api.tasks.Input;
 import org.gradle.api.tasks.Internal;
 import org.gradle.api.tasks.TaskAction;
 import org.gradle.build.event.BuildEventsListenerRegistry;
@@ -59,16 +58,9 @@ void setup() {
 		getBuildEventsListenerRegistry().onTaskCompletion(getTaskService());
 	}
 
-	boolean jvmLocalCache;
-
-	@Input
-	public boolean getJvmLocalCache() {
-		return jvmLocalCache;
-	}
-
 	@TaskAction
 	public void trivialFunction() {
-		getTaskService().get().registerDependenciesTask(this);
+		// nothing to do :)
 	}
 
 	@Internal

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

@@ -32,13 +32,9 @@ protected GradleRunner gradleRunner() throws IOException {
 	public void gjf() throws IOException {
 		setFile("build.gradle").toLines(
 				"plugins {",
-				"    id 'com.diffplug.spotless-setup'",
 				"    id 'com.diffplug.spotless'",
 				"}",
 				"repositories { mavenCentral() }",
-				"spotlessSetup {",
-				"    jvmLocalCache = true",
-				"}",
 				"spotless {",
 				"    java {",
 				"        target file('test.java')",

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

@@ -15,13 +15,8 @@
  */
 package com.diffplug.gradle.spotless;
 
-import java.io.File;
 import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.Comparator;
 
-import org.gradle.testkit.runner.BuildResult;
 import org.gradle.testkit.runner.GradleRunner;
 import org.junit.jupiter.api.Test;
 
@@ -64,43 +59,4 @@ public void helpConfiguresIfTasksAreCreated() throws IOException {
 				"tasks.named('spotlessJavaApply').get()");
 		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");
-
-		// and it will keep failing forever
-		gradleRunner().withArguments("spotlessApply").buildAndFail();
-
-		// until you delete the .gradlle/configuration-cache folder
-		File configCache = new File(super.rootFolder(), ".gradle/configuration-cache");
-		Files.walk(configCache.toPath())
-				.sorted(Comparator.reverseOrder())
-				.map(Path::toFile)
-				.forEach(File::delete);
-
-		// then it will work again (but only once)
-		gradleRunner().withArguments("spotlessApply").build();
-		gradleRunner().withArguments("spotlessApply").buildAndFail();
-	}
 }

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

@@ -63,9 +63,7 @@ void singleProjectExhaustive(int useConfigCache) throws Exception {
 			setFile("build.gradle").toLines(
 					"plugins {",
 					"  id 'com.diffplug.spotless'",
-					"  id 'com.diffplug.spotless-setup'",
 					"}",
-					"spotlessSetup { jvmLocalCache = true }",
 					"spotless {",
 					"  ratchetFrom 'baseline'",
 					"  format 'misc', {",
@@ -150,7 +148,7 @@ private BuildResultAssertion assertFail(String... tasks) throws Exception {
 		return new BuildResultAssertion(gradleRunner().withArguments(tasks).buildAndFail());
 	}
 
-	private static final String BASELINE_ROOT = "71a2671ed452d52625245e5101cbf8467e905865";
+	private static final String BASELINE_ROOT = "fdc3ca3c850cee44d95d32c64cda30afbb29323c";
 	private static final String BASELINE_CLEAN = "65fdd75c1ae00c0646f6487d68c44ddca51f0841";
 	private static final String BASELINE_DIRTY = "4cfc3358ccbf186738b82a60276b1e5306bc3870";
 
@@ -179,10 +177,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 { jvmLocalCache = true }",
-					"apply from: rootProject.file('spotless.gradle') // root");
+			setFile("build.gradle").toContent("apply from: rootProject.file('spotless.gradle') // root");
 			setFile(TEST_PATH).toContent("HELLO");
 			setFile("clean/build.gradle").toContent("apply from: rootProject.file('spotless.gradle') // clean");
 			setFile("clean/" + TEST_PATH).toContent("HELLO");