Merge branch 'main' into bump-ktfmt-046

Author: nedtwigg

.github/workflows/ci.yml

@@ -42,7 +42,8 @@ jobs:
       fail-fast: false
       matrix:
         kind: [maven, gradle]
-        jre: [11, 17]
+        # Test on the latest Java version once Gradle & Maven support it.
+        jre: [11, 17, 21]
         os: [ubuntu-latest]
         include:
           # test windows at the diagonals of the above matrix

CHANGES.md

@@ -11,7 +11,9 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 ### Changes
+* Use palantir-java-format `2.38.0` on Java 21. ([#1920](https://github.com/diffplug/spotless/pull/1920))
 * Bump default `ktfmt` version to latest `0.44` -> `0.46`. ([#1927](https://github.com/diffplug/spotless/pull/1927))
+* Bump default `googleJavaFormat` version to latest `1.17.0` -> `1.18.1`. ([#1920](https://github.com/diffplug/spotless/pull/1920))
 
 ## [2.43.0] - 2023-11-27
 ### Added

gradle.properties

@@ -29,6 +29,6 @@ VER_SLF4J=[1.6,2.0[
 # Used in multiple places
 VER_DURIAN=1.2.0
 VER_JGIT=6.7.0.202309050840-r
-VER_JUNIT=5.10.0
+VER_JUNIT=5.10.1
 VER_ASSERTJ=3.24.2
-VER_MOCKITO=5.6.0
+VER_MOCKITO=5.8.0

gradle/java-setup.gradle

@@ -15,7 +15,8 @@ tasks.withType(JavaCompile).configureEach {
 apply plugin: 'com.github.spotbugs'
 spotbugs {
 	ignoreFailures = false 	// bug free or it doesn't ship!
-	reportLevel = 'medium'	// low|medium|high (low = sensitive to even minor mistakes)
+	// LOW|MEDIUM|DEFAULT|HIGH (low = sensitive to even minor mistakes).
+	reportLevel = com.github.spotbugs.snom.Confidence.valueOf('MEDIUM')
 	omitVisitors = [
 		// https://spotbugs.readthedocs.io/en/latest/detectors.html#constructorthrow
 		'ConstructorThrow',

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -91,5 +91,8 @@ p2deps {
 }
 
 // we'll hold the core lib to a high standard
-spotbugs { reportLevel = 'low' } // low|medium|high (low = sensitive to even minor mistakes)
+spotbugs {
+	// LOW|MEDIUM|DEFAULT|HIGH (low = sensitive to even minor mistakes).
+	reportLevel = com.github.spotbugs.snom.Confidence.valueOf('LOW')
+}
 

lib-extra/build.gradle

@@ -84,7 +84,7 @@ dependencies {
 	gherkinCompileOnly 'io.cucumber:gherkin-utils:8.0.2'
 	gherkinCompileOnly 'org.slf4j:slf4j-api:2.0.0'
 	// googleJavaFormat
-	googleJavaFormatCompileOnly 'com.google.googlejavaformat:google-java-format:1.17.0'
+	googleJavaFormatCompileOnly 'com.google.googlejavaformat:google-java-format:1.18.1'
 	// gson
 	gsonCompileOnly 'com.google.code.gson:gson:2.10.1'
 	// jackson
@@ -126,7 +126,10 @@ dependencies {
 }
 
 // we'll hold the core lib to a high standard
-spotbugs { reportLevel = 'low' } // low|medium|high (low = sensitive to even minor mistakes)
+spotbugs {
+	// LOW|MEDIUM|DEFAULT|HIGH (low = sensitive to even minor mistakes).
+	reportLevel = com.github.spotbugs.snom.Confidence.valueOf('LOW')
+}
 
 apply from: rootProject.file('gradle/special-tests.gradle')
 tasks.withType(Test).configureEach {

lib/build.gradle

@@ -35,7 +35,7 @@ private GoogleJavaFormatStep() {}
 	private static final boolean DEFAULT_REORDER_IMPORTS = false;
 	private static final boolean DEFAULT_FORMAT_JAVADOC = true;
 	static final String NAME = "google-java-format";
-	static final String MAVEN_COORDINATE = "com.google.googlejavaformat:google-java-format";
+	public static final String MAVEN_COORDINATE = "com.google.googlejavaformat:google-java-format";
 
 	/** Creates a step which formats everything - code, import order, and unused imports. */
 	public static FormatterStep create(Provisioner provisioner) {
@@ -83,7 +83,7 @@ public static FormatterStep create(String groupArtifact, String version, String
 			.addMin(11, "1.8") // we only support google-java-format >= 1.8 due to api changes
 			.addMin(16, "1.10.0") // java 16 requires at least 1.10.0 due to jdk api changes in JavaTokenizer
 			.addMin(21, "1.17.0") // java 21 requires at least 1.17.0 due to https://github.com/google/google-java-format/issues/898
-			.add(11, "1.17.0"); // default version
+			.add(11, "1.18.1"); // default version
 
 	public static String defaultGroupArtifact() {
 		return MAVEN_COORDINATE;

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

@@ -29,8 +29,8 @@ private PalantirJavaFormatStep() {}
 
 	private static final String DEFAULT_STYLE = "PALANTIR";
 	private static final String NAME = "palantir-java-format";
-	private static final String MAVEN_COORDINATE = "com.palantir.javaformat:palantir-java-format:";
-	private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(8, "1.1.0").add(11, "2.28.0");
+	public static final String MAVEN_COORDINATE = "com.palantir.javaformat:palantir-java-format:";
+	private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(8, "1.1.0").add(11, "2.28.0").add(21, "2.38.0");
 
 	/** Creates a step which formats everything - code, import order, and unused imports. */
 	public static FormatterStep create(Provisioner provisioner) {