Merge branch 'main' into expandWildcardImports

nedtwigg · nedtwigg · commit f10221285209 · 2026-01-20T16:02:25.000-08:00
# Conflicts:
#	CHANGES.md
#	plugin-gradle/CHANGES.md
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,7 +1,7 @@
 # BUILDCACHE_USER
 # BUILDCACHE_PASS
 #   - rw access to buildcache.diffplug.com
-
+name: CI 🏭
 on:
   pull_request:
   push:
@@ -13,7 +13,7 @@ concurrency:
   cancel-in-progress: true
 jobs:
   sanity-check:
-    name: SanityCheck
+    name: Sanity Check 🦢
     runs-on: ubuntu-latest
     env:
       buildcacheuser: ${{ secrets.BUILDCACHE_USER }}
@@ -29,9 +29,9 @@ jobs:
           java-version: 21
       - name: gradle caching
         uses: gradle/actions/setup-gradle@v5
-      - name: spotlessCheck
+      - name: Spotless ✨
         run: ./gradlew spotlessCheck
-      - name: rewriteDryRun
+      - name: Rewrite ♻️
         run: ./gradlew rewriteDryRun
       - name: assemble testClasses
         run: ./gradlew assemble testClasses
diff --git a/CHANGES.md b/CHANGES.md
@@ -13,7 +13,10 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Added
 - Add a `expandWildcardImports` API for java ([#2679](https://github.com/diffplug/spotless/issues/2594))
 - Add the ability to specify a wildcard version (`*`) for external formatter executables. ([#2757](https://github.com/diffplug/spotless/issues/2757))
+### Fixed
+- Prevent race conditions when multiple npm-based formatters launch the server process simultaneously while sharing the same `node_modules` directory. ([#2786](https://github.com/diffplug/spotless/pull/2786))
 ### Changes
+- Bump default `ktfmt` version to latest `0.59` -> `0.61`. ([2804](https://github.com/diffplug/spotless/pull/2804))
 - Bump default `ktlint` version to latest `1.7.1` -> `1.8.0`. ([2763](https://github.com/diffplug/spotless/pull/2763))
 - Bump default `gherkin-utils` version to latest `9.2.0` -> `10.0.0`. ([#2619](https://github.com/diffplug/spotless/pull/2619))
 
diff --git a/gradle.properties b/gradle.properties
@@ -30,7 +30,7 @@ VER_SLF4J=[1.6,2.0[
 # Used in multiple places
 VER_DURIAN=1.2.0
 VER_JGIT=7.5.0.202512021534-r
-VER_JUNIT=6.0.1
+VER_JUNIT=6.0.2
 VER_ASSERTJ=3.27.6
 VER_MOCKITO=5.21.0
 VER_SELFIE=2.5.5
diff --git a/gradle/rewrite.gradle b/gradle/rewrite.gradle
@@ -22,7 +22,6 @@ rewrite {
 }
 dependencies {
 	rewrite('org.openrewrite.recipe:rewrite-migrate-java:3.22.0')
-	rewrite('org.openrewrite.recipe:rewrite-java-security:3.22.0')
 	rewrite('org.openrewrite.recipe:rewrite-rewrite:0.16.0')
 	rewrite('org.openrewrite.recipe:rewrite-static-analysis:2.22.0')
 	rewrite('org.openrewrite.recipe:rewrite-third-party:0.31.2')
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,8 +1,8 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
+distributionSha256Sum=0d585f69da091fc5b2beced877feab55a3064d43b8a1d46aeb07996b0915e0e0
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionSha256Sum=72f44c9f8ebcb1af43838f45ee5c4aa9c5444898b3468ab3f4af7b6076c5bc3f
diff --git a/lib/build.gradle b/lib/build.gradle
@@ -104,12 +104,13 @@ dependencies {
 	// javaParser
 	javaParserCompileOnly "com.github.javaparser:javaparser-symbol-solver-core:3.27.1"
 	// ktfmt
-	ktfmtCompileOnly "com.facebook:ktfmt:0.59"
+	ktfmtCompileOnly "com.facebook:ktfmt:0.61"
 	ktfmtCompileOnly("com.google.googlejavaformat:google-java-format") {
 		version {
 			strictly '1.7' // for JDK 8 compatibility
 		}
 	}
+	ktfmtCompileOnly "com.google.code.findbugs:jsr305:${VER_JSR_305}"
 	// ktlint latest supported version
 	compatKtLint1Dot0Dot0CompileAndTestOnly 'com.pinterest.ktlint:ktlint-rule-engine:1.8.0'
 	compatKtLint1Dot0Dot0CompileAndTestOnly 'com.pinterest.ktlint:ktlint-ruleset-standard:1.8.0'
diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2025 DiffPlug
+ * Copyright 2016-2026 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -41,7 +41,7 @@
 public final class KtfmtStep implements Serializable {
 	@Serial
 	private static final long serialVersionUID = 1L;
-	private static final String DEFAULT_VERSION = "0.59";
+	private static final String DEFAULT_VERSION = "0.61";
 	private static final String NAME = "ktfmt";
 	private static final String MAVEN_COORDINATE = "com.facebook:ktfmt:";
 
diff --git a/lib/src/main/resources/com/diffplug/spotless/npm/common-serve.js b/lib/src/main/resources/com/diffplug/spotless/npm/common-serve.js
@@ -35,12 +35,14 @@ function getInstanceId() {
 
 var listener = app.listen(0, "127.0.0.1", () => {
 	const instanceId = getInstanceId();
+	const tempFileName = `server-${instanceId}.port.tmp`;
+	const finalFileName = `server-${instanceId}.port`;
 	debugLog("Server running on port " + listener.address().port + " for instance " + instanceId);
-	fs.writeFile("server.port.tmp", "" + listener.address().port, function (err) {
+	fs.writeFile(tempFileName, "" + listener.address().port, function (err) {
 		if (err) {
 			return console.log(err);
 		} else {
-			fs.rename("server.port.tmp", `server-${instanceId}.port`, function (err) {
+			fs.rename(tempFileName, finalFileName, function (err) {
 				if (err) {
 					return console.log(err);
 				}
diff --git a/lib/src/main/resources/com/diffplug/spotless/npm/eslint-package.json b/lib/src/main/resources/com/diffplug/spotless/npm/eslint-package.json
@@ -1,6 +1,6 @@
 {
 	"name": "spotless-eslint",
-	"version": "4.0.0",
+	"version": "4.0.1",
 	"description": "Spotless formatter step for running eslint as a rest service.",
 	"repository": "https://github.com/diffplug/spotless",
 	"license": "Apache-2.0",
diff --git a/lib/src/main/resources/com/diffplug/spotless/npm/prettier-package.json b/lib/src/main/resources/com/diffplug/spotless/npm/prettier-package.json
@@ -1,6 +1,6 @@
 {
 	"name": "spotless-prettier",
-	"version": "4.0.0",
+	"version": "4.0.1",
 	"description": "Spotless formatter step for running prettier as a rest service.",
 	"repository": "https://github.com/diffplug/spotless",
 	"license": "Apache-2.0",
diff --git a/lib/src/main/resources/com/diffplug/spotless/npm/tsfmt-package.json b/lib/src/main/resources/com/diffplug/spotless/npm/tsfmt-package.json
@@ -1,6 +1,6 @@
 {
 	"name": "spotless-tsfmt",
-	"version": "4.0.0",
+	"version": "4.0.1",
 	"description": "Spotless formatter step for running tsfmt as a rest service.",
 	"repository": "https://github.com/diffplug/spotless",
 	"license": "Apache-2.0",
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
@@ -8,7 +8,9 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 - Add the ability to specify a wildcard version (`*`) for external formatter executables. ([#2757](https://github.com/diffplug/spotless/issues/2757))
 ### Fixed
 - [fix] `NPE` due to workingTreeIterator being null for git ignored files. #911 ([#2771](https://github.com/diffplug/spotless/issues/2771))
+- Prevent race conditions when multiple npm-based formatters launch the server process simultaneously while sharing the same `node_modules` directory. ([#2786](https://github.com/diffplug/spotless/pull/2786))
 ### Changes
+- Bump default `ktfmt` version to latest `0.59` -> `0.61`. ([2804](https://github.com/diffplug/spotless/pull/2804))
 - Bump default `ktlint` version to latest `1.7.1` -> `1.8.0`. ([2763](https://github.com/diffplug/spotless/pull/2763))
 - Bump default `gherkin-utils` version to latest `9.2.0` -> `10.0.0`. ([#2619](https://github.com/diffplug/spotless/pull/2619))
 
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
@@ -7,7 +7,10 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 - Add the ability to specify a wildcard version (`*`) for external formatter executables. ([#2757](https://github.com/diffplug/spotless/issues/2757))
 ### Fixed
 - [fix] `NPE` due to workingTreeIterator being null for git ignored files. #911 ([#2771](https://github.com/diffplug/spotless/issues/2771))
+- Prevent race conditions when multiple npm-based formatters launch the server process simultaneously while sharing the same `node_modules` directory. ([#2786](https://github.com/diffplug/spotless/pull/2786))
+
 ### Changes
+* Bump default `ktfmt` version to latest `0.59` -> `0.61`. ([2804](https://github.com/diffplug/spotless/pull/2804))
 * Bump default `ktlint` version to latest `1.7.1` -> `1.8.0`. ([2763](https://github.com/diffplug/spotless/pull/2763))
 * Bump default `gherkin-utils` version to latest `9.2.0` -> `10.0.0`. ([#2619](https://github.com/diffplug/spotless/pull/2619))
 
diff --git a/rewrite.yml b/rewrite.yml
@@ -3,11 +3,6 @@ type: specs.openrewrite.org/v1beta/recipe
 name: com.diffplug.spotless.openrewrite.SanityCheck
 displayName: Apply all Java & Gradle best practices
 description: Comprehensive code quality recipe combining modernization, security, and best practices.
-tags:
-  - java
-  - gradle
-  - static-analysis
-  - cleanup
 recipeList:
   - org.openrewrite.gradle.EnableGradleBuildCache
   - org.openrewrite.gradle.EnableGradleParallelExecution
@@ -25,7 +20,6 @@ recipeList:
   - org.openrewrite.java.migrate.util.SequencedCollection
   - org.openrewrite.java.recipes.JavaRecipeBestPractices
   - org.openrewrite.java.recipes.RecipeTestingBestPractices
-  - org.openrewrite.java.security.JavaSecurityBestPractices
   - org.openrewrite.staticanalysis.BufferedWriterCreationRecipes
   - org.openrewrite.staticanalysis.CommonStaticAnalysis
   - org.openrewrite.staticanalysis.EqualsAvoidsNull
@@ -39,7 +33,6 @@ recipeList:
   - org.openrewrite.staticanalysis.RemoveUnusedLocalVariables
   - org.openrewrite.staticanalysis.RemoveUnusedPrivateFields
   - org.openrewrite.staticanalysis.RemoveUnusedPrivateMethods
-  - org.openrewrite.staticanalysis.ReplaceApacheCommonsLang3ValidateNotNullWithObjectsRequireNonNull
   - org.openrewrite.staticanalysis.SimplifyTernaryRecipes
   - org.openrewrite.staticanalysis.URLEqualsHashCodeRecipes
   - org.openrewrite.staticanalysis.UnnecessaryCloseInTryWithResources
@@ -64,5 +57,4 @@ recipeList:
   - tech.picnic.errorprone.refasterrules.StreamRulesRecipes
   - tech.picnic.errorprone.refasterrules.StringRulesRecipes
   - tech.picnic.errorprone.refasterrules.TimeRulesRecipes
-  # - org.openrewrite.java.migrate.lang.FindVirtualThreadOpportunities # don't want to use: https://github.com/diffplug/spotless/pull/2684#discussion_r2433831887
 ---
diff --git a/settings.gradle b/settings.gradle
@@ -12,13 +12,13 @@ plugins {
 	id 'com.diffplug.spotless' version '8.1.0' apply false
 	id 'com.diffplug.spotless-changelog' version '3.1.2' apply false // https://github.com/diffplug/spotless-changelog/blob/main/CHANGELOG.md
 	id 'com.github.spotbugs' version '6.4.8' apply false // https://github.com/spotbugs/spotbugs-gradle-plugin/releases
-	id 'com.gradle.develocity' version '4.3' // https://plugins.gradle.org/plugin/com.gradle.develocity
+	id 'com.gradle.develocity' version '4.3.1' // https://plugins.gradle.org/plugin/com.gradle.develocity
 	id 'com.gradle.plugin-publish' version '2.0.0' apply false // https://plugins.gradle.org/plugin/com.gradle.plugin-publish
 	id 'dev.equo.ide' version '1.7.8' apply false // https://github.com/equodev/equo-ide/blob/main/plugin-gradle/CHANGELOG.md
 	id 'io.github.davidburstrom.version-compatibility' version '0.5.0' apply false // https://github.com/davidburstrom/version-compatibility-gradle-plugin/tags
 	id 'io.github.gradle-nexus.publish-plugin' version '2.0.0' apply false // https://github.com/gradle-nexus/publish-plugin/releases
-	id 'net.ltgt.errorprone' version '4.3.0' apply false
-	id 'org.openrewrite.rewrite' version '7.23.0' apply false
+	id 'net.ltgt.errorprone' version '4.4.0' apply false
+	id 'org.openrewrite.rewrite' version '7.24.0' apply false
 }
 
 dependencyResolutionManagement {

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,6 @@ rewrite {`
`22`	`22`	`}`
`23`	`23`	`dependencies {`
`24`	`24`	`rewrite('org.openrewrite.recipe:rewrite-migrate-java:3.22.0')`
`25`		`- rewrite('org.openrewrite.recipe:rewrite-java-security:3.22.0')`
`26`	`25`	`rewrite('org.openrewrite.recipe:rewrite-rewrite:0.16.0')`
`27`	`26`	`rewrite('org.openrewrite.recipe:rewrite-static-analysis:2.22.0')`
`28`	`27`	`rewrite('org.openrewrite.recipe:rewrite-third-party:0.31.2')`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "spotless-eslint",`
`3`		`- "version": "4.0.0",`
	`3`	`+ "version": "4.0.1",`
`4`	`4`	`"description": "Spotless formatter step for running eslint as a rest service.",`
`5`	`5`	`"repository": "https://github.com/diffplug/spotless",`
`6`	`6`	`"license": "Apache-2.0",`