Make SpotlessTaskService be the AutoCloseable BuildService, and let GitRatchetGradle be a POJO field of the service. Doesn't matter either way for now, but this sets us up for a refactor in the future.

Author: nedtwigg

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

@@ -737,7 +737,7 @@ protected void setupTask(SpotlessTask task) {
 			spotless.getRegisterDependenciesTask().hookSubprojectTask(task);
 		}
 		if (getRatchetFrom() != null) {
-			task.setupRatchet(spotless.getRegisterDependenciesTask().getGitRatchet().get(), getRatchetFrom());
+			task.setupRatchet(getRatchetFrom());
 		}
 	}
 

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

@@ -19,15 +19,10 @@
 
 import javax.annotation.Nullable;
 
-import org.gradle.api.services.BuildService;
-import org.gradle.api.services.BuildServiceParameters;
-import org.gradle.tooling.events.FinishEvent;
-import org.gradle.tooling.events.OperationCompletionListener;
-
 import com.diffplug.spotless.extra.GitRatchet;
 
 /** Gradle implementation of GitRatchet. */
-public abstract class GitRatchetGradle extends GitRatchet<File> implements BuildService<BuildServiceParameters.None>, OperationCompletionListener {
+public class GitRatchetGradle extends GitRatchet<File> {
 	@Override
 	protected File getDir(File project) {
 		return project;
@@ -37,9 +32,4 @@ protected File getDir(File project) {
 	protected @Nullable File getParent(File project) {
 		return project.getParentFile();
 	}
-
-	@Override
-	public void onFinish(FinishEvent finishEvent) {
-		// NOOP
-	}
 }

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

@@ -72,8 +72,7 @@ void setup() {
 
 		BuildServiceRegistry buildServices = getProject().getGradle().getSharedServices();
 		getTaskService().set(buildServices.registerIfAbsent("SpotlessTaskService", SpotlessTaskService.class, spec -> {}));
-		getGitRatchet().set(buildServices.registerIfAbsent("GitRatchetGradle", GitRatchetGradle.class, unused -> {}));
-		getBuildEventsListenerRegistry().onTaskCompletion(getGitRatchet());
+		getBuildEventsListenerRegistry().onTaskCompletion(getTaskService());
 	}
 
 	@TaskAction
@@ -83,10 +82,7 @@ public void trivialFunction() throws IOException {
 	}
 
 	@Internal
-	public abstract Property<SpotlessTaskService> getTaskService();
-
-	@Internal
-	public abstract Property<GitRatchetGradle> getGitRatchet();
+	abstract Property<SpotlessTaskService> getTaskService();
 
 	@Inject
 	protected abstract BuildEventsListenerRegistry getBuildEventsListenerRegistry();

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

@@ -29,6 +29,7 @@
 import org.gradle.api.DefaultTask;
 import org.gradle.api.file.DirectoryProperty;
 import org.gradle.api.file.FileCollection;
+import org.gradle.api.provider.Property;
 import org.gradle.api.tasks.Input;
 import org.gradle.api.tasks.InputFiles;
 import org.gradle.api.tasks.Internal;
@@ -44,6 +45,9 @@
 import com.diffplug.spotless.LineEnding;
 
 public abstract class SpotlessTask extends DefaultTask {
+	@Internal
+	abstract Property<SpotlessTaskService> getTaskService();
+
 	// set by SpotlessExtension, but possibly overridden by FormatExtension
 	protected String encoding = "UTF-8";
 
@@ -79,11 +83,11 @@ public void setLineEndingsPolicy(LineEnding.Policy lineEndingsPolicy) {
 	 */
 	private transient ObjectId subtreeSha = ObjectId.zeroId();
 
-	public void setupRatchet(GitRatchetGradle gitRatchet, String ratchetFrom) {
-		ratchet = gitRatchet;
+	public void setupRatchet(String ratchetFrom) {
+		ratchet = getTaskService().get().getRatchet();
 		File projectDir = getProjectDir().get().getAsFile();
-		rootTreeSha = gitRatchet.rootTreeShaOf(projectDir, ratchetFrom);
-		subtreeSha = gitRatchet.subtreeShaOf(projectDir, rootTreeSha);
+		rootTreeSha = ratchet.rootTreeShaOf(projectDir, ratchetFrom);
+		subtreeSha = ratchet.subtreeShaOf(projectDir, rootTreeSha);
 	}
 
 	@Internal

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

@@ -26,7 +26,6 @@
 import org.gradle.api.GradleException;
 import org.gradle.api.file.DirectoryProperty;
 import org.gradle.api.file.FileSystemOperations;
-import org.gradle.api.provider.Property;
 import org.gradle.api.provider.Provider;
 import org.gradle.api.tasks.CacheableTask;
 import org.gradle.api.tasks.Internal;
@@ -41,9 +40,6 @@
 
 @CacheableTask
 public abstract class SpotlessTaskImpl extends SpotlessTask {
-	@Internal
-	abstract Property<SpotlessTaskService> getTaskService();
-
 	@Internal
 	abstract DirectoryProperty getProjectDir();
 

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

@@ -30,6 +30,8 @@
 import org.gradle.api.services.BuildService;
 import org.gradle.api.services.BuildServiceParameters;
 import org.gradle.api.tasks.Internal;
+import org.gradle.tooling.events.FinishEvent;
+import org.gradle.tooling.events.OperationCompletionListener;
 
 import com.diffplug.common.base.Preconditions;
 import com.diffplug.common.base.Unhandled;
@@ -41,7 +43,7 @@
  * duplicated work (e.g. no need for check to run if
  * apply already did).
  */
-public abstract class SpotlessTaskService implements BuildService<BuildServiceParameters.None> {
+public abstract class SpotlessTaskService implements BuildService<BuildServiceParameters.None>, AutoCloseable, OperationCompletionListener {
 	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<>());
@@ -60,6 +62,24 @@ void registerApplyAlreadyRan(SpotlessApply task) {
 		apply.put(task.sourceTaskPath(), task);
 	}
 
+	// <GitRatchet>
+	private final GitRatchetGradle ratchet = new GitRatchetGradle();
+
+	GitRatchetGradle getRatchet() {
+		return ratchet;
+	}
+
+	@Override
+	public void onFinish(FinishEvent var1) {
+		// NOOP
+	}
+
+	@Override
+	public void close() throws Exception {
+		ratchet.close();
+	}
+	// </GitRatchet>
+
 	static String INDEPENDENT_HELPER = "Helper";
 
 	static abstract class ClientTask extends DefaultTask {