Merge branch 'main' into I2428

Author: nedtwigg

.github/workflows/changelog-print.yml

@@ -15,5 +15,5 @@ jobs:
           java-version: 21
           distribution: 'temurin'
       - name: gradle caching
-        uses: gradle/actions/setup-gradle@v4
+        uses: gradle/actions/setup-gradle@v5
       - run: ./gradlew changelogPrint

.github/workflows/ci.yml

@@ -27,7 +27,7 @@ jobs:
           distribution: "temurin"
           java-version: 21
       - name: gradle caching
-        uses: gradle/actions/setup-gradle@v4
+        uses: gradle/actions/setup-gradle@v5
       - name: spotlessCheck
         run: ./gradlew spotlessCheck
       - name: rewriteDryRun
@@ -64,7 +64,7 @@ jobs:
           distribution: "temurin"
           java-version: ${{ matrix.jre }}
       - name: gradle caching
-        uses: gradle/actions/setup-gradle@v4
+        uses: gradle/actions/setup-gradle@v5
       - name: build (maven-only)
         if: matrix.kind == 'maven'
         run: ./gradlew :plugin-maven:build -x spotlessCheck -x rewriteDryRun
@@ -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."

.github/workflows/claude.yml

@@ -50,7 +50,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3
+      uses: github/codeql-action/init@v4
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -61,7 +61,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v3
+      uses: github/codeql-action/autobuild@v4
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -75,4 +75,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3
+      uses: github/codeql-action/analyze@v4

.github/workflows/codeql-analysis.yml

@@ -43,7 +43,7 @@ jobs:
           java-version: 21
           distribution: 'temurin'
       - name: gradle caching
-        uses: gradle/actions/setup-gradle@v4
+        uses: gradle/actions/setup-gradle@v5
       - name: git fetch origin main
         run: git fetch origin main
       - name: publish all

.github/workflows/deploy.yml

@@ -10,6 +10,16 @@ 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)
+- 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))
+- **POTENTIALLY BREAKING** Removed support for `ktlint` versions below 1.0. ([#2711](https://github.com/diffplug/spotless/pull/2711))
+### 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))
+### Added
+- 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))
 
 ## [4.0.0] - 2025-09-24
 ### Changes

CHANGES.md

@@ -85,6 +85,8 @@ lib('java.GoogleJavaFormatStep')                 +'{{yes}}       | {{yes}}
 lib('java.ImportOrderStep')                      +'{{yes}}       | {{yes}}      | {{yes}}      | {{no}}  |',
 lib('java.PalantirJavaFormatStep')               +'{{yes}}       | {{yes}}      | {{no}}       | {{no}}  |',
 lib('java.RemoveUnusedImportsStep')              +'{{yes}}       | {{yes}}      | {{yes}}      | {{no}}  |',
+lib('java.ForbidWildcardImportsStep')            +'{{yes}}       | {{yes}}      | {{yes}}      | {{no}}  |',
+lib('java.ForbidModuleImportsStep')              +'{{yes}}       | {{yes}}      | {{no}}       | {{no}}  |',
 extra('java.EclipseJdtFormatterStep')            +'{{yes}}       | {{yes}}      | {{yes}}      | {{no}}  |',
 lib('java.FormatAnnotationsStep')                +'{{yes}}       | {{yes}}      | {{no}}       | {{no}}  |',
 lib('java.CleanthatJavaStep')                    +'{{yes}}       | {{yes}}      | {{no}}       | {{no}}  |',
@@ -140,6 +142,8 @@ lib('yaml.JacksonYamlStep')                      +'{{yes}}       | {{yes}}
 | [`java.ImportOrderStep`](lib/src/main/java/com/diffplug/spotless/java/ImportOrderStep.java) | :+1:       | :+1:      | :+1:      | :white_large_square:  |
 | [`java.PalantirJavaFormatStep`](lib/src/main/java/com/diffplug/spotless/java/PalantirJavaFormatStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
 | [`java.RemoveUnusedImportsStep`](lib/src/main/java/com/diffplug/spotless/java/RemoveUnusedImportsStep.java) | :+1:       | :+1:      | :+1:      | :white_large_square:  |
+| [`java.ForbidWildcardImportsStep`](lib/src/main/java/com/diffplug/spotless/java/ForbidWildcardImportsStep.java) | :+1:       | :+1:      | :+1:      | :white_large_square:  |
+| [`java.ForbidModuleImportsStep`](lib/src/main/java/com/diffplug/spotless/java/ForbidModuleImportsStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
 | [`java.EclipseJdtFormatterStep`](lib-extra/src/main/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStep.java) | :+1:       | :+1:      | :+1:      | :white_large_square:  |
 | [`java.FormatAnnotationsStep`](lib/src/main/java/com/diffplug/spotless/java/FormatAnnotationsStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
 | [`java.CleanthatJavaStep`](lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java) | :+1:       | :+1:      | :white_large_square:       | :white_large_square:  |
@@ -193,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).

README.md

@@ -12,6 +12,7 @@ repositories {
 apply from: rootProject.file('gradle/java-publish.gradle')
 apply from: rootProject.file('gradle/changelog.gradle')
 allprojects {
+	apply from: rootProject.file('gradle/error-prone.gradle')
 	apply from: rootProject.file('gradle/rewrite.gradle')
 	apply from: rootProject.file('gradle/spotless.gradle')
 }
@@ -30,6 +31,10 @@ spotless {
 }
 
 dependencies {
-	rewrite(platform("org.openrewrite.recipe:rewrite-recipe-bom:3.15.0"))
-	rewrite("org.openrewrite.recipe:rewrite-migrate-java:3.18.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.31.1')
 }

build.gradle

@@ -29,8 +29,8 @@ VER_SLF4J=[1.6,2.0[
 
 # Used in multiple places
 VER_DURIAN=1.2.0
-VER_JGIT=7.3.0.202506031305-r
-VER_JUNIT=5.13.4
+VER_JGIT=7.4.0.202509020913-r
+VER_JUNIT=5.14.1
 VER_ASSERTJ=3.27.6
 VER_MOCKITO=5.20.0
 VER_SELFIE=2.5.4

gradle.properties

@@ -0,0 +1,50 @@
+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.26.0')
+}
+
+tasks.withType(JavaCompile).configureEach {
+	options.errorprone {
+		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'
+				)
+	}
+}