Merge branch 'main' into fix-RemoveWildcardImportsStep

Author: nedtwigg

.github/workflows/changelog-print.yml

@@ -9,8 +9,8 @@ jobs:
     runs-on: ubuntu-latest
     name: changelogPrint
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-java@v4
+      - uses: actions/checkout@v5
+      - uses: actions/setup-java@v5
         with:
           java-version: 21
           distribution: 'temurin'

.github/workflows/ci.yml

@@ -20,10 +20,10 @@ jobs:
       buildcachepass: ${{ secrets.BUILDCACHE_PASS }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
-      - uses: actions/setup-java@v4
+      - uses: actions/setup-java@v5
         with:
           distribution: "temurin"
           java-version: 21
@@ -57,8 +57,8 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
-      - uses: actions/setup-java@v4
+        uses: actions/checkout@v5
+      - uses: actions/setup-java@v5
         with:
           distribution: "temurin"
           java-version: ${{ matrix.jre }}
@@ -75,7 +75,7 @@ jobs:
         run: ./gradlew testNpm
       - name: Setup go
         if: matrix.kind == 'shfmt'
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v6
         with:
           go-version: 'stable'
       - name: Install shfmt

.github/workflows/codeql-analysis.yml

@@ -37,7 +37,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
       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

@@ -37,8 +37,8 @@ jobs:
       ORG_GRADLE_PROJECT_gpg_passphrase: ${{ secrets.GPG_PASSPHRASE }}
       ORG_GRADLE_PROJECT_gpg_key64: ${{ secrets.GPG_KEY64 }}
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-java@v4
+      - uses: actions/checkout@v5
+      - uses: actions/setup-java@v5
         with:
           java-version: 21
           distribution: 'temurin'

CHANGES.md

@@ -16,6 +16,11 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
   * Adds support for worktrees (fixes [#1765](https://github.com/diffplug/spotless/issues/1765))
 * Bump default `google-java-format` version to latest `1.24.0` -> `1.28.0`. ([#2345](https://github.com/diffplug/spotless/pull/2345))
 * Bump default `ktlint` version to latest `1.5.0` -> `1.7.1`. ([#2555](https://github.com/diffplug/spotless/pull/2555))
+* `GitPrePushHookInstaller` uses a lock to run gracefully if it is called many times in parallel. ([#2570](https://github.com/diffplug/spotless/pull/2570))
+* Bump default `jackson` version to latest `2.19.2` -> `2.20.0`. ([#2606](https://github.com/diffplug/spotless/pull/2606))
+* Bump default `gson` version to latest `2.13.1` -> `2.13.2`. ([#2615](https://github.com/diffplug/spotless/pull/2615))
+* **BREAKING** Bump default `ktfmt` version to latest `0.53` -> `0.58` ([#2613](https://github.com/diffplug/spotless/pull/2613))
+  * use `TrailingCommaManagementStrategy` enum instead of `manageTrailingCommas` boolean configuration option
 
 ## [3.3.1] - 2025-07-21
 ### Fixed

gradle.properties

@@ -21,7 +21,7 @@ artifactIdMaven=spotless-maven-plugin
 artifactIdGradle=spotless-plugin-gradle
 
 # Build requirements
-VER_JAVA=11
+VER_JAVA=17
 VER_JSR_305=3.0.2
 
 # Dependencies provided by Spotless plugin
@@ -31,6 +31,6 @@ VER_SLF4J=[1.6,2.0[
 VER_DURIAN=1.2.0
 VER_JGIT=7.3.0.202506031305-r
 VER_JUNIT=5.13.4
-VER_ASSERTJ=3.27.3
-VER_MOCKITO=5.18.0
-VER_SELFIE=2.5.3
+VER_ASSERTJ=3.27.6
+VER_MOCKITO=5.20.0
+VER_SELFIE=2.5.4

gradle/java-publish.gradle

@@ -77,7 +77,7 @@ javadoc {
 	//
 	// Thus, no javadoc warnings.
 	options.addStringOption('Xdoclint:none', '-quiet')
-	options.addStringOption('source', '11')
+	options.addStringOption('source', '17')
 	// setup the header
 	options.header javadocInfo
 	// setup links

gradle/special-tests.gradle

@@ -14,9 +14,11 @@ def special = [
 boolean isCiServer = System.getenv().containsKey("CI")
 tasks.withType(Test).configureEach {
 	if (isCiServer) {
-		retry {
-			maxRetries = 2
-			maxFailures = 10
+		develocity {
+			testRetry {
+				maxRetries = 2
+				maxFailures = 10
+			}
 		}
 	}
 	// selfie https://selfie.dev/jvm/get-started#gradle

gradle/wrapper/gradle-wrapper.properties

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