Merge branch 'main' into forbidModuleImports

Author: nedtwigg

.github/workflows/ci.yml

@@ -97,9 +97,25 @@ jobs:
           cd ..
           ./gradlew testIdea
       - name: junit result
-        uses: mikepenz/action-junit-report@v5
+        uses: mikepenz/action-junit-report@v6
         if: always() # always run even if the previous step fails
         with:
           check_name: JUnit ${{ matrix.kind }} ${{ matrix.jre }} ${{ matrix.os }}
           report_paths: '*/build/test-results/*/TEST-*.xml'
           check_retries: true
+
+  # Status check that is required in branch protection rules.
+  final-status:
+    needs:
+      - build
+    runs-on: ubuntu-latest
+    if: always()
+    steps:
+      - name: Check
+        run: |
+          results=$(tr -d '\n' <<< '${{ toJSON(needs.*.result) }}')
+          if ! grep -q -v -E '(failure|cancelled)' <<< "$results"; then
+            echo "One or more required jobs failed"
+            exit 1
+          fi
+          echo "All required jobs completed successfully."

CHANGES.md

@@ -10,10 +10,19 @@ 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]
+### Changes
+* Bump default `ktfmt` version to latest `0.58` -> `0.59`. ([#2681](https://github.com/diffplug/spotless/pull/2681)
+* Use Task Providers for task initialization. [#2719](https://github.com/diffplug/spotless/pull/2719)
+* **BREAKING** Bump minimum supported Gradle version from 7.3 to 8.1. [#2719](https://github.com/diffplug/spotless/pull/2719)
+* Bump default `jackson` version to latest `2.20.0` -> `2.20.1`. ([#2730](https://github.com/diffplug/spotless/pull/2730))
+* Bump default `cleanthat` version to latest `2.23` -> `2.24`. ([#2620](https://github.com/diffplug/spotless/pull/2620))
 ### Fixed
-- palantirJavaFormat is no longer arbitrarily set to outdated versions on Java 17, latest available version is always used ([#2686](https://github.com/diffplug/spotless/pull/2686) fixes [#2685](https://github.com/diffplug/spotless/issues/2685))
+* palantirJavaFormat is no longer arbitrarily set to outdated versions on Java 17, latest available version is always used ([#2686](https://github.com/diffplug/spotless/pull/2686) fixes [#2685](https://github.com/diffplug/spotless/issues/2685))
 ### Added
-- Add a `forbidModuleImports` API for java ([#2679](https://github.com/diffplug/spotless/issues/2679))
+* Add a `forbidModuleImports` API for java ([#2679](https://github.com/diffplug/spotless/issues/2679))
+* new options to customize Flexmark, e.g. to allow YAML front matter ([#2616](https://github.com/diffplug/spotless/issues/2616))
+### Removed
+* **BREAKING** Drop support for older Ktlint versions. ([#2711](https://github.com/diffplug/spotless/pull/2711))
 
 ## [4.0.0] - 2025-09-24
 ### Changes

README.md

@@ -197,7 +197,6 @@ Once someone has filled in one square of the formatter/build system matrix, it's
 - Thanks to [Matthias Balke](https://github.com/matthiasbalke) for [adding support for Antlr](https://github.com/diffplug/spotless/pull/328).
 - Thanks to [Matthias Andreas Benkard](https://github.com/benkard) for adding support for google-java-format 1.8+ ([#563](https://github.com/diffplug/spotless/pull/563))
 - Thanks to [Thomas Broyer](https://github.com/tbroyer) for adding support for google-java-format's [skip-reflowing-long-strings option](https://github.com/diffplug/spotless/pull/929).
-- Thanks to [Ranadeep Polavarapu](https://github.com/RanadeepPolavarapu) for adding support for ktfmt ([#569](https://github.com/diffplug/spotless/pull/569))
 - Thanks to [Hakanai](https://github.com/hakanai) for adding [wildcards last support to the import sorter](https://github.com/diffplug/spotless/pull/956).
 - Thanks to [Kevin Brooks](https://github.com/k-brooks) for [updating all eclipse-based formatters to 4.13](https://github.com/diffplug/spotless/pull/482) and [fixing Groovy for multiproject](https://github.com/diffplug/spotless/issues/877).
 - Thanks to [Dylan Baroody](https://github.com/dylanbaroody) for fixing [sql formatting support for JDBI bind list params](https://github.com/diffplug/spotless/pull/955).

build.gradle

@@ -31,10 +31,10 @@ spotless {
 }
 
 dependencies {
-	rewrite(platform('org.openrewrite.recipe:rewrite-recipe-bom:3.16.0'))
+	rewrite(platform('org.openrewrite.recipe:rewrite-recipe-bom:3.18.0'))
 	rewrite('org.openrewrite.recipe:rewrite-migrate-java:3.19.0')
 	rewrite('org.openrewrite.recipe:rewrite-java-security:3.19.2')
 	rewrite('org.openrewrite.recipe:rewrite-rewrite:0.14.0')
 	rewrite('org.openrewrite.recipe:rewrite-static-analysis:2.19.0')
-	rewrite('org.openrewrite.recipe:rewrite-third-party:0.29.0')
+	rewrite('org.openrewrite.recipe:rewrite-third-party:0.31.1')
 }

gradle.properties

@@ -30,7 +30,7 @@ VER_SLF4J=[1.6,2.0[
 # Used in multiple places
 VER_DURIAN=1.2.0
 VER_JGIT=7.4.0.202509020913-r
-VER_JUNIT=5.14.0
+VER_JUNIT=5.14.1
 VER_ASSERTJ=3.27.6
 VER_MOCKITO=5.20.0
 VER_SELFIE=2.5.4

gradle/error-prone.gradle

@@ -1,30 +1,50 @@
-import static java.lang.System.getenv
-
 apply plugin: 'net.ltgt.errorprone'
 
 dependencies {
 	errorprone('com.google.errorprone:error_prone_core:2.42.0')
-	errorprone('tech.picnic.error-prone-support:error-prone-contrib:0.25.0')
-	constraints {
-		errorprone('com.google.guava:guava') {
-			version {
-				require('33.4.8-jre')
-			}
-			because('Older versions use deprecated methods in sun.misc.Unsafe')
-			// https://github.com/junit-team/junit-framework/pull/5039#discussion_r2414490581
-		}
-	}
+	errorprone('tech.picnic.error-prone-support:error-prone-contrib:0.26.0')
 }
 
 tasks.withType(JavaCompile).configureEach {
 	options.errorprone {
-		disableAllChecks = true // consider removal to avoid error prone error´s, following convention over configuration.
-		error('RedundantStringConversion')
-		if (!getenv().containsKey('CI') && getenv('IN_PLACE')?.toBoolean()) {
-			errorproneArgs.addAll(
-					'-XepPatchLocation:IN_PLACE',
-					'-XepPatchChecks:RedundantStringConversion'
-					)
-		}
+		disable( // consider fix, or reasoning.
+				'FunctionalInterfaceMethodChanged',
+				'JavaxInjectOnAbstractMethod',
+				'OverridesJavaxInjectableMethod',
+				)
+		error(
+				'AmbiguousJsonCreator',
+				'AssertJNullnessAssertion',
+				'AutowiredConstructor',
+				'CanonicalAnnotationSyntax',
+				'CollectorMutability',
+				'ConstantNaming',
+				'DirectReturn',
+				'EmptyMethod',
+				'ExplicitArgumentEnumeration',
+				'ExplicitEnumOrdering',
+				'IdentityConversion',
+				'ImmutablesSortedSetComparator',
+				'IsInstanceLambdaUsage',
+				'MockitoMockClassReference',
+				'MockitoStubbing',
+				'NestedOptionals',
+				'PrimitiveComparison',
+				'RedundantStringConversion',
+				'RedundantStringEscape',
+				'ReturnValueIgnored',
+				'SelfAssignment',
+				'StringJoin',
+				'StringJoining',
+				'UnnecessarilyFullyQualified',
+				'UnnecessaryLambda',
+				)
+		// bug: this only happens when the file is dirty.
+		// might be an up2date (caching) issue, as file is currently in corrupt state.
+		// ForbidGradleInternal(import org.gradle.api.internal.project.ProjectInternal;)
+		errorproneArgs.add('-XepExcludedPaths:' +
+				'.*/SelfTest.java|' +
+				'.*/GradleIntegrationHarness.java'
+				)
 	}
 }

gradle/rewrite.gradle

@@ -2,7 +2,6 @@ apply plugin: 'org.openrewrite.rewrite'
 
 rewrite {
 	activeRecipe('com.diffplug.spotless.openrewrite.SanityCheck')
-	activeStyle('com.diffplug.spotless.openrewrite.SpotlessFormat')
 	exclusions.addAll(
 			'**.dirty.java',
 			'**FormatterProperties.java',

gradle/wrapper/gradle-wrapper.jar

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

gradle/wrapper/gradle-wrapper.properties

@@ -38,10 +38,8 @@ spotless {
 
 apply from: rootProject.file('gradle/special-tests.gradle')
 tasks.withType(Test).configureEach {
-	if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_16)) {
-		// needed for EclipseCdtFormatterStepTest
-		jvmArgs '--add-opens=java.base/java.lang=ALL-UNNAMED'
-	}
+	// needed for EclipseCdtFormatterStepTest
+	jvmArgs '--add-opens=java.base/java.lang=ALL-UNNAMED'
 }
 
 def NEEDS_P2_DEPS = [
@@ -50,9 +48,6 @@ def NEEDS_P2_DEPS = [
 	'groovy',
 	'jdt'
 ]
-if (!JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_17)) {
-	NEEDS_P2_DEPS.remove('cdt')
-}
 for (needsP2 in NEEDS_P2_DEPS) {
 	sourceSets.register(needsP2) {
 		compileClasspath += sourceSets.main.output