Merge branch 'main' into renovate/gradle-8.x

Author: nedtwigg

.github/workflows/changelog-print.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     name: changelogPrint
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: jdk 11
         uses: actions/setup-java@v3
         with:

.github/workflows/ci.yml

@@ -20,7 +20,7 @@ jobs:
       buildcachepass: ${{ secrets.BUILDCACHE_PASS }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Install JDK 11
@@ -59,7 +59,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Install JDK ${{ matrix.distribution }} ${{ matrix.java_version }}
         uses: actions/setup-java@v3
         with:

.github/workflows/codeql-analysis.yml

@@ -37,7 +37,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         # We must fetch at least the immediate parents so that if this is
         # a pull request then we can checkout the head.

.github/workflows/deploy.yml

@@ -36,7 +36,7 @@ jobs:
       ORG_GRADLE_PROJECT_gpg_passphrase: ${{ secrets.GPG_PASSPHRASE }}
       ORG_GRADLE_PROJECT_gpg_key64: ${{ secrets.GPG_KEY64 }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: jdk 11
         uses: actions/setup-java@v3
         with:

.github/workflows/gradle-wrapper-validation.yml

@@ -19,5 +19,5 @@ jobs:
     name: "Validation"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: gradle/wrapper-validation-action@v1

CHANGES.md

@@ -10,13 +10,18 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+
+## [2.42.0] - 2023-09-28
 ### Added
-* Add support for biome. The Rome project [was renamed to Biome](https://biomejs.dev/blog/annoucing-biome/).
+* Support for biome. The Rome project [was renamed to Biome](https://biomejs.dev/blog/annoucing-biome/).
   The configuration is still the same, but you should switch to the new `biome` tag / function and adjust
   the version accordingly. ([#1804](https://github.com/diffplug/spotless/issues/1804)).
-* Add support for `google-java-format`'s `skip-javadoc-formatting` option. ([#1793](https://github.com/diffplug/spotless/pull/1793))
+* Support for `google-java-format`'s `skip-javadoc-formatting` option. ([#1793](https://github.com/diffplug/spotless/pull/1793))
+* Support configuration of mirrors for P2 repositories in maven DSL ([#1697](https://github.com/diffplug/spotless/issues/1697)).
+* New line endings mode `GIT_ATTRIBUTES_FAST_ALLSAME`. ([#1838](https://github.com/diffplug/spotless/pull/1838))
 ### Fixed
 * Fix support for plugins when using Prettier version `3.0.0` and newer. ([#1802](https://github.com/diffplug/spotless/pull/1802))
+* Fix configuration cache issue around `external process started '/usr/bin/git --version'`. ([#1806](https://github.com/diffplug/spotless/issues/1806))
 ### Changes
 * Bump default `flexmark` version to latest `0.64.0` -> `0.64.8`. ([#1801](https://github.com/diffplug/spotless/pull/1801))
 * Bump default `ktlint` version to latest `0.50.0` -> `1.0.0`. ([#1808](https://github.com/diffplug/spotless/pull/1808))

lib-extra/src/main/java/com/diffplug/spotless/extra/EquoBasedStepBuilder.java

@@ -15,10 +15,13 @@
  */
 package com.diffplug.spotless.extra;
 
+import static java.util.stream.Collectors.toMap;
+
 import java.io.File;
 import java.io.IOException;
 import java.io.Serializable;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
@@ -76,6 +79,10 @@ public void setP2Mirrors(Map<String, String> p2Mirrors) {
 		this.p2Mirrors = Map.copyOf(p2Mirrors);
 	}
 
+	public void setP2Mirrors(Collection<P2Mirror> p2Mirrors) {
+		this.p2Mirrors = p2Mirrors.stream().collect(toMap(P2Mirror::getPrefix, P2Mirror::getUrl));
+	}
+
 	/** Returns the FormatterStep (whose state will be calculated lazily). */
 	public FormatterStep build() {
 		return FormatterStep.createLazy(formatterName, this::get, stateToFormatter);
@@ -110,7 +117,7 @@ EquoBasedStepBuilder.State get() throws Exception {
 		}
 		var classpath = new ArrayList<File>();
 		var mavenDeps = new ArrayList<String>();
-		mavenDeps.add("dev.equo.ide:solstice:1.3.1");
+		mavenDeps.add("dev.equo.ide:solstice:1.7.3");
 		mavenDeps.add("com.diffplug.durian:durian-swt.os:4.2.0");
 		mavenDeps.addAll(query.getJarsOnMavenCentral());
 		classpath.addAll(mavenProvisioner.provisionWithTransitives(false, mavenDeps));

lib-extra/src/main/java/com/diffplug/spotless/extra/GitAttributesLineEndings.java

@@ -68,6 +68,42 @@ public final class GitAttributesLineEndings {
 	// prevent direct instantiation
 	private GitAttributesLineEndings() {}
 
+	/**
+	 * Creates a line-endings policy which matches {@link #create(File, Supplier)},
+	 * which is much faster at the cost that every file under the policy
+	 * is assumed to have the same line endings as the first file.
+	 */
+	public static LineEnding.Policy createFastAllSame(File projectDir, Supplier<Iterable<File>> toFormat) {
+		return new LazyAllTheSame(projectDir, toFormat);
+	}
+
+	static class LazyAllTheSame extends LazyForwardingEquality<String> implements LineEnding.Policy {
+		private static final long serialVersionUID = 727912266173243664L;
+		transient File projectDir;
+		transient Supplier<Iterable<File>> toFormat;
+
+		public LazyAllTheSame(File projectDir, Supplier<Iterable<File>> toFormat) {
+			this.projectDir = projectDir;
+			this.toFormat = toFormat;
+		}
+
+		@Override
+		protected String calculateState() throws Exception {
+			var files = toFormat.get().iterator();
+			if (files.hasNext()) {
+				Runtime runtime = new RuntimeInit(projectDir).atRuntime();
+				return runtime.getEndingFor(files.next());
+			} else {
+				return LineEnding.UNIX.str();
+			}
+		}
+
+		@Override
+		public String getEndingFor(File file) {
+			return state();
+		}
+	}
+
 	/**
 	 * Creates a line-endings policy whose serialized state is relativized against projectDir,
 	 * at the cost of eagerly evaluating the line-ending state of every target file when the

lib-extra/src/main/java/com/diffplug/spotless/extra/P2Mirror.java

@@ -0,0 +1,33 @@
+/*
+ * Copyright 2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.extra;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+@SuppressFBWarnings("UWF_UNWRITTEN_FIELD")
+public class P2Mirror {
+
+	private String prefix;
+	private String url;
+
+	public String getPrefix() {
+		return prefix;
+	}
+
+	public String getUrl() {
+		return url;
+	}
+}

lib/src/main/java/com/diffplug/spotless/LineEnding.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,11 +19,8 @@
 import java.io.Serializable;
 import java.lang.reflect.Method;
 import java.util.Objects;
-import java.util.function.BiFunction;
 import java.util.function.Supplier;
 
-import javax.annotation.Nullable;
-
 /**
  * Represents the line endings which should be written by the tool.
  */
@@ -37,6 +34,14 @@ public Policy createPolicy() {
 			return super.createPolicy();
 		}
 	},
+	/** Uses the same line endings as Git, and assumes that every single file being formatted will have the same line ending. */
+	GIT_ATTRIBUTES_FAST_ALLSAME {
+		/** .gitattributes is path-specific, so you must use {@link LineEnding#createPolicy(File, Supplier)}. */
+		@Override @Deprecated
+		public Policy createPolicy() {
+			return super.createPolicy();
+		}
+	},
 	/** {@code \n} on unix systems, {@code \r\n} on windows systems. */
 	PLATFORM_NATIVE,
 	/** {@code \r\n} */
@@ -51,33 +56,31 @@ public Policy createPolicy() {
 	public Policy createPolicy(File projectDir, Supplier<Iterable<File>> toFormat) {
 		Objects.requireNonNull(projectDir, "projectDir");
 		Objects.requireNonNull(toFormat, "toFormat");
-		if (this != GIT_ATTRIBUTES) {
-			return createPolicy();
+		String gitAttributesMethod;
+		if (this == GIT_ATTRIBUTES) {
+			gitAttributesMethod = "create";
+		} else if (this == GIT_ATTRIBUTES_FAST_ALLSAME) {
+			gitAttributesMethod = "createFastAllSame";
 		} else {
-			if (gitAttributesPolicyCreator == null) {
-				try {
-					Class<?> clazz = Class.forName("com.diffplug.spotless.extra.GitAttributesLineEndings");
-					Method method = clazz.getMethod("create", File.class, Supplier.class);
-					gitAttributesPolicyCreator = (proj, target) -> ThrowingEx.get(() -> (Policy) method.invoke(null, proj, target));
-				} catch (ClassNotFoundException | NoSuchMethodException | SecurityException e) {
-					throw new IllegalStateException("LineEnding.GIT_ATTRIBUTES requires the spotless-lib-extra library, but it is not on the classpath", e);
-				}
-			}
-			// gitAttributesPolicyCreator will always be nonnull at this point
-			return gitAttributesPolicyCreator.apply(projectDir, toFormat);
+			return createPolicy();
+		}
+		try {
+			Class<?> clazz = Class.forName("com.diffplug.spotless.extra.GitAttributesLineEndings");
+			Method method = clazz.getMethod(gitAttributesMethod, File.class, Supplier.class);
+			return ThrowingEx.get(() -> (Policy) method.invoke(null, projectDir, toFormat));
+		} catch (ClassNotFoundException | NoSuchMethodException | SecurityException e) {
+			throw new IllegalStateException("LineEnding.GIT_ATTRIBUTES requires the spotless-lib-extra library, but it is not on the classpath", e);
 		}
 	}
 
-	private static volatile @Nullable BiFunction<File, Supplier<Iterable<File>>, Policy> gitAttributesPolicyCreator;
-
 	// @formatter:off
 	/** Should use {@link #createPolicy(File, Supplier)} instead, but this will work iff its a path-independent LineEnding policy. */
 	public Policy createPolicy() {
 		switch (this) {
 		case PLATFORM_NATIVE:	return _platformNativePolicy;
 		case WINDOWS:			return WINDOWS_POLICY;
 		case UNIX:				return UNIX_POLICY;
-        case MAC_CLASSIC:       return MAC_CLASSIC_POLICY;
+		case MAC_CLASSIC:		return MAC_CLASSIC_POLICY;
 		default:	throw new UnsupportedOperationException(this + " is a path-specific line ending.");
 		}
 	}
@@ -121,7 +124,7 @@ public String str() {
 		case PLATFORM_NATIVE:	return _platformNative;
 		case WINDOWS:			return "\r\n";
 		case UNIX:				return "\n";
-		case MAC_CLASSIC:       return "\r";
+		case MAC_CLASSIC:		return "\r";
 		default:	throw new UnsupportedOperationException(this + " is a path-specific line ending.");
 		}
 	}