Merge branch 'main' into add-buf-format

Author: nedtwigg

plugin-gradle/CHANGES.md

@@ -4,7 +4,9 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 ### Added
-* Added support for Protobuf formatting based on [Buf](https://buf.build/) (#1208).
+* Added support for Protobuf formatting based on [Buf](https://buf.build/) ([#1208](https://github.com/diffplug/spotless/pull/1208)).
+### Fixed
+* More daemon memory consumption fixes ([#1206](https://github.com/diffplug/spotless/pull/1198) fixes [#1194](https://github.com/diffplug/spotless/issues/1194))
 
 ## [6.6.0] - 2022-05-10
 ### Added

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

@@ -54,11 +54,10 @@ static class LiveCacheKeyImpl<T> implements LiveCache<T>, Serializable {
 
 		@Override
 		public void set(T value) {
-			if (value instanceof LazyForwardingEquality) {
-				// whenever we cache an instance of LazyForwardingEquality, we want to make sure that we give it
-				// a chance to null-out its initialization lambda (see https://github.com/diffplug/spotless/issues/1194#issuecomment-1120744842)
-				LazyForwardingEquality.unlazy((LazyForwardingEquality<?>) value);
-			}
+
+			// whenever we cache an instance of LazyForwardingEquality, we want to make sure that we give it
+			// a chance to null-out its initialization lambda (see https://github.com/diffplug/spotless/issues/1194#issuecomment-1120744842)
+			LazyForwardingEquality.unlazy(value);
 			daemonState.put(internalKey, value);
 		}
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 DiffPlug
+ * Copyright 2021-2022 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,6 +21,8 @@
 import org.gradle.api.Action;
 import org.gradle.api.Project;
 
+import com.diffplug.spotless.LazyForwardingEquality;
+
 public class SpotlessExtensionPredeclare extends SpotlessExtension {
 	private final SortedMap<String, FormatExtension> toSetup = new TreeMap<>();
 
@@ -33,6 +35,8 @@ public SpotlessExtensionPredeclare(Project project, GradleProvisioner.Policy pol
 					lazyAction.execute(formatExtension);
 				}
 				getRegisterDependenciesTask().steps.addAll(formatExtension.steps);
+				// needed to fix Deemon memory leaks (#1194), but this line came from https://github.com/diffplug/spotless/pull/1206
+				LazyForwardingEquality.unlazy(getRegisterDependenciesTask().steps);
 			});
 		});
 	}