From a76401b9ce82340498a20bb36065fcc7f691046b Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 17 Aug 2023 07:43:38 +0000
Subject: [PATCH 01/57] chore(deps): update dependency gradle to v8

---
 gradle/wrapper/gradle-wrapper.jar        | Bin 61624 -> 63721 bytes
 gradle/wrapper/gradle-wrapper.properties |   3 ++-
 gradlew                                  |  19 ++++++++++++-------
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index afba109285af78dbd2a1d187e33ac4f87c76e392..7f93135c49b765f8051ef9d0a6055ff8e46073d8 100755
GIT binary patch
delta 41204
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

delta 39055
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

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 4e86b92707..ac72c34e8a 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 65dcd68d65..0adc8e1a53 100755
--- a/gradlew
+++ b/gradlew
@@ -83,10 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,10 +131,13 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
@@ -144,7 +145,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -152,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -197,6 +198,10 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
 # Collect all arguments for the java command;
 #   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
 #     shell script including quotes and variable substitutions, so put them in

From c48a180905566fd444ce03279863a5e5dffc6b6e Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 28 Sep 2023 16:14:38 +0000
Subject: [PATCH 02/57] chore(deps): update mikepenz/action-junit-report action
 to v4

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2a8078339d..01379f3a91 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -79,7 +79,7 @@ jobs:
         if: matrix.kind == 'npm'
         run: ./gradlew testNpm
       - name: junit result
-        uses: mikepenz/action-junit-report@v3
+        uses: mikepenz/action-junit-report@v4
         if: always() # always run even if the previous step fails
         with:
           check_name: JUnit ${{ matrix.kind }} ${{ matrix.jre }} ${{ matrix.os }}

From 5404e027529dbdc9a50b264c3d2e8d7891bbfee5 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 28 Sep 2023 09:39:25 -0700
Subject: [PATCH 03/57] Bump gradle to 8.4-rc-2 for Java 21

---
 build.gradle                             |   2 +-
 gradle/wrapper/gradle-wrapper.jar        | Bin
 gradle/wrapper/gradle-wrapper.properties |   2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 mode change 100755 => 100644 gradle/wrapper/gradle-wrapper.jar

diff --git a/build.gradle b/build.gradle
index 0ae84bd9c4..dcef3b68b9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'dev.equo.ide'
 equoIde {
 	branding().title('Spotless').icon(file('_images/spotless_logo.png'))
 	welcome().openUrl('https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md')
-	gradleBuildship().autoImport('.')
+	//gradleBuildship().autoImport('.')
 }
 
 repositories {
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
old mode 100755
new mode 100644
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index ac72c34e8a..98ea390909 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-rc-2-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

From deba3401369eb6e11ed720732b5a3701b36157ff Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Thu, 28 Sep 2023 09:40:49 -0700
Subject: [PATCH 04/57] Revert accidental commit.

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index dcef3b68b9..0ae84bd9c4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'dev.equo.ide'
 equoIde {
 	branding().title('Spotless').icon(file('_images/spotless_logo.png'))
 	welcome().openUrl('https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md')
-	//gradleBuildship().autoImport('.')
+	gradleBuildship().autoImport('.')
 }
 
 repositories {

From 5a02315dfefe37f8ece378a97bd3bf7f560c582b Mon Sep 17 00:00:00 2001
From: runner
 <runner@fv-az1032-962.a2cmwlnf3g0ujp1vqeksrtzoac.cx.internal.cloudapp.net>
Date: Thu, 28 Sep 2023 23:47:42 +0000
Subject: [PATCH 05/57] Published gradle/6.22.0

---
 plugin-gradle/CHANGES.md |  2 ++
 plugin-gradle/README.md  | 56 ++++++++++++++++++++--------------------
 2 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 536747a4ff..74f889fc04 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+
+## [6.22.0] - 2023-09-28
 ### Added
 * Added support for `google-java-format`'s `skip-javadoc-formatting` option ([#1793](https://github.com/diffplug/spotless/pull/1793))
 * Add support for `flexmark` in gradle. Previously only Maven was supported. ([#1801](https://github.com/diffplug/spotless/pull/1801))
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index d4537d4b11..16285f88ad 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -14,9 +14,9 @@ output = [
   ].join('\n');
 -->
 [![Gradle plugin](https://img.shields.io/badge/plugins.gradle.org-com.diffplug.spotless-blue.svg)](https://plugins.gradle.org/plugin/com.diffplug.spotless)
-[![Changelog](https://img.shields.io/badge/changelog-6.21.0-blue.svg)](CHANGES.md)
+[![Changelog](https://img.shields.io/badge/changelog-6.22.0-blue.svg)](CHANGES.md)
 [![Maven central](https://img.shields.io/badge/mavencentral-here-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-plugin-gradle%22)
-[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/index.html)
+[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/index.html)
 
 [![VS Code plugin](https://img.shields.io/badge/IDE-VS_Code-blueviolet.svg)](https://marketplace.visualstudio.com/items?itemName=richardwillis.vscode-spotless-gradle)
 [![IntelliJ plugin](https://img.shields.io/badge/IDE-IntelliJ-blueviolet.svg)](https://plugins.jetbrains.com/plugin/18321-spotless-gradle)
@@ -128,10 +128,10 @@ spotless {
 ```
 
 Spotless consists of a list of formats (in the example above, `misc` and `java`), and each format has:
-- a `target` (the files to format), which you set with [`target`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/FormatExtension.html#targetExclude-java.lang.Object...-)
-- a list of `FormatterStep`, which are just `String -> String` functions, such as [`replace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`replaceRegex`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/FormatExtension.html#replaceRegex-java.lang.String-java.lang.String-java.lang.String-), [`trimTrailingWhitespace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`custom`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/FormatExtension.html#custom-java.lang.String-groovy.lang.Closure-), [`prettier`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/FormatExtension.html#eclipseWtp-com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep-), [`licenseHeader`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/FormatExtension.html#licenseHeader-java.lang.String-java.lang.String-) etc.
+- a `target` (the files to format), which you set with [`target`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/FormatExtension.html#target-java.lang.Object...-) and [`targetExclude`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/FormatExtension.html#targetExclude-java.lang.Object...-)
+- a list of `FormatterStep`, which are just `String -> String` functions, such as [`replace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`replaceRegex`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/FormatExtension.html#replaceRegex-java.lang.String-java.lang.String-java.lang.String-), [`trimTrailingWhitespace`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/FormatExtension.html#replace-java.lang.String-java.lang.CharSequence-java.lang.CharSequence-), [`custom`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/FormatExtension.html#custom-java.lang.String-groovy.lang.Closure-), [`prettier`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/FormatExtension.html#prettier--), [`eclipseWtp`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/FormatExtension.html#eclipseWtp-com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep-), [`licenseHeader`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/FormatExtension.html#licenseHeader-java.lang.String-java.lang.String-) etc.
 
-All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/FormatExtension.html), and there are many language-specific steps which live in its language-specific subclasses, which are described below.
+All the generic steps live in [`FormatExtension`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/FormatExtension.html), and there are many language-specific steps which live in its language-specific subclasses, which are described below.
 
 ### Requirements
 
@@ -144,7 +144,7 @@ Spotless requires JRE 11+ and Gradle 6.1.1 or newer.
 
 ## Java
 
-`com.diffplug.gradle.spotless.JavaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/JavaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java)
+`com.diffplug.gradle.spotless.JavaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/JavaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java)
 
 ```gradle
 spotless {
@@ -301,8 +301,8 @@ spotless {
 
 ## Groovy
 
-- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/GroovyExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java)
-- `com.diffplug.gradle.spotless.GroovyGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/GroovyGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java)
+- `com.diffplug.gradle.spotless.GroovyExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/GroovyExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java)
+- `com.diffplug.gradle.spotless.GroovyGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/GroovyGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java)
 
 Configuration for Groovy is similar to [Java](#java), in that it also supports `licenseHeader` and `importOrder`.
 
@@ -352,8 +352,8 @@ Groovy-Eclipse formatting errors/warnings lead per default to a build failure. T
 
 ## Kotlin
 
-- `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java)
-- `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java)
+- `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java)
+- `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java)
 
 ```gradle
 spotless { // if you are using build.gradle.kts, instead of 'spotless {' use:
@@ -427,7 +427,7 @@ spotless {
 
 ## Scala
 
-`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/ScalaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java)
+`com.diffplug.gradle.spotless.ScalaExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/ScalaExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ScalaExtension.java)
 
 ```gradle
 spotless {
@@ -459,7 +459,7 @@ spotless {
 
 ## C/C++
 
-`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/CppExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java)
+`com.diffplug.gradle.spotless.CppExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/CppExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/CppExtension.java)
 
 ```gradle
 spotless {
@@ -491,7 +491,7 @@ spotles {
 
 ## Python
 
-`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/PythonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PythonExtension.java)
+`com.diffplug.gradle.spotless.PythonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/PythonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PythonExtension.java)
 
 ```gradle
 spotless {
@@ -527,7 +527,7 @@ black().pathToExe('C:/myuser/.pyenv/versions/3.8.0/scripts/black.exe')
 
 ### buf
 
-`com.diffplug.gradle.spotless.ProtobufExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/ProtobufExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ProtobufExtension.java)
+`com.diffplug.gradle.spotless.ProtobufExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/ProtobufExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/ProtobufExtension.java)
 
 **WARNING** this step **must** be the first step in the chain, steps before it will be ignored. Thumbs up [this issue](https://github.com/bufbuild/buf/issues/1035) for a resolution, see [here](https://github.com/diffplug/spotless/pull/1208#discussion_r1264439669) for more details on the problem.
 
@@ -559,7 +559,7 @@ buf {
 
 ## FreshMark
 
-`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java)
+`com.diffplug.gradle.spotless.FreshMarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/FreshMarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FreshMarkExtension.java)
 
 [homepage](https://github.com/diffplug/freshmark). [changelog](https://github.com/diffplug/freshmark/blob/master/CHANGES.md). FreshMark lets you generate markdown in the comments of your markdown.  This helps to keep badges and links up-to-date (see the source for this file), and can
 also be helpful for generating complex tables (see the source for [the parent readme](../README.md)).
@@ -580,7 +580,7 @@ spotless {
 
 ## Flexmark
 
-`com.diffplug.gradle.spotless.FlexmarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/FlexmarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FlexmarkExtension.java)
+`com.diffplug.gradle.spotless.FlexmarkExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/FlexmarkExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FlexmarkExtension.java)
 
 [homepage](https://github.com/vsch/flexmark-java). Flexmark is a flexible Commonmark/Markdown parser that can be used to format Markdown files. It supports different [flavors of Markdown](https://github.com/vsch/flexmark-java#markdown-processor-emulation) and [many formatting options](https://github.com/vsch/flexmark-java/wiki/Markdown-Formatter#options).
 
@@ -599,7 +599,7 @@ spotless {
 
 ## Antlr4
 
-`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/Antlr4Extension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java)
+`com.diffplug.gradle.spotless.Antlr4Extension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/Antlr4Extension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java)
 
 ```gradle
 spotless {
@@ -624,7 +624,7 @@ antlr4formatter('1.2.1') // version is optional
 
 ## SQL
 
-`com.diffplug.gradle.spotless.SqlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/SqlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SqlExtension.java)
+`com.diffplug.gradle.spotless.SqlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/SqlExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SqlExtension.java)
 
 ```gradle
 spotless {
@@ -664,7 +664,7 @@ sql.formatter.indent.size=4
 
 ## Typescript
 
-- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/TypescriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java)
+- `com.diffplug.gradle.spotless.TypescriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/TypescriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java)
 
 ```gradle
 spotless {
@@ -758,7 +758,7 @@ For details, see the [npm detection](#npm-detection), [`.npmrc` detection](#npmr
 
 ## Javascript
 
-- `com.diffplug.gradle.spotless.JavascriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/JavascriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java)
+- `com.diffplug.gradle.spotless.JavascriptExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/JavascriptExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java)
 
 ```gradle
 spotless {
@@ -823,7 +823,7 @@ For details, see the [npm detection](#npm-detection), [`.npmrc` detection](#npmr
 
 ## JSON
 
-- `com.diffplug.gradle.spotless.JsonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java)
+- `com.diffplug.gradle.spotless.JsonExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java)
 
 ```gradle
 spotless {
@@ -943,7 +943,7 @@ spotless {
 
 ## YAML
 
-- `com.diffplug.gradle.spotless.YamlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/YamlExtension.java)
+- `com.diffplug.gradle.spotless.YamlExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/JsonExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/YamlExtension.java)
 
 ```gradle
 spotless {
@@ -975,7 +975,7 @@ spotless {
 
 ## Gherkin
 
-- `com.diffplug.gradle.spotless.GherkinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/GherkinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GherkinExtension.java)
+- `com.diffplug.gradle.spotless.GherkinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/GherkinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GherkinExtension.java)
 
 ```gradle
 spotless {
@@ -1362,7 +1362,7 @@ Once a file's license header has a valid year, whether it is a year (`2020`) or
 * `2017` -> `2017-2020`
 * `2017-2019` -> `2017-2020`
 
-See the [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/FormatExtension.LicenseHeaderConfig.html) for a complete listing of options.
+See the [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/FormatExtension.LicenseHeaderConfig.html) for a complete listing of options.
 
 <a name="retroactively-populating-year-range-from-git-history"></a>
 
@@ -1442,9 +1442,9 @@ spotless {
     custom 'lowercase', { str -> str.toLowerCase() }
 ```
 
-However, custom rules will disable up-to-date checking and caching, unless you read [this javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/FormatExtension.html#bumpThisNumberIfACustomStepChanges-int-) and follow its instructions carefully.
+However, custom rules will disable up-to-date checking and caching, unless you read [this javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/FormatExtension.html#bumpThisNumberIfACustomStepChanges-int-) and follow its instructions carefully.
 
-Another option is to create proper `FormatterStep` in your `buildSrc`, and then call [`addStep`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/FormatExtension.html#addStep-com.diffplug.spotless.FormatterStep-).  The contributing guide describes [how to do this](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep).  If the step is generally-useful, we hope you'll open a PR to share it!
+Another option is to create proper `FormatterStep` in your `buildSrc`, and then call [`addStep`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/FormatExtension.html#addStep-com.diffplug.spotless.FormatterStep-).  The contributing guide describes [how to do this](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep).  If the step is generally-useful, we hope you'll open a PR to share it!
 
 
 ```gradle
@@ -1477,11 +1477,11 @@ spotless {
   format 'foo', com.acme.FooLanguageExtension, {
 ```
 
-If you'd like to create a one-off Spotless task outside of the `check`/`apply` framework, see [`FormatExtension.createIndependentApplyTask`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/FormatExtension.html#createIndependentApplyTask-java.lang.String-).
+If you'd like to create a one-off Spotless task outside of the `check`/`apply` framework, see [`FormatExtension.createIndependentApplyTask`](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/FormatExtension.html#createIndependentApplyTask-java.lang.String-).
 
 ## Inception (languages within languages within...)
 
-In very rare cases, you might want to format e.g. javascript which is written inside JSP templates, or maybe java within a markdown file, or something wacky like that.  You can specify hunks within a file using either open/close tags or a regex with a single capturing group, and then specify rules within it, like so.  See [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.21.0/com/diffplug/gradle/spotless/FormatExtension.html#withinBlocks-java.lang.String-java.lang.String-java.lang.String-org.gradle.api.Action-) for more details.
+In very rare cases, you might want to format e.g. javascript which is written inside JSP templates, or maybe java within a markdown file, or something wacky like that.  You can specify hunks within a file using either open/close tags or a regex with a single capturing group, and then specify rules within it, like so.  See [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/com/diffplug/gradle/spotless/FormatExtension.html#withinBlocks-java.lang.String-java.lang.String-java.lang.String-org.gradle.api.Action-) for more details.
 
 ```gradle
 import com.diffplug.gradle.spotless.JavaExtension

From 9997e70cbde1ee1b09e97ad91928496d7eb5ac3f Mon Sep 17 00:00:00 2001
From: runner
 <runner@fv-az1032-962.a2cmwlnf3g0ujp1vqeksrtzoac.cx.internal.cloudapp.net>
Date: Thu, 28 Sep 2023 23:52:57 +0000
Subject: [PATCH 06/57] Published maven/2.40.0

---
 plugin-maven/CHANGES.md | 2 ++
 plugin-maven/README.md  | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index a6c98e2c96..1825628c73 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+
+## [2.40.0] - 2023-09-28
 ### Added
 * Add `-DspotlessIdeHook` that provides the ability to apply Spotless exclusively to a specified file. It accepts the absolute path of the file. ([#1782](https://github.com/diffplug/spotless/pull/1782))
   * BETA, subject to change until we have proven compatibility with some IDE plugins.
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 919a05dfbb..3294575e20 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -8,8 +8,8 @@ output = [
   ].join('\n');
 -->
 [![Maven central](https://img.shields.io/badge/mavencentral-com.diffplug.spotless%3Aspotless--maven--plugin-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-maven-plugin%22)
-[![Changelog](https://img.shields.io/badge/changelog-2.39.0-blue.svg)](CHANGES.md)
-[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.39.0/index.html)
+[![Changelog](https://img.shields.io/badge/changelog-2.40.0-blue.svg)](CHANGES.md)
+[![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.40.0/index.html)
 <!---freshmark /shields -->
 
 <!---freshmark javadoc

From 5a083a14240170bdc295396b6f02015ea8a276b7 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 29 Sep 2023 00:54:14 +0000
Subject: [PATCH 07/57] chore(deps): update plugin com.diffplug.spotless to
 v6.22.0

---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index f09ed33f57..cb2f3355a9 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -6,7 +6,7 @@ pluginManagement {
 }
 
 plugins {
-	id 'com.diffplug.spotless' version '6.21.0' apply false
+	id 'com.diffplug.spotless' version '6.22.0' apply false
 	// https://plugins.gradle.org/plugin/com.gradle.plugin-publish
 	id 'com.gradle.plugin-publish' version '1.2.1' apply false
 	// https://github.com/gradle-nexus/publish-plugin/releases

From 748ef4107cd6b36b9ce7a12690939c093364368a Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Fri, 29 Sep 2023 09:52:33 -0700
Subject: [PATCH 08/57] Fix test failures.

---
 .../gradle/spotless/SpotlessTaskImpl.java         |  2 +-
 .../gradle/spotless/SpotlessTaskService.java      | 15 +++++++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTaskImpl.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTaskImpl.java
index ab584fa7b6..04951a4577 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTaskImpl.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTaskImpl.java
@@ -48,7 +48,7 @@ public abstract class SpotlessTaskImpl extends SpotlessTask {
 
 	void init(Provider<SpotlessTaskService> service) {
 		taskServiceProvider = service;
-		usesService(service);
+		SpotlessTaskService.usesServiceTolerateTestFailure(this, service);
 		getTaskService().set(service);
 		getProjectDir().set(getProject().getProjectDir());
 	}
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTaskService.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTaskService.java
index 67de4b946c..b5a1300ead 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTaskService.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessTaskService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 DiffPlug
+ * Copyright 2021-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,6 +27,7 @@
 import org.gradle.api.file.DirectoryProperty;
 import org.gradle.api.model.ObjectFactory;
 import org.gradle.api.provider.Property;
+import org.gradle.api.provider.Provider;
 import org.gradle.api.services.BuildService;
 import org.gradle.api.services.BuildServiceParameters;
 import org.gradle.api.tasks.Internal;
@@ -91,6 +92,16 @@ public void close() throws Exception {
 
 	static String INDEPENDENT_HELPER = "Helper";
 
+	static void usesServiceTolerateTestFailure(DefaultTask task, Provider<SpotlessTaskService> serviceProvider) {
+		try {
+			task.usesService(serviceProvider);
+		} catch (ClassCastException e) {
+			// this happens only in our test mocking, e.g. DiffMessageFormatterTest
+			// https://github.com/diffplug/spotless/pull/1570/commits/c45e1f2322c78f272689feb35753bbc633422bfa
+			// it's fine to swallow these exceptions
+		}
+	}
+
 	static abstract class ClientTask extends DefaultTask {
 		@Internal
 		abstract Property<File> getSpotlessOutDirectory();
@@ -105,7 +116,7 @@ static abstract class ClientTask extends DefaultTask {
 		protected abstract ObjectFactory getConfigCacheWorkaround();
 
 		void init(SpotlessTaskImpl impl) {
-			usesService(impl.getTaskServiceProvider());
+			usesServiceTolerateTestFailure(this, impl.getTaskServiceProvider());
 			getSpotlessOutDirectory().set(impl.getOutputDirectory());
 			getTaskService().set(impl.getTaskService());
 			getProjectDir().set(impl.getProjectDir());

From 3be45c7b379f284db2f8f8e8481cfefcb8f5232e Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 29 Sep 2023 17:09:37 +0000
Subject: [PATCH 09/57] chore(deps): update dependency gradle to v8.4-rc-3

---
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 gradlew                                  | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 98ea390909..1d4d371453 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-rc-2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-rc-3-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
index 0adc8e1a53..1aa94a4269 100755
--- a/gradlew
+++ b/gradlew
@@ -145,7 +145,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -153,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -202,11 +202,11 @@ fi
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \

From 2741e57ebe72d9f136df2cfa9f740d1da6b7c041 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Sun, 1 Oct 2023 11:55:24 +0800
Subject: [PATCH 10/57] Migrate config cache flag

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index dae471f1e7..543d4cf0f1 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@
 org.gradle.jvmargs=-Xmx4g -XX:MaxMetaspaceSize=1024m -Dfile.encoding=UTF-8
 org.gradle.parallel=true
 org.gradle.caching=true
-org.gradle.unsafe.configuration-cache=true
+org.gradle.configuration-cache=true
 
 name=spotless
 description=Spotless - keep your code spotless with Gradle

From e52c46fdaf9c91b9c44350b8d9d6d7bd18e71fe4 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Sun, 1 Oct 2023 12:00:01 +0800
Subject: [PATCH 11/57] Manually declaring junit-platform-launcher

https://docs.gradle.org/8.4-rc-3/userguide/upgrading_version_8.html?#test_framework_implementation_dependencies
---
 _ext/gradle/java-setup.gradle | 1 +
 lib-extra/build.gradle        | 1 +
 plugin-gradle/build.gradle    | 1 +
 plugin-maven/build.gradle     | 1 +
 testlib/build.gradle          | 1 +
 5 files changed, 5 insertions(+)

diff --git a/_ext/gradle/java-setup.gradle b/_ext/gradle/java-setup.gradle
index d1a1075d84..0007407250 100644
--- a/_ext/gradle/java-setup.gradle
+++ b/_ext/gradle/java-setup.gradle
@@ -20,6 +20,7 @@ dependencies {
 	testImplementation "org.junit.jupiter:junit-jupiter:${VER_JUNIT}"
 	testImplementation "org.assertj:assertj-core:${VER_ASSERTJ}"
 	testImplementation projects.testlib
+	testRuntimeOnly "org.junit.platform:junit-platform-launcher"
 }
 
 tasks.withType(Test).configureEach {
diff --git a/lib-extra/build.gradle b/lib-extra/build.gradle
index 794ab515be..07135ff726 100644
--- a/lib-extra/build.gradle
+++ b/lib-extra/build.gradle
@@ -24,6 +24,7 @@ dependencies {
 	testImplementation "org.junit.jupiter:junit-jupiter:${VER_JUNIT}"
 	testImplementation "org.assertj:assertj-core:${VER_ASSERTJ}"
 	testImplementation "com.diffplug.durian:durian-testlib:${VER_DURIAN}"
+	testRuntimeOnly "org.junit.platform:junit-platform-launcher"
 }
 spotless {
 	java {
diff --git a/plugin-gradle/build.gradle b/plugin-gradle/build.gradle
index ba800173a2..9f6ff31cc9 100644
--- a/plugin-gradle/build.gradle
+++ b/plugin-gradle/build.gradle
@@ -26,6 +26,7 @@ dependencies {
 	testImplementation "org.assertj:assertj-core:${VER_ASSERTJ}"
 	testImplementation "com.diffplug.durian:durian-testlib:${VER_DURIAN}"
 	testImplementation 'org.owasp.encoder:encoder:1.2.3'
+	testRuntimeOnly "org.junit.platform:junit-platform-launcher"
 }
 
 apply from: rootProject.file('gradle/special-tests.gradle')
diff --git a/plugin-maven/build.gradle b/plugin-maven/build.gradle
index dcada0b9c9..f2f85f0383 100644
--- a/plugin-maven/build.gradle
+++ b/plugin-maven/build.gradle
@@ -56,6 +56,7 @@ dependencies {
 	testImplementation "org.eclipse.aether:aether-api:${VER_ECLIPSE_AETHER}"
 	testImplementation "org.codehaus.plexus:plexus-resources:${VER_PLEXUS_RESOURCES}"
 	testImplementation "org.apache.maven:maven-core:${VER_MAVEN_API}"
+	testRuntimeOnly "org.junit.platform:junit-platform-launcher"
 }
 
 apply from: rootProject.file('gradle/special-tests.gradle')
diff --git a/testlib/build.gradle b/testlib/build.gradle
index 12b3bcd135..a4c83cfdf4 100644
--- a/testlib/build.gradle
+++ b/testlib/build.gradle
@@ -13,6 +13,7 @@ dependencies {
 	api "org.junit.jupiter:junit-jupiter:${VER_JUNIT}"
 	api "org.assertj:assertj-core:${VER_ASSERTJ}"
 	api "org.mockito:mockito-core:$VER_MOCKITO"
+	runtimeOnly "org.junit.platform:junit-platform-launcher"
 
 	implementation "com.diffplug.durian:durian-io:${VER_DURIAN}"
 	implementation "com.diffplug.durian:durian-collect:${VER_DURIAN}"

From 101c4c9e99eef71597f61b421693de42f9bf77a9 Mon Sep 17 00:00:00 2001
From: tison <wander4096@gmail.com>
Date: Thu, 5 Oct 2023 09:33:49 +0800
Subject: [PATCH 12/57] feat: Maven plugin uses CompileSourceRoots

Signed-off-by: tison <wander4096@gmail.com>
---
 .../java/com/diffplug/spotless/maven/java/Java.java | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/Java.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/Java.java
index b0692446b7..e0ff14b51e 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/Java.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/Java.java
@@ -20,8 +20,9 @@
 import java.io.File;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Set;
-import java.util.stream.Stream;
 
 import org.apache.maven.model.Build;
 import org.apache.maven.project.MavenProject;
@@ -44,7 +45,15 @@ public class Java extends FormatterFactory {
 	public Set<String> defaultIncludes(MavenProject project) {
 		Path projectDir = project.getBasedir().toPath();
 		Build build = project.getBuild();
-		return Stream.of(build.getSourceDirectory(), build.getTestSourceDirectory())
+
+		List<String> includes = new ArrayList<>();
+		includes.add(build.getSourceDirectory());
+		includes.add(build.getTestSourceDirectory());
+		includes.addAll(project.getCompileSourceRoots());
+		includes.addAll(project.getTestCompileSourceRoots());
+
+		return includes.stream()
+				.distinct()
 				.map(Paths::get)
 				.map(projectDir::relativize)
 				.map(Java::fileMask)

From 35b731e18ca396d1449f84925e4bb2a46ff8f6d9 Mon Sep 17 00:00:00 2001
From: tison <wander4096@gmail.com>
Date: Thu, 5 Oct 2023 09:35:49 +0800
Subject: [PATCH 13/57] add CHANGELOG

Signed-off-by: tison <wander4096@gmail.com>
---
 plugin-maven/CHANGES.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 1825628c73..d86096ab05 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -4,6 +4,9 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 
+### Added
+* CompileSourceRoots and TestCompileSourceRoots are now respected as default includes. These properties are commonly set when adding extra source directories. ([#1846](https://github.com/diffplug/spotless/issues/1846))
+
 ## [2.40.0] - 2023-09-28
 ### Added
 * Add `-DspotlessIdeHook` that provides the ability to apply Spotless exclusively to a specified file. It accepts the absolute path of the file. ([#1782](https://github.com/diffplug/spotless/pull/1782))

From 22162c6f8670d7710f32781e8179842c4aaad5e6 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 5 Oct 2023 13:49:52 +0000
Subject: [PATCH 14/57] chore(deps): update plugin com.gradle.enterprise to
 v3.15.1

---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index cb2f3355a9..daa7567f1b 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -23,7 +23,7 @@ plugins {
 	// https://github.com/davidburstrom/version-compatibility-gradle-plugin/tags
 	id 'io.github.davidburstrom.version-compatibility' version '0.5.0' apply false
 	// https://plugins.gradle.org/plugin/com.gradle.enterprise
-	id 'com.gradle.enterprise' version '3.15'
+	id 'com.gradle.enterprise' version '3.15.1'
 	// https://github.com/equodev/equo-ide/blob/main/plugin-gradle/CHANGELOG.md
 	id 'dev.equo.ide' version '1.7.3' apply false
 }

From 1ce91c74ed8869f1fa9534ad002fe9d0b3976892 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Sat, 7 Oct 2023 23:30:31 +0800
Subject: [PATCH 15/57] Use List.of

---
 .../compat/KtLintCompat0Dot48Dot0Adapter.java | 20 ++++++++-----------
 .../compat/KtLintCompat0Dot49Dot0Adapter.java | 19 ++++++++----------
 .../compat/KtLintCompat0Dot50Dot0Adapter.java | 18 ++++++++---------
 .../compat/KtLintCompat1Dot0Dot0Adapter.java  | 18 ++++++++---------
 .../com/diffplug/spotless/npm/FileFinder.java |  4 ++--
 .../spotless/npm/NpmPathResolver.java         |  4 +---
 6 files changed, 35 insertions(+), 48 deletions(-)

diff --git a/lib/src/compatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java b/lib/src/compatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java
index 4ee70c6c88..418720aa59 100644
--- a/lib/src/compatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java
+++ b/lib/src/compatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java
@@ -17,8 +17,6 @@
 
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -53,17 +51,15 @@ public class KtLintCompat0Dot48Dot0Adapter implements KtLintCompatAdapter {
 	private static final List<EditorConfigProperty<?>> DEFAULT_EDITOR_CONFIG_PROPERTIES;
 
 	static {
-		List<EditorConfigProperty<?>> list = new ArrayList<>();
-		list.add(CodeStyleEditorConfigPropertyKt.getCODE_STYLE_PROPERTY());
 		//noinspection deprecation
-		list.add(DisabledRulesEditorConfigPropertyKt.getDISABLED_RULES_PROPERTY());
-		//noinspection KotlinInternalInJava,deprecation
-		list.add(DisabledRulesEditorConfigPropertyKt.getKTLINT_DISABLED_RULES_PROPERTY());
-		list.add(IndentStyleEditorConfigPropertyKt.getINDENT_STYLE_PROPERTY());
-		list.add(IndentSizeEditorConfigPropertyKt.getINDENT_SIZE_PROPERTY());
-		list.add(InsertFinalNewLineEditorConfigPropertyKt.getINSERT_FINAL_NEWLINE_PROPERTY());
-		list.add(MaxLineLengthEditorConfigPropertyKt.getMAX_LINE_LENGTH_PROPERTY());
-		DEFAULT_EDITOR_CONFIG_PROPERTIES = Collections.unmodifiableList(list);
+		DEFAULT_EDITOR_CONFIG_PROPERTIES = List.of(
+				CodeStyleEditorConfigPropertyKt.getCODE_STYLE_PROPERTY(),
+				DisabledRulesEditorConfigPropertyKt.getDISABLED_RULES_PROPERTY(),
+				DisabledRulesEditorConfigPropertyKt.getKTLINT_DISABLED_RULES_PROPERTY(),
+				IndentStyleEditorConfigPropertyKt.getINDENT_STYLE_PROPERTY(),
+				IndentSizeEditorConfigPropertyKt.getINDENT_SIZE_PROPERTY(),
+				InsertFinalNewLineEditorConfigPropertyKt.getINSERT_FINAL_NEWLINE_PROPERTY(),
+				MaxLineLengthEditorConfigPropertyKt.getMAX_LINE_LENGTH_PROPERTY());
 	}
 
 	static class FormatterCallback implements Function2<LintError, Boolean, Unit> {
diff --git a/lib/src/compatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0Adapter.java b/lib/src/compatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0Adapter.java
index b391c7b740..ad228c131d 100644
--- a/lib/src/compatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0Adapter.java
+++ b/lib/src/compatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0Adapter.java
@@ -19,8 +19,6 @@
 import java.lang.reflect.Method;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -61,15 +59,14 @@ public class KtLintCompat0Dot49Dot0Adapter implements KtLintCompatAdapter {
 	private static final List<EditorConfigProperty<?>> DEFAULT_EDITOR_CONFIG_PROPERTIES;
 
 	static {
-		List<EditorConfigProperty<?>> list = new ArrayList<>();
-		list.add(CodeStyleEditorConfigPropertyKt.getCODE_STYLE_PROPERTY());
-		list.add(EndOfLinePropertyKt.getEND_OF_LINE_PROPERTY());
-		list.add(IndentSizeEditorConfigPropertyKt.getINDENT_SIZE_PROPERTY());
-		list.add(IndentStyleEditorConfigPropertyKt.getINDENT_STYLE_PROPERTY());
-		list.add(InsertFinalNewLineEditorConfigPropertyKt.getINSERT_FINAL_NEWLINE_PROPERTY());
-		list.add(MaxLineLengthEditorConfigPropertyKt.getMAX_LINE_LENGTH_PROPERTY());
-		list.add(RuleExecutionEditorConfigPropertyKt.getEXPERIMENTAL_RULES_EXECUTION_PROPERTY());
-		DEFAULT_EDITOR_CONFIG_PROPERTIES = Collections.unmodifiableList(list);
+		DEFAULT_EDITOR_CONFIG_PROPERTIES = List.of(
+				CodeStyleEditorConfigPropertyKt.getCODE_STYLE_PROPERTY(),
+				EndOfLinePropertyKt.getEND_OF_LINE_PROPERTY(),
+				IndentSizeEditorConfigPropertyKt.getINDENT_SIZE_PROPERTY(),
+				IndentStyleEditorConfigPropertyKt.getINDENT_STYLE_PROPERTY(),
+				InsertFinalNewLineEditorConfigPropertyKt.getINSERT_FINAL_NEWLINE_PROPERTY(),
+				MaxLineLengthEditorConfigPropertyKt.getMAX_LINE_LENGTH_PROPERTY(),
+				RuleExecutionEditorConfigPropertyKt.getEXPERIMENTAL_RULES_EXECUTION_PROPERTY());
 	}
 
 	private static final Method RULEID_METHOD;
diff --git a/lib/src/compatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0Adapter.java b/lib/src/compatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0Adapter.java
index 22333392c1..f7c61439de 100644
--- a/lib/src/compatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0Adapter.java
+++ b/lib/src/compatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0Adapter.java
@@ -17,7 +17,6 @@
 
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -61,15 +60,14 @@ public class KtLintCompat0Dot50Dot0Adapter implements KtLintCompatAdapter {
 	private static final List<EditorConfigProperty<?>> DEFAULT_EDITOR_CONFIG_PROPERTIES;
 
 	static {
-		List<EditorConfigProperty<?>> list = new ArrayList<>();
-		list.add(CodeStyleEditorConfigPropertyKt.getCODE_STYLE_PROPERTY());
-		list.add(EndOfLinePropertyKt.getEND_OF_LINE_PROPERTY());
-		list.add(IndentSizeEditorConfigPropertyKt.getINDENT_SIZE_PROPERTY());
-		list.add(IndentStyleEditorConfigPropertyKt.getINDENT_STYLE_PROPERTY());
-		list.add(InsertFinalNewLineEditorConfigPropertyKt.getINSERT_FINAL_NEWLINE_PROPERTY());
-		list.add(MaxLineLengthEditorConfigPropertyKt.getMAX_LINE_LENGTH_PROPERTY());
-		list.add(RuleExecutionEditorConfigPropertyKt.getEXPERIMENTAL_RULES_EXECUTION_PROPERTY());
-		DEFAULT_EDITOR_CONFIG_PROPERTIES = Collections.unmodifiableList(list);
+		DEFAULT_EDITOR_CONFIG_PROPERTIES = List.of(
+				CodeStyleEditorConfigPropertyKt.getCODE_STYLE_PROPERTY(),
+				EndOfLinePropertyKt.getEND_OF_LINE_PROPERTY(),
+				IndentSizeEditorConfigPropertyKt.getINDENT_SIZE_PROPERTY(),
+				IndentStyleEditorConfigPropertyKt.getINDENT_STYLE_PROPERTY(),
+				InsertFinalNewLineEditorConfigPropertyKt.getINSERT_FINAL_NEWLINE_PROPERTY(),
+				MaxLineLengthEditorConfigPropertyKt.getMAX_LINE_LENGTH_PROPERTY(),
+				RuleExecutionEditorConfigPropertyKt.getEXPERIMENTAL_RULES_EXECUTION_PROPERTY());
 	}
 
 	static class FormatterCallback implements Function2<LintError, Boolean, Unit> {
diff --git a/lib/src/compatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0Adapter.java b/lib/src/compatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0Adapter.java
index 9c2792f769..119cb86373 100644
--- a/lib/src/compatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0Adapter.java
+++ b/lib/src/compatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0Adapter.java
@@ -17,7 +17,6 @@
 
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -61,15 +60,14 @@ public class KtLintCompat1Dot0Dot0Adapter implements KtLintCompatAdapter {
 	private static final List<EditorConfigProperty<?>> DEFAULT_EDITOR_CONFIG_PROPERTIES;
 
 	static {
-		List<EditorConfigProperty<?>> list = new ArrayList<>();
-		list.add(CodeStyleEditorConfigPropertyKt.getCODE_STYLE_PROPERTY());
-		list.add(EndOfLinePropertyKt.getEND_OF_LINE_PROPERTY());
-		list.add(IndentSizeEditorConfigPropertyKt.getINDENT_SIZE_PROPERTY());
-		list.add(IndentStyleEditorConfigPropertyKt.getINDENT_STYLE_PROPERTY());
-		list.add(InsertFinalNewLineEditorConfigPropertyKt.getINSERT_FINAL_NEWLINE_PROPERTY());
-		list.add(MaxLineLengthEditorConfigPropertyKt.getMAX_LINE_LENGTH_PROPERTY());
-		list.add(RuleExecutionEditorConfigPropertyKt.getEXPERIMENTAL_RULES_EXECUTION_PROPERTY());
-		DEFAULT_EDITOR_CONFIG_PROPERTIES = Collections.unmodifiableList(list);
+		DEFAULT_EDITOR_CONFIG_PROPERTIES = List.of(
+				CodeStyleEditorConfigPropertyKt.getCODE_STYLE_PROPERTY(),
+				EndOfLinePropertyKt.getEND_OF_LINE_PROPERTY(),
+				IndentSizeEditorConfigPropertyKt.getINDENT_SIZE_PROPERTY(),
+				IndentStyleEditorConfigPropertyKt.getINDENT_STYLE_PROPERTY(),
+				InsertFinalNewLineEditorConfigPropertyKt.getINSERT_FINAL_NEWLINE_PROPERTY(),
+				MaxLineLengthEditorConfigPropertyKt.getMAX_LINE_LENGTH_PROPERTY(),
+				RuleExecutionEditorConfigPropertyKt.getEXPERIMENTAL_RULES_EXECUTION_PROPERTY());
 	}
 
 	static class FormatterCallback implements Function2<LintError, Boolean, Unit> {
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/FileFinder.java b/lib/src/main/java/com/diffplug/spotless/npm/FileFinder.java
index 76016d68db..fce1497de6 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/FileFinder.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/FileFinder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 DiffPlug
+ * Copyright 2020-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,7 +28,7 @@ class FileFinder {
 	private final List<Supplier<Optional<File>>> fileCandidateFinders;
 
 	private FileFinder(Builder builder) {
-		this.fileCandidateFinders = Collections.unmodifiableList(new ArrayList<>(builder.candidateFinders));
+		this.fileCandidateFinders = List.copyOf(builder.candidateFinders);
 	}
 
 	static Builder finderForFilename(String fileName) {
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/NpmPathResolver.java b/lib/src/main/java/com/diffplug/spotless/npm/NpmPathResolver.java
index 4759d2f914..1a7db1c9b8 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/NpmPathResolver.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/NpmPathResolver.java
@@ -16,8 +16,6 @@
 package com.diffplug.spotless.npm;
 
 import java.io.File;
-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 
@@ -35,7 +33,7 @@ public NpmPathResolver(File explicitNpmExecutable, File explicitNodeExecutable,
 		this.explicitNpmExecutable = explicitNpmExecutable;
 		this.explicitNodeExecutable = explicitNodeExecutable;
 		this.explicitNpmrcFile = explicitNpmrcFile;
-		this.additionalNpmrcLocations = Collections.unmodifiableList(new ArrayList<>(additionalNpmrcLocations));
+		this.additionalNpmrcLocations = List.copyOf(additionalNpmrcLocations);
 	}
 
 	/**

From 0189f717ee13acdb00745bffa86c6ed4ede53ef2 Mon Sep 17 00:00:00 2001
From: Andrew Aylett <andrew@aylett.co.uk>
Date: Sun, 29 Oct 2023 17:26:46 +0000
Subject: [PATCH 16/57] Add <p> tags to Javadoc comments

A blank line in Javadoc will not break a paragraph.
---
 .../extra/GitAttributesLineEndings.java       |  2 +-
 .../spotless/extra/GitWorkarounds.java        | 10 +++----
 .../extra/cpp/EclipseCdtFormatterStep.java    |  2 +-
 .../integration/DiffMessageFormatter.java     |  6 ++---
 ...GrEclipseFormatterStepSpecialCaseTest.java |  2 +-
 .../diffplug/spotless/FeatureClassLoader.java |  2 +-
 .../com/diffplug/spotless/ForeignExe.java     |  4 +--
 .../spotless/FormatExceptionPolicy.java       |  4 +--
 .../java/com/diffplug/spotless/Formatter.java |  2 +-
 .../com/diffplug/spotless/FormatterFunc.java  |  4 +--
 .../com/diffplug/spotless/FormatterStep.java  |  4 +--
 .../diffplug/spotless/FormatterStepImpl.java  |  2 +-
 .../java/com/diffplug/spotless/JarState.java  |  2 +-
 .../spotless/LazyForwardingEquality.java      |  4 +--
 .../java/com/diffplug/spotless/NoLambda.java  |  8 +++---
 .../com/diffplug/spotless/PaddedCell.java     |  8 +++---
 .../com/diffplug/spotless/ProcessRunner.java  |  4 +--
 .../com/diffplug/spotless/ThrowingEx.java     |  6 ++---
 .../spotless/annotations/Internal.java        |  4 +--
 .../diffplug/spotless/npm/JsonEscaper.java    |  4 +--
 .../spotless/sql/dbeaver/DBPKeywordType.java  |  4 +--
 .../DBeaverSQLFormatterConfiguration.java     |  6 ++---
 .../diffplug/spotless/sql/dbeaver/Pair.java   |  4 +--
 .../spotless/sql/dbeaver/SQLConstants.java    |  4 +--
 .../spotless/sql/dbeaver/SQLDialect.java      |  4 +--
 .../sql/dbeaver/SQLTokenizedFormatter.java    |  6 ++---
 .../spotless/sql/dbeaver/SQLTokensParser.java |  4 +--
 .../spotless/sql/dbeaver/TokenType.java       |  4 +--
 .../gradle/spotless/FormatExtension.java      | 26 +++++++++----------
 .../gradle/spotless/JavaExtension.java        |  4 +--
 .../spotless/RegisterDependenciesTask.java    |  2 +-
 .../gradle/spotless/SpotlessExtension.java    |  2 +-
 .../spotless/GradleIntegrationHarness.java    |  4 +--
 .../maven/MavenIntegrationHarness.java        |  4 +--
 .../diffplug/spotless/TestProvisioner.java    |  4 +--
 35 files changed, 83 insertions(+), 83 deletions(-)

diff --git a/lib-extra/src/main/java/com/diffplug/spotless/extra/GitAttributesLineEndings.java b/lib-extra/src/main/java/com/diffplug/spotless/extra/GitAttributesLineEndings.java
index 3be75637be..93a95bd6ac 100644
--- a/lib-extra/src/main/java/com/diffplug/spotless/extra/GitAttributesLineEndings.java
+++ b/lib-extra/src/main/java/com/diffplug/spotless/extra/GitAttributesLineEndings.java
@@ -246,7 +246,7 @@ static class Runtime {
 
 		/**
 		 * Default line ending, determined in this order (paths are a teensy different platform to platform).
-		 *
+		 * <p>
 		 * - .git/config (per-repo)
 		 * - ~/.gitconfig (per-user)
 		 * - /etc/gitconfig (system-wide)
diff --git a/lib-extra/src/main/java/com/diffplug/spotless/extra/GitWorkarounds.java b/lib-extra/src/main/java/com/diffplug/spotless/extra/GitWorkarounds.java
index 70f0b9cb99..94065f0059 100644
--- a/lib-extra/src/main/java/com/diffplug/spotless/extra/GitWorkarounds.java
+++ b/lib-extra/src/main/java/com/diffplug/spotless/extra/GitWorkarounds.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2022 DiffPlug
+ * Copyright 2020-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -42,7 +42,7 @@ private GitWorkarounds() {}
 
 	/**
 	 * Finds the .git directory for the given project directory.
-	 *
+	 * <p>
 	 * Ordinarily one would just use JGit for this, but it doesn't support worktrees properly.
 	 * So this applies an additional workaround for that.
 	 *
@@ -55,7 +55,7 @@ private GitWorkarounds() {}
 
 	/**
 	 * Creates a {@link RepositorySpecificResolver} for the given project directory.
-	 *
+	 * <p>
 	 * This applies a workaround for JGit not supporting worktrees properly.
 	 *
 	 * @param projectDir the project directory.
@@ -67,7 +67,7 @@ static RepositorySpecificResolver fileRepositoryResolverForProject(File projectD
 
 	/**
 	 * Creates a {@link RepositorySpecificResolver} for the given project directory.
-	 *
+	 * <p>
 	 * This applies a workaround for JGit not supporting worktrees properly.
 	 *
 	 * @param projectDir the project directory.
@@ -86,7 +86,7 @@ static RepositorySpecificResolver fileRepositoryResolverForProject(File projectD
 
 	/**
 	 * Piggyback on the {@link FileRepositoryBuilder} mechanics for finding the git directory.
-	 *
+	 * <p>
 	 * Here we take into account that git repositories can share a common directory. This directory
 	 * will contain ./config ./objects/, ./info/, and ./refs/.
 	 */
diff --git a/lib-extra/src/main/java/com/diffplug/spotless/extra/cpp/EclipseCdtFormatterStep.java b/lib-extra/src/main/java/com/diffplug/spotless/extra/cpp/EclipseCdtFormatterStep.java
index bcbb58c0f6..8767b68dfe 100644
--- a/lib-extra/src/main/java/com/diffplug/spotless/extra/cpp/EclipseCdtFormatterStep.java
+++ b/lib-extra/src/main/java/com/diffplug/spotless/extra/cpp/EclipseCdtFormatterStep.java
@@ -27,7 +27,7 @@
 
 /**
  * Formatter step which calls out to the Eclipse CDT formatter.
- *
+ * <p>
  * Eclipse-CDT <code>org.eclipse.core.contenttype.contentTypes</code>
  * extension <code>cSource</code>, <code>cHeader</code>, <code>cxxSource</code> and <code>cxxHeader</code>.
  * can handle: "c", "h", "C", "cpp", "cxx", "cc", "c++", "h", "hpp", "hh", "hxx", "inc"
diff --git a/lib-extra/src/main/java/com/diffplug/spotless/extra/integration/DiffMessageFormatter.java b/lib-extra/src/main/java/com/diffplug/spotless/extra/integration/DiffMessageFormatter.java
index 55336e8c04..d43478c0b6 100644
--- a/lib-extra/src/main/java/com/diffplug/spotless/extra/integration/DiffMessageFormatter.java
+++ b/lib-extra/src/main/java/com/diffplug/spotless/extra/integration/DiffMessageFormatter.java
@@ -249,9 +249,9 @@ private String diff(File file) throws IOException {
 
 	/**
 	 * Returns a git-style diff between the two unix strings.
-	 *
+	 * <p>
 	 * Output has no trailing newlines.
-	 *
+	 * <p>
 	 * Boolean args determine whether whitespace or line endings will be visible.
 	 */
 	private static String diffWhitespaceLineEndings(String dirty, String clean, boolean whitespace, boolean lineEndings) throws IOException {
@@ -278,7 +278,7 @@ private static String diffWhitespaceLineEndings(String dirty, String clean, bool
 
 	/**
 	 * Makes the whitespace and/or the lineEndings visible.
-	 *
+	 * <p>
 	 * MyersDiff wants inputs with only unix line endings.  So this ensures that that is the case.
 	 */
 	private static String visibleWhitespaceLineEndings(String input, boolean whitespace, boolean lineEndings) {
diff --git a/lib-extra/src/test/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStepSpecialCaseTest.java b/lib-extra/src/test/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStepSpecialCaseTest.java
index 25a269834c..0702881ef9 100644
--- a/lib-extra/src/test/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStepSpecialCaseTest.java
+++ b/lib-extra/src/test/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStepSpecialCaseTest.java
@@ -24,7 +24,7 @@
 public class GrEclipseFormatterStepSpecialCaseTest {
 	/**
 	 * https://github.com/diffplug/spotless/issues/1657
-	 *
+	 * <p>
 	 * broken: ${parm == null ? "" : "<tag>$parm</tag>"}
 	 *  works: ${parm == null ? "" : "<tag>parm</tag>"}
 	 */
diff --git a/lib/src/main/java/com/diffplug/spotless/FeatureClassLoader.java b/lib/src/main/java/com/diffplug/spotless/FeatureClassLoader.java
index d07e7e4324..0eb5aa4d2e 100644
--- a/lib/src/main/java/com/diffplug/spotless/FeatureClassLoader.java
+++ b/lib/src/main/java/com/diffplug/spotless/FeatureClassLoader.java
@@ -34,7 +34,7 @@
  * but linked against the `Url[]`. This allows us to ship classfiles which function as glue
  * code but delay linking/definition to runtime after the user has specified which version
  * of the formatter they want.
- *
+ * <p>
  *  For `"org.slf4j.` and (`com.diffplug.spotless.` but not `com.diffplug.spotless.extra.`)
  * 	the classes are loaded from the buildToolClassLoader.
  */
diff --git a/lib/src/main/java/com/diffplug/spotless/ForeignExe.java b/lib/src/main/java/com/diffplug/spotless/ForeignExe.java
index d1f8abd3ee..4cb15d1a8a 100644
--- a/lib/src/main/java/com/diffplug/spotless/ForeignExe.java
+++ b/lib/src/main/java/com/diffplug/spotless/ForeignExe.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 DiffPlug
+ * Copyright 2020-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,7 +27,7 @@
  * Finds a foreign executable and checks its version.
  * If either part of that fails, it shows you why
  * and helps you fix it.
- *
+ * <p>
  * Usage: {@code ForeignExe.nameAndVersion("grep", "2.5.7").confirmVersionAndGetAbsolutePath()}
  * will find grep, confirm that it is version 2.5.7, and then return.
  */
diff --git a/lib/src/main/java/com/diffplug/spotless/FormatExceptionPolicy.java b/lib/src/main/java/com/diffplug/spotless/FormatExceptionPolicy.java
index da23f74432..50f49e41db 100644
--- a/lib/src/main/java/com/diffplug/spotless/FormatExceptionPolicy.java
+++ b/lib/src/main/java/com/diffplug/spotless/FormatExceptionPolicy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@ public interface FormatExceptionPolicy extends Serializable, NoLambda {
 
 	/**
 	 * Returns a byte array representation of everything inside this {@code FormatExceptionPolicy}.
-	 *
+	 * <p>
 	 * The main purpose of this method is to ensure one can't instantiate this class with lambda
 	 * expressions, which are notoriously difficult to serialize and deserialize properly.
 	 */
diff --git a/lib/src/main/java/com/diffplug/spotless/Formatter.java b/lib/src/main/java/com/diffplug/spotless/Formatter.java
index 46793e24f6..68d9c443bf 100644
--- a/lib/src/main/java/com/diffplug/spotless/Formatter.java
+++ b/lib/src/main/java/com/diffplug/spotless/Formatter.java
@@ -193,7 +193,7 @@ public void applyTo(File file) throws IOException {
 
 	/**
 	 * Applies formatting to the given file.
-	 *
+	 * <p>
 	 * Returns null if the file was already clean, or the
 	 * formatted result with unix newlines if it was not.
 	 */
diff --git a/lib/src/main/java/com/diffplug/spotless/FormatterFunc.java b/lib/src/main/java/com/diffplug/spotless/FormatterFunc.java
index 14b407a2eb..acd05e031b 100644
--- a/lib/src/main/java/com/diffplug/spotless/FormatterFunc.java
+++ b/lib/src/main/java/com/diffplug/spotless/FormatterFunc.java
@@ -42,11 +42,11 @@ interface Closeable extends FormatterFunc, AutoCloseable {
 
 		/**
 		 * Dangerous way to create a {@link Closeable} from an AutoCloseable and a function.
-		 *
+		 * <p>
 		 * It's important for FormatterStep's to allocate their resources as lazily as possible.
 		 * It's easy to create a resource inside the state, and not realize that it may not be
 		 * released.  It's far better to use one of the non-deprecated {@code of()} methods below.
-		 *
+		 * <p>
 		 * The bug (and its fix) which is easy to write using this method: https://github.com/diffplug/spotless/commit/7f16ecca031810b5e6e6f647e1f10a6d2152d9f4
 		 * How the {@code of()} methods below make the correct thing easier to write and safer: https://github.com/diffplug/spotless/commit/18c10f9c93d6f18f753233d0b5f028d5f0961916
 		 */
diff --git a/lib/src/main/java/com/diffplug/spotless/FormatterStep.java b/lib/src/main/java/com/diffplug/spotless/FormatterStep.java
index 5f6ec168d4..d94bd952b0 100644
--- a/lib/src/main/java/com/diffplug/spotless/FormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/FormatterStep.java
@@ -23,7 +23,7 @@
 
 /**
  * An implementation of this class specifies a single step in a formatting process.
- *
+ * <p>
  * The input is guaranteed to have unix-style newlines, and the output is required
  * to not introduce any windows-style newlines as well.
  */
@@ -75,7 +75,7 @@ public default FormatterStep filterByContent(OnMatch onMatch, String contentPatt
 	/**
 	 * Returns a new FormatterStep which will only apply its changes
 	 * to files which pass the given filter.
-	 *
+	 * <p>
 	 * The provided filter must be serializable.
 	 */
 	public default FormatterStep filterByFile(SerializableFileFilter filter) {
diff --git a/lib/src/main/java/com/diffplug/spotless/FormatterStepImpl.java b/lib/src/main/java/com/diffplug/spotless/FormatterStepImpl.java
index 17b62e75c6..869e7b7966 100644
--- a/lib/src/main/java/com/diffplug/spotless/FormatterStepImpl.java
+++ b/lib/src/main/java/com/diffplug/spotless/FormatterStepImpl.java
@@ -27,7 +27,7 @@
 /**
  * Standard implementation of FormatExtension which cleanly enforces
  * separation of serializable configuration and a pure format function.
- *
+ * <p>
  * Not an inner-class of FormatterStep so that it can stay entirely private
  * from the API.
  */
diff --git a/lib/src/main/java/com/diffplug/spotless/JarState.java b/lib/src/main/java/com/diffplug/spotless/JarState.java
index afd7c1ddf2..48686c49f8 100644
--- a/lib/src/main/java/com/diffplug/spotless/JarState.java
+++ b/lib/src/main/java/com/diffplug/spotless/JarState.java
@@ -32,7 +32,7 @@
  * Grabs a jar and its dependencies from maven,
  * and makes it easy to access the collection in
  * a classloader.
- *
+ * <p>
  * Serializes the full state of the jar, so it can
  * catch changes in a SNAPSHOT version.
  */
diff --git a/lib/src/main/java/com/diffplug/spotless/LazyForwardingEquality.java b/lib/src/main/java/com/diffplug/spotless/LazyForwardingEquality.java
index e2d6ba8988..8727be3a3c 100644
--- a/lib/src/main/java/com/diffplug/spotless/LazyForwardingEquality.java
+++ b/lib/src/main/java/com/diffplug/spotless/LazyForwardingEquality.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 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 abstract class LazyForwardingEquality<T extends Serializable> implements
 	/**
 	 * This function is guaranteed to be called at most once.
 	 * If the state is never required, then it will never be called at all.
-	 *
+	 * <p>
 	 * Throws exception because it's likely that there will be some IO going on.
 	 */
 	protected abstract T calculateState() throws Exception;
diff --git a/lib/src/main/java/com/diffplug/spotless/NoLambda.java b/lib/src/main/java/com/diffplug/spotless/NoLambda.java
index ce326a6ceb..d2ca6c1401 100644
--- a/lib/src/main/java/com/diffplug/spotless/NoLambda.java
+++ b/lib/src/main/java/com/diffplug/spotless/NoLambda.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,12 +21,12 @@
 /**
  * Marker interface to prevent lambda implementations of
  * single-method interfaces that require serializability.
- *
+ * <p>
  * In order for Spotless to support up-to-date checks, all
  * of its parameters must be {@link Serializable} so that
  * entries can be written to file, and they must implement
  * equals and hashCode correctly.
- *
+ * <p>
  * This interface and its standard implementation,
  * {@link EqualityBasedOnSerialization}, are a quick way
  * to accomplish these goals.
@@ -34,7 +34,7 @@
 public interface NoLambda extends Serializable {
 	/**
 	 * Returns a byte array representation of everything inside this {@code SerializableFileFilter}.
-	 *
+	 * <p>
 	 * The main purpose of this method is to ensure one can't instantiate this class with lambda
 	 * expressions, which are notoriously difficult to serialize and deserialize properly. (See
 	 * {@code SerializableFileFilterImpl.SkipFilesNamed} for an example of how to make a serializable
diff --git a/lib/src/main/java/com/diffplug/spotless/PaddedCell.java b/lib/src/main/java/com/diffplug/spotless/PaddedCell.java
index 91914b7908..910fa940d3 100644
--- a/lib/src/main/java/com/diffplug/spotless/PaddedCell.java
+++ b/lib/src/main/java/com/diffplug/spotless/PaddedCell.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,7 +34,7 @@
 /**
  * Models the result of applying a {@link Formatter} on a given {@link File}
  * while characterizing various failure modes (slow convergence, cycles, and divergence).
- *
+ * <p>
  * See {@link #check(Formatter, File)} as the entry point to this class.
  */
 public final class PaddedCell {
@@ -78,9 +78,9 @@ public List<String> steps() {
 	/**
 	 * Applies the given formatter to the given file, checking that
 	 * F(F(input)) == F(input).
-	 *
+	 * <p>
 	 * If it meets this test, {@link #misbehaved()} will return false.
-	 *
+	 * <p>
 	 * If it fails the test, {@link #misbehaved()} will return true, and you can find
 	 * out more about the misbehavior based on its {@link Type}.
 	 *
diff --git a/lib/src/main/java/com/diffplug/spotless/ProcessRunner.java b/lib/src/main/java/com/diffplug/spotless/ProcessRunner.java
index 4e48042184..48307d7d3a 100644
--- a/lib/src/main/java/com/diffplug/spotless/ProcessRunner.java
+++ b/lib/src/main/java/com/diffplug/spotless/ProcessRunner.java
@@ -43,7 +43,7 @@
  * Shelling out to a process is harder than it ought to be in Java.
  * If you don't read stdout and stderr on their own threads, you risk
  * deadlock on a clogged buffer.
- *
+ * <p>
  * ProcessRunner allocates two threads specifically for the purpose of
  * flushing stdout and stderr to buffers.  These threads will remain alive until
  * the ProcessRunner is closed, so it is especially useful for repeated
@@ -239,7 +239,7 @@ public boolean exitNotZero() {
 		/**
 		 * Asserts that the exit code was zero, and if so, returns
 		 * the content of stdout encoded with the given charset.
-		 *
+		 * <p>
 		 * If the exit code was not zero, throws an exception
 		 * with useful debugging information.
 		 */
diff --git a/lib/src/main/java/com/diffplug/spotless/ThrowingEx.java b/lib/src/main/java/com/diffplug/spotless/ThrowingEx.java
index f664c62bf3..6eb573b5d8 100644
--- a/lib/src/main/java/com/diffplug/spotless/ThrowingEx.java
+++ b/lib/src/main/java/com/diffplug/spotless/ThrowingEx.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@
 /**
  * Basic functional interfaces which throw exception, along with
  * static helper methods for calling them.
- *
+ * <p>
  * Contains most of the functionality of Durian's Throwing and Errors
  * classes, but stripped down and renamed to avoid any confusion.
  */
@@ -80,7 +80,7 @@ public static <T, R> java.util.function.Function<T, R> wrap(ThrowingEx.Function<
 
 	/**
 	 * Casts or wraps the given exception to be a RuntimeException.
-	 *
+	 * <p>
 	 * If the input exception is a RuntimeException, it is simply
 	 * cast and returned.  Otherwise, it wrapped in a
 	 * {@link WrappedAsRuntimeException} and returned.
diff --git a/lib/src/main/java/com/diffplug/spotless/annotations/Internal.java b/lib/src/main/java/com/diffplug/spotless/annotations/Internal.java
index 77a318f268..d87265fe2d 100644
--- a/lib/src/main/java/com/diffplug/spotless/annotations/Internal.java
+++ b/lib/src/main/java/com/diffplug/spotless/annotations/Internal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@
 /**
  * Signifies that a {@code public} API is actually an implementation detail, and should be treated as if it
  * were {@code private}.
- *
+ * <p>
  * The user of the API should be warned that it may unexpectedly disappear in future versions of
  * Spotless. Usually the best place to put this warning is in the API's class JavaDoc.
  */
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/JsonEscaper.java b/lib/src/main/java/com/diffplug/spotless/npm/JsonEscaper.java
index 3ac20d892b..848dd030dd 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/JsonEscaper.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/JsonEscaper.java
@@ -60,7 +60,7 @@ private static String jsonEscape(JsonRawValue jsonRawValue) {
 	private static String jsonEscape(String unescaped) {
 		/**
 		 * the following characters are reserved in JSON and must be properly escaped to be used in strings:
-		 *
+		 * <p>
 		 * Backspace is replaced with \b
 		 * Form feed is replaced with \f
 		 * Newline is replaced with \n
@@ -68,7 +68,7 @@ private static String jsonEscape(String unescaped) {
 		 * Tab is replaced with \t
 		 * Double quote is replaced with \"
 		 * Backslash is replaced with \\
-		 *
+		 * <p>
 		 * additionally we handle xhtml '</bla>' string
 		 * and non-ascii chars
 		 */
diff --git a/lib/src/main/java/com/diffplug/spotless/sql/dbeaver/DBPKeywordType.java b/lib/src/main/java/com/diffplug/spotless/sql/dbeaver/DBPKeywordType.java
index 93c9afb5f8..d31b7520f7 100644
--- a/lib/src/main/java/com/diffplug/spotless/sql/dbeaver/DBPKeywordType.java
+++ b/lib/src/main/java/com/diffplug/spotless/sql/dbeaver/DBPKeywordType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  * Forked from
  * DBeaver - Universal Database Manager
  * Copyright (C) 2010-2017 Serge Rider (serge@jkiss.org)
- *
+ * <p>
  * Based on DBPKeywordType from https://github.com/serge-rider/dbeaver,
  * which itself is licensed under the Apache 2.0 license.
  */
diff --git a/lib/src/main/java/com/diffplug/spotless/sql/dbeaver/DBeaverSQLFormatterConfiguration.java b/lib/src/main/java/com/diffplug/spotless/sql/dbeaver/DBeaverSQLFormatterConfiguration.java
index f488bd5a00..58a0119a7f 100644
--- a/lib/src/main/java/com/diffplug/spotless/sql/dbeaver/DBeaverSQLFormatterConfiguration.java
+++ b/lib/src/main/java/com/diffplug/spotless/sql/dbeaver/DBeaverSQLFormatterConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,11 +22,11 @@
 /**
  * **Warning:** Use this class at your own risk. It is an implementation detail and is not
  * guaranteed to exist in future versions.
- *
+ * <p>
  * Forked from
  * DBeaver - Universal Database Manager
  * Copyright (C) 2010-2017 Serge Rider (serge@jkiss.org)
- *
+ * <p>
  * Based on SQLFormatterConfiguration from https://github.com/serge-rider/dbeaver,
  * which itself is licensed under the Apache 2.0 license.
  */
diff --git a/lib/src/main/java/com/diffplug/spotless/sql/dbeaver/Pair.java b/lib/src/main/java/com/diffplug/spotless/sql/dbeaver/Pair.java
index c06ea5a1c0..4ab9f54a0b 100644
--- a/lib/src/main/java/com/diffplug/spotless/sql/dbeaver/Pair.java
+++ b/lib/src/main/java/com/diffplug/spotless/sql/dbeaver/Pair.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  * Forked from
  * DBeaver - Universal Database Manager
  * Copyright (C) 2010-2017 Serge Rider (serge@jkiss.org)
- *
+ * <p>
  * Based on Pair from https://github.com/serge-rider/dbeaver,
  * which itself is licensed under the Apache 2.0 license.
  */
diff --git a/lib/src/main/java/com/diffplug/spotless/sql/dbeaver/SQLConstants.java b/lib/src/main/java/com/diffplug/spotless/sql/dbeaver/SQLConstants.java
index 2dc0b61aa0..698c87458f 100644
--- a/lib/src/main/java/com/diffplug/spotless/sql/dbeaver/SQLConstants.java
+++ b/lib/src/main/java/com/diffplug/spotless/sql/dbeaver/SQLConstants.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  * Forked from
  * DBeaver - Universal Database Manager
  * Copyright (C) 2010-2017 Serge Rider (serge@jkiss.org)
- *
+ * <p>
  * Based on SQLConstants from https://github.com/serge-rider/dbeaver,
  * which itself is licensed under the Apache 2.0 license.
  */
diff --git a/lib/src/main/java/com/diffplug/spotless/sql/dbeaver/SQLDialect.java b/lib/src/main/java/com/diffplug/spotless/sql/dbeaver/SQLDialect.java
index 3c973885f6..daabd5386b 100644
--- a/lib/src/main/java/com/diffplug/spotless/sql/dbeaver/SQLDialect.java
+++ b/lib/src/main/java/com/diffplug/spotless/sql/dbeaver/SQLDialect.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,7 +27,7 @@
  * Forked from
  * DBeaver - Universal Database Manager
  * Copyright (C) 2010-2017 Serge Rider (serge@jkiss.org)
- *
+ * <p>
  * Based on SQLDialect from https://github.com/serge-rider/dbeaver,
  * which itself is licensed under the Apache 2.0 license.
  */
diff --git a/lib/src/main/java/com/diffplug/spotless/sql/dbeaver/SQLTokenizedFormatter.java b/lib/src/main/java/com/diffplug/spotless/sql/dbeaver/SQLTokenizedFormatter.java
index f2c98eebc1..01f0fd759e 100644
--- a/lib/src/main/java/com/diffplug/spotless/sql/dbeaver/SQLTokenizedFormatter.java
+++ b/lib/src/main/java/com/diffplug/spotless/sql/dbeaver/SQLTokenizedFormatter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,11 +25,11 @@
 /**
  * **Warning:** Use this class at your own risk. It is an implementation detail and is not
  * guaranteed to exist in future versions.
- *
+ * <p>
  * Forked from
  * DBeaver - Universal Database Manager
  * Copyright (C) 2010-2017 Serge Rider (serge@jkiss.org)
- *
+ * <p>
  * Based on SQLTokenizedFormatter from https://github.com/serge-rider/dbeaver,
  * which itself is licensed under the Apache 2.0 license.
  */
diff --git a/lib/src/main/java/com/diffplug/spotless/sql/dbeaver/SQLTokensParser.java b/lib/src/main/java/com/diffplug/spotless/sql/dbeaver/SQLTokensParser.java
index 72080d22fc..b1931c3c4c 100644
--- a/lib/src/main/java/com/diffplug/spotless/sql/dbeaver/SQLTokensParser.java
+++ b/lib/src/main/java/com/diffplug/spotless/sql/dbeaver/SQLTokensParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,7 +25,7 @@
  * Forked from
  * DBeaver - Universal Database Manager
  * Copyright (C) 2010-2017 Serge Rider (serge@jkiss.org)
- *
+ * <p>
  * Based on SQLTokensParser from https://github.com/serge-rider/dbeaver,
  * which itself is licensed under the Apache 2.0 license.
  */
diff --git a/lib/src/main/java/com/diffplug/spotless/sql/dbeaver/TokenType.java b/lib/src/main/java/com/diffplug/spotless/sql/dbeaver/TokenType.java
index 5f727db571..d6d75faf9a 100644
--- a/lib/src/main/java/com/diffplug/spotless/sql/dbeaver/TokenType.java
+++ b/lib/src/main/java/com/diffplug/spotless/sql/dbeaver/TokenType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  * Forked from
  * DBeaver - Universal Database Manager
  * Copyright (C) 2010-2017 Serge Rider (serge@jkiss.org)
- *
+ * <p>
  * Based on TokenType from https://github.com/serge-rider/dbeaver,
  * which itself is licensed under the Apache 2.0 license.
  */
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
index 30fded9d5f..3131b1302e 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
@@ -204,14 +204,14 @@ protected boolean isLicenseHeaderStep(FormatterStep formatterStep) {
 	/**
 	 * Sets which files should be formatted. Files to be formatted = (target -
 	 * targetExclude).
-	 *
+	 * <p>
 	 * When this method is called multiple times, only the last call has any effect.
-	 *
+	 * <p>
 	 * FileCollections pass through raw. Strings are treated as the 'include' arg to
 	 * fileTree, with project.rootDir as the dir. List<String> are treated as the
 	 * 'includes' arg to fileTree, with project.rootDir as the dir. Anything else
 	 * gets passed to getProject().files().
-	 *
+	 * <p>
 	 * If you pass any strings that start with "**\/*", this method will
 	 * automatically filter out "build", ".gradle", and ".git" folders.
 	 */
@@ -222,9 +222,9 @@ public void target(Object... targets) {
 	/**
 	 * Sets which files will be excluded from formatting. Files to be formatted =
 	 * (target - targetExclude).
-	 *
+	 * <p>
 	 * When this method is called multiple times, only the last call has any effect.
-	 *
+	 * <p>
 	 * FileCollections pass through raw. Strings are treated as the 'include' arg to
 	 * fileTree, with project.rootDir as the dir. List<String> are treated as the
 	 * 'includes' arg to fileTree, with project.rootDir as the dir. Anything else
@@ -236,7 +236,7 @@ public void targetExclude(Object... targets) {
 
 	/**
 	 * Excludes all files whose content contains {@code string}.
-	 *
+	 * <p>
 	 * When this method is called multiple times, only the last call has any effect.
 	 */
 	public void targetExcludeIfContentContains(String string) {
@@ -245,7 +245,7 @@ public void targetExcludeIfContentContains(String string) {
 
 	/**
 	 * Excludes all files whose content contains the given regex.
-	 *
+	 * <p>
 	 * When this method is called multiple times, only the last call has any effect.
 	 */
 	public void targetExcludeIfContentContainsRegex(String regex) {
@@ -392,13 +392,13 @@ public void clearSteps() {
 	 * An optional performance optimization if you are using any of the
 	 * {@code custom} methods. If you aren't explicitly calling {@code custom}, then
 	 * this method has no effect.
-	 *
+	 * <p>
 	 * Spotless tracks what files have changed from run to run, so that it can run
 	 * faster by only checking files which have changed, or whose formatting steps
 	 * have changed. If you use the {@code custom} methods, then gradle can never
 	 * mark your files as {@code up-to-date}, because it can't know if perhaps the
 	 * behavior of your custom function has changed.
-	 *
+	 * <p>
 	 * If you set {@code bumpThisNumberIfACustomStepChanges( <some number> )}, then
 	 * spotless will assume that the custom rules have not changed if the number has
 	 * not changed. If a custom rule does change, then you must bump the number so
@@ -1090,16 +1090,16 @@ public SpotlessApply createIndependentApplyTask(String taskName) {
 	/**
 	 * Creates an independent {@link SpotlessApply} for (very) unusual
 	 * circumstances.
-	 *
+	 * <p>
 	 * Most users will not want this method. In the rare case that you want to
 	 * create a {@code SpotlessApply} which is independent of the normal Spotless
 	 * machinery, this will let you do that.
-	 *
+	 * <p>
 	 * The returned task will not be hooked up to the global {@code spotlessApply},
 	 * and there will be no corresponding {@code check} task.
-	 *
+	 * <p>
 	 * The task name must not end with `Apply`.
-	 *
+	 * <p>
 	 * NOTE: does not respect the rarely-used <a href=
 	 * "https://github.com/diffplug/spotless/blob/b7f8c551a97dcb92cc4b0ee665448da5013b30a3/plugin-gradle/README.md#can-i-apply-spotless-to-specific-files">{@code spotlessFiles}
 	 * property</a>.
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java
index c576eb7da8..d530de4434 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java
@@ -159,7 +159,7 @@ public GoogleJavaFormatConfig googleJavaFormat() {
 
 	/**
 	 * Uses the given version of <a href="https://github.com/google/google-java-format">google-java-format</a> to format source code.
-	 *
+	 * <p>
 	 * Limited to published versions.  See <a href="https://github.com/diffplug/spotless/issues/33#issuecomment-252315095">issue #33</a>
 	 * for a workaround for using snapshot versions.
 	 */
@@ -243,7 +243,7 @@ public PalantirJavaFormatConfig palantirJavaFormat() {
 
 	/**
 	 * Uses the given version of <a href="https://github.com/palantir/palantir-java-format">palantir-java-format</a> to format source code.
-	 *
+	 * <p>
 	 * Limited to published versions.  See <a href="https://github.com/diffplug/spotless/issues/33#issuecomment-252315095">issue #33</a>
 	 * for a workaround for using snapshot versions.
 	 */
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/RegisterDependenciesTask.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/RegisterDependenciesTask.java
index b7ffd0a295..33aded8bdd 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/RegisterDependenciesTask.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/RegisterDependenciesTask.java
@@ -39,7 +39,7 @@
 
 /**
  * NOT AN END-USER TASK, DO NOT USE FOR ANYTHING!
- *
+ * <p>
  * - When a user asks for a formatter, we need to download the jars for that formatter
  * - Gradle wants us to resolve all our dependencies in the root project - no new dependencies in subprojects
  * - So, whenever a SpotlessTask in a subproject gets configured, we call {@link #hookSubprojectTask(SpotlessTask)},
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessExtension.java
index 514945f22d..7ed0837eb5 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessExtension.java
@@ -234,7 +234,7 @@ public boolean isEnforceCheck() {
 	/**
 	 * Configures Gradle's {@code check} task to run {@code spotlessCheck} if {@code true},
 	 * but to not do so if {@code false}.
-	 *
+	 * <p>
 	 * {@code true} by default.
 	 */
 	public void setEnforceCheck(boolean enforceCheck) {
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GradleIntegrationHarness.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GradleIntegrationHarness.java
index 61d191bab1..ade5cf3d1d 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GradleIntegrationHarness.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GradleIntegrationHarness.java
@@ -94,12 +94,12 @@ public static <T> Provider<T> providerOf(T value) {
 	/**
 	 * Each test gets its own temp folder, and we create a gradle
 	 * build there and run it.
-	 *
+	 * <p>
 	 * Because those test folders don't have a .gitattributes file,
 	 * git (on windows) will default to \r\n. So now if you read a
 	 * test file from the spotless test resources, and compare it
 	 * to a build result, the line endings won't match.
-	 *
+	 * <p>
 	 * By sticking this .gitattributes file into the test directory,
 	 * we ensure that the default Spotless line endings policy of
 	 * GIT_ATTRIBUTES will use \n, so that tests match the test
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java
index 5fd59752e6..4710874e9f 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java
@@ -70,12 +70,12 @@ public class MavenIntegrationHarness extends ResourceHarness {
 	/**
 	 * Each test gets its own temp folder, and we create a maven
 	 * build there and run it.
-	 *
+	 * <p>
 	 * Because those test folders don't have a .gitattributes file,
 	 * git on windows will default to \r\n. So now if you read a
 	 * test file from the spotless test resources, and compare it
 	 * to a build result, the line endings won't match.
-	 *
+	 * <p>
 	 * By sticking this .gitattributes file into the test directory,
 	 * we ensure that the default Spotless line endings policy of
 	 * GIT_ATTRIBUTES will use \n, so that tests match the test
diff --git a/testlib/src/main/java/com/diffplug/spotless/TestProvisioner.java b/testlib/src/main/java/com/diffplug/spotless/TestProvisioner.java
index e06640ccfd..7c7b7b67f7 100644
--- a/testlib/src/main/java/com/diffplug/spotless/TestProvisioner.java
+++ b/testlib/src/main/java/com/diffplug/spotless/TestProvisioner.java
@@ -52,10 +52,10 @@ public static Project gradleProject(File dir) {
 
 	/**
 	 * Creates a Provisioner for the given repositories.
-	 *
+	 * <p>
 	 * The first time a project is created, there are ~7 seconds of configuration
 	 * which will go away for all subsequent runs.
-	 *
+	 * <p>
 	 * Every call to resolve will take about 1 second, even when all artifacts are resolved.
 	 */
 	private static Provisioner createWithRepositories(Consumer<RepositoryHandler> repoConfig) {

From 6ec2342a4b2b7e5065a19097f4f1a012582f17c0 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Mon, 30 Oct 2023 08:56:47 +0800
Subject: [PATCH 17/57] Bump Ktlint to 1.0.1

https://github.com/pinterest/ktlint/releases/tag/1.0.1
---
 CHANGES.md                                                     | 2 ++
 lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java | 2 +-
 plugin-gradle/CHANGES.md                                       | 2 ++
 plugin-maven/CHANGES.md                                        | 2 ++
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index dd89d2c5bd..6e6da03181 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,8 @@ 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 `ktlint` version to latest `1.0.0` -> `1.0.1`. ([#1855](https://github.com/diffplug/spotless/pull/1855))
 
 ## [2.42.0] - 2023-09-28
 ### Added
diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
index d08c59b839..4aca4da02e 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
@@ -36,7 +36,7 @@ public class KtLintStep {
 	// prevent direct instantiation
 	private KtLintStep() {}
 
-	private static final String DEFAULT_VERSION = "1.0.0";
+	private static final String DEFAULT_VERSION = "1.0.1";
 	static final String NAME = "ktlint";
 	static final String MAVEN_COORDINATE_0_DOT = "com.pinterest:ktlint:";
 	static final String MAVEN_COORDINATE_1_DOT = "com.pinterest.ktlint:ktlint-cli:";
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 74f889fc04..8e803eacf1 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+### Changes
+* Bump default `ktlint` version to latest `1.0.0` -> `1.0.1`. ([#1855](https://github.com/diffplug/spotless/pull/1855))
 
 ## [6.22.0] - 2023-09-28
 ### Added
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index d86096ab05..b2c84be366 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Changes
+* Bump default `ktlint` version to latest `1.0.0` -> `1.0.1`. ([#1855](https://github.com/diffplug/spotless/pull/1855))
 
 ### Added
 * CompileSourceRoots and TestCompileSourceRoots are now respected as default includes. These properties are commonly set when adding extra source directories. ([#1846](https://github.com/diffplug/spotless/issues/1846))

From 87537c0768c56d81386e05392acf45f9f85e4ec6 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Wed, 18 Oct 2023 11:05:29 -0500
Subject: [PATCH 18/57] Add more Ktlint EditorConfig test cases

---
 .../gradle/spotless/KotlinExtensionTest.java  | 43 +++++++++++++++++++
 .../spotless/maven/kotlin/KtlintTest.java     | 25 +++++++++++
 ...lEditorConfigOverride.ktlintOfficial.clean |  6 +++
 .../kotlin/ktlint/intellij_idea/.editorconfig |  6 +++
 .../ktlint/ktlint_official/.editorconfig      |  6 +++
 5 files changed, 86 insertions(+)
 create mode 100644 testlib/src/main/resources/kotlin/ktlint/experimentalEditorConfigOverride.ktlintOfficial.clean
 create mode 100644 testlib/src/main/resources/kotlin/ktlint/intellij_idea/.editorconfig
 create mode 100644 testlib/src/main/resources/kotlin/ktlint/ktlint_official/.editorconfig

diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
index 1c23728244..7ce1819d60 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
@@ -105,6 +105,42 @@ void testWithInvalidEditorConfigFile() throws IOException {
 		assertThat(buildOutput).contains(invalidPath);
 	}
 
+	@Test
+	void testReadCodeStyleFromEditorConfigFile() throws IOException {
+		setFile(".editorconfig").toResource("kotlin/ktlint/ktlint_official/.editorconfig");
+		setFile("build.gradle").toLines(
+				"plugins {",
+				"    id 'org.jetbrains.kotlin.jvm' version '1.5.31'",
+				"    id 'com.diffplug.spotless'",
+				"}",
+				"repositories { mavenCentral() }",
+				"spotless {",
+				"    kotlin {",
+				"        ktlint()",
+				"    }",
+				"}");
+		checkKtlintOfficialStyle();
+	}
+
+	@Test
+	void testSetEditorConfigCanOverrideEditorConfigFile() throws IOException {
+		setFile(".editorconfig").toResource("kotlin/ktlint/intellij_idea/.editorconfig");
+		setFile("build.gradle").toLines(
+				"plugins {",
+				"    id 'org.jetbrains.kotlin.jvm' version '1.5.31'",
+				"    id 'com.diffplug.spotless'",
+				"}",
+				"repositories { mavenCentral() }",
+				"spotless {",
+				"    kotlin {",
+				"        ktlint().editorConfigOverride([",
+				"            ktlint_code_style: \"ktlint_official\",",
+				"        ])",
+				"    }",
+				"}");
+		checkKtlintOfficialStyle();
+	}
+
 	@Test
 	void testWithHeader() throws IOException {
 		setFile("build.gradle").toLines(
@@ -144,4 +180,11 @@ void testWithCustomMaxWidthDefaultStyleKtfmt() throws IOException {
 		gradleRunner().withArguments("spotlessApply").build();
 		assertFile("src/main/kotlin/max-width.kt").sameAsResource("kotlin/ktfmt/max-width.clean");
 	}
+
+	private void checkKtlintOfficialStyle() throws IOException {
+		String path = "src/main/kotlin/Main.kt";
+		setFile(path).toResource("kotlin/ktlint/experimentalEditorConfigOverride.dirty");
+		gradleRunner().withArguments("spotlessApply").build();
+		assertFile(path).sameAsResource("kotlin/ktlint/experimentalEditorConfigOverride.ktlintOfficial.clean");
+	}
 }
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtlintTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtlintTest.java
index 060e0de84f..2916e118a5 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtlintTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtlintTest.java
@@ -44,4 +44,29 @@ void testKtlintEditorConfigOverride() throws Exception {
 		mavenRunner().withArguments("spotless:apply").runNoError();
 		assertFile(path).sameAsResource("kotlin/ktlint/experimentalEditorConfigOverride.clean");
 	}
+
+	@Test
+	void testReadCodeStyleFromEditorConfigFile() throws Exception {
+		setFile(".editorconfig").toResource("kotlin/ktlint/ktlint_official/.editorconfig");
+		writePomWithKotlinSteps("<ktlint/>");
+		checkKtlintOfficialStyle();
+	}
+
+	@Test
+	void testSetEditorConfigCanOverrideEditorConfigFile() throws Exception {
+		setFile(".editorconfig").toResource("kotlin/ktlint/intellij_idea/.editorconfig");
+		writePomWithKotlinSteps("<ktlint>\n" +
+				"  <editorConfigOverride>\n" +
+				"    <ktlint_code_style>ktlint_official</ktlint_code_style>\n" +
+				"  </editorConfigOverride>\n" +
+				"</ktlint>");
+		checkKtlintOfficialStyle();
+	}
+
+	private void checkKtlintOfficialStyle() throws Exception {
+		String path = "src/main/kotlin/Main.kt";
+		setFile(path).toResource("kotlin/ktlint/experimentalEditorConfigOverride.dirty");
+		mavenRunner().withArguments("spotless:apply").runNoError();
+		assertFile(path).sameAsResource("kotlin/ktlint/experimentalEditorConfigOverride.ktlintOfficial.clean");
+	}
 }
diff --git a/testlib/src/main/resources/kotlin/ktlint/experimentalEditorConfigOverride.ktlintOfficial.clean b/testlib/src/main/resources/kotlin/ktlint/experimentalEditorConfigOverride.ktlintOfficial.clean
new file mode 100644
index 0000000000..2466bb93fc
--- /dev/null
+++ b/testlib/src/main/resources/kotlin/ktlint/experimentalEditorConfigOverride.ktlintOfficial.clean
@@ -0,0 +1,6 @@
+fun main() {
+    val list =
+        listOf(
+            "hello",
+        )
+}
diff --git a/testlib/src/main/resources/kotlin/ktlint/intellij_idea/.editorconfig b/testlib/src/main/resources/kotlin/ktlint/intellij_idea/.editorconfig
new file mode 100644
index 0000000000..9efc62a854
--- /dev/null
+++ b/testlib/src/main/resources/kotlin/ktlint/intellij_idea/.editorconfig
@@ -0,0 +1,6 @@
+root = true
+
+[*.{kt,kts}]
+ij_kotlin_allow_trailing_comma = true
+ij_kotlin_allow_trailing_comma_on_call_site = true
+ktlint_code_style = intellij_idea
diff --git a/testlib/src/main/resources/kotlin/ktlint/ktlint_official/.editorconfig b/testlib/src/main/resources/kotlin/ktlint/ktlint_official/.editorconfig
new file mode 100644
index 0000000000..93a01f2e59
--- /dev/null
+++ b/testlib/src/main/resources/kotlin/ktlint/ktlint_official/.editorconfig
@@ -0,0 +1,6 @@
+root = true
+
+[*.{kt,kts}]
+ij_kotlin_allow_trailing_comma = true
+ij_kotlin_allow_trailing_comma_on_call_site = true
+ktlint_code_style = ktlint_official

From f237fd459e6df4e072f6778fd70b2777faf5e478 Mon Sep 17 00:00:00 2001
From: Chetan Narsude <chetan@celeral.com>
Date: Sun, 22 Oct 2023 19:27:25 -0700
Subject: [PATCH 19/57] fix the crash #1858 when the maven build dir is a
 softlink to an actual directory

---
 .../diffplug/spotless/maven/incremental/FileIndex.java   | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/incremental/FileIndex.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/incremental/FileIndex.java
index 8330319cfb..56c38ac3aa 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/incremental/FileIndex.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/incremental/FileIndex.java
@@ -144,7 +144,14 @@ private void ensureParentDirExists() {
 			throw new IllegalStateException("Index file does not have a parent dir: " + indexFile);
 		}
 		try {
-			Files.createDirectories(parentDir);
+			if (Files.exists(parentDir, LinkOption.NOFOLLOW_LINKS)) {
+				Path realPath = parentDir.toRealPath();
+				if (!Files.exists(realPath)) {
+					Files.createDirectories(realPath);
+				}
+			} else {
+				Files.createDirectories(parentDir);
+			}
 		} catch (IOException e) {
 			throw new UncheckedIOException("Unable to create parent directory for the index file: " + indexFile, e);
 		}

From ef9d6ea0ec72c866969817c607bf275a764f0d80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Rou=C3=A9l?= <andre.rouel@gmail.com>
Date: Mon, 30 Oct 2023 17:24:01 +0100
Subject: [PATCH 20/57] Fix #1638: Instantiate the code formatter and don't
 rely on an extension point

---
 .../glue/jdt/EclipseJdtFormatterStepImpl.java |  11 +-
 ...clipseJdtFormatterStepSpecialCaseTest.java |  11 +-
 .../eclipse_formatter_issue_1638.xml          | 391 ++++++++++++++++++
 .../resources/java/eclipse/AbstractType.clean |  67 +--
 4 files changed, 446 insertions(+), 34 deletions(-)
 create mode 100644 lib-extra/src/test/resources/eclipse_formatter_issue_1638.xml

diff --git a/lib-extra/src/jdt/java/com/diffplug/spotless/extra/glue/jdt/EclipseJdtFormatterStepImpl.java b/lib-extra/src/jdt/java/com/diffplug/spotless/extra/glue/jdt/EclipseJdtFormatterStepImpl.java
index 40c02d8f3a..40e10beaed 100644
--- a/lib-extra/src/jdt/java/com/diffplug/spotless/extra/glue/jdt/EclipseJdtFormatterStepImpl.java
+++ b/lib-extra/src/jdt/java/com/diffplug/spotless/extra/glue/jdt/EclipseJdtFormatterStepImpl.java
@@ -16,11 +16,15 @@
 package com.diffplug.spotless.extra.glue.jdt;
 
 import java.io.File;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.Properties;
+import java.util.stream.Collectors;
 
 import org.eclipse.jdt.core.ToolFactory;
 import org.eclipse.jdt.core.formatter.CodeFormatter;
 import org.eclipse.jdt.internal.compiler.env.IModule;
+import org.eclipse.jdt.internal.formatter.DefaultCodeFormatter;
 import org.eclipse.jface.text.Document;
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.text.edits.TextEdit;
@@ -33,7 +37,12 @@ public class EclipseJdtFormatterStepImpl {
 	private final CodeFormatter codeFormatter;
 
 	public EclipseJdtFormatterStepImpl(Properties settings) {
-		this.codeFormatter = ToolFactory.createCodeFormatter(settings, ToolFactory.M_FORMAT_EXISTING);
+		Map<String, String> options = settings.entrySet().stream().collect(Collectors.toMap(
+			e -> String.valueOf(e.getKey()),
+			e -> String.valueOf(e.getValue()),
+			(prev, next) -> next,
+			HashMap::new));
+		this.codeFormatter = new DefaultCodeFormatter(options);
 	}
 
 	/** Formatting Java string, distinguishing module-info and compilation unit by file name */
diff --git a/lib-extra/src/test/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStepSpecialCaseTest.java b/lib-extra/src/test/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStepSpecialCaseTest.java
index eb93cf1f09..474b2156bf 100644
--- a/lib-extra/src/test/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStepSpecialCaseTest.java
+++ b/lib-extra/src/test/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStepSpecialCaseTest.java
@@ -15,16 +15,25 @@
  */
 package com.diffplug.spotless.extra.java;
 
+import com.diffplug.spotless.extra.EquoBasedStepBuilder;
+
 import org.junit.jupiter.api.Test;
 
 import com.diffplug.spotless.StepHarness;
 import com.diffplug.spotless.TestProvisioner;
 
+import java.io.File;
+import java.util.List;
+
 public class EclipseJdtFormatterStepSpecialCaseTest {
 	/** https://github.com/diffplug/spotless/issues/1638 */
 	@Test
 	public void issue_1638() {
-		StepHarness.forStep(EclipseJdtFormatterStep.createBuilder(TestProvisioner.mavenCentral()).build())
+		ClassLoader classLoader = getClass().getClassLoader();
+		File file = new File(classLoader.getResource("eclipse_formatter_issue_1638.xml").getFile());
+		EquoBasedStepBuilder builder = EclipseJdtFormatterStep.createBuilder(TestProvisioner.mavenCentral());
+		builder.setPreferences(List.of(file));
+		StepHarness.forStep(builder.build())
 				.testResource("java/eclipse/AbstractType.test", "java/eclipse/AbstractType.clean");
 	}
 }
diff --git a/lib-extra/src/test/resources/eclipse_formatter_issue_1638.xml b/lib-extra/src/test/resources/eclipse_formatter_issue_1638.xml
new file mode 100644
index 0000000000..583df63026
--- /dev/null
+++ b/lib-extra/src/test/resources/eclipse_formatter_issue_1638.xml
@@ -0,0 +1,391 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<profiles version="20">
+    <profile kind="CodeFormatterProfile" name="Spotless" version="20">
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.indentation.size" value="4"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.align_with_spaces" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="2"/>
+        <setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_before_code_block" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_switch_case_expressions" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.enabling_tag" value="@formatter:on"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_record_components" value="48"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_logical_operator" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line" value="one_line_never"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_record_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_enum_constant" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_abstract_method" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_enum_constant_declaration_on_one_line" value="one_line_never"/>
+        <setting id="org.eclipse.jdt.core.formatter.align_variable_declarations_on_columns" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_anonymous_type_declaration_on_one_line" value="one_line_if_empty"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_switch_case_expressions" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_shift_operator" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_end_of_code_block" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="48"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_type_parameters" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_loops" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_simple_for_body_on_same_line" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_annotation" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_enum_constant" value="49"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.text_block_indentation" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_module_statements" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.align_tags_names_descriptions" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_if_then_body_block_on_one_line" value="one_line_never"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression_chain" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_type_annotations" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_assertion_message_operator" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_method_declaration" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines" value="2147483647"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_resources_in_try" value="80"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.format_source_code" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="48"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_not_operator" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.format_html" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_type_arguments" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation" value="80"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_package" value="49"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_label" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_case" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_record_header" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.indent_tag_description" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_record_constructor" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_string_concatenation" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_shift_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_shift_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_simple_do_while_body_on_same_line" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_record_components" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_additive_operator" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_simple_getter_setter_on_one_line" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.join_lines_in_comments" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_record_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_relational_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_logical_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_record_declaration" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_default" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.disabling_tag" value="@formatter:off"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_end_of_method_body" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_case" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.align_tags_descriptions_grouped" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="120"/>
+        <setting id="org.eclipse.jdt.core.formatter.use_on_off_tags" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_method_body_on_one_line" value="one_line_never"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_loop_body_block_on_one_line" value="one_line_never"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_type_declaration_on_one_line" value="one_line_never"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_additive_operator" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_record_constructor" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_relational_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_record_declaration_on_one_line" value="one_line_never"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_lambda_body" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="48"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_parameter" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_relational_operator" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_additive_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_record_declaration" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_after_code_block" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="48"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="80"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_type" value="49"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_local_variable" value="49"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_default" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_between_different_tags" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_additive_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_field" value="49"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_conditional_operator" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_shift_operator" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_code_block_on_one_line" value="one_line_never"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_record_components" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="4"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_record_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_assignment_operator" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_lambda_body_block_on_one_line" value="one_line_never"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_method" value="49"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_record_constructor_on_one_line" value="one_line_never"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_record_declaration" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_assertion_message" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_logical_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_record_declaration" value="48"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_relational_operator" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="48"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_after_last_class_body_declaration" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_simple_while_body_on_same_line" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_logical_operator" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_between_statement_group_in_switch" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_enum_declaration_on_one_line" value="one_line_never"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/>
+        <setting id="org.eclipse.jdt.core.javaFormatter" value="org.eclipse.jdt.core.defaultJavaFormatter"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.indent_parameter_description" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_code_block" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="space"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_string_concatenation" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.lineSplit" value="200"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>
+    </profile>
+</profiles>
diff --git a/testlib/src/main/resources/java/eclipse/AbstractType.clean b/testlib/src/main/resources/java/eclipse/AbstractType.clean
index 475b1186fd..314dbac1ac 100644
--- a/testlib/src/main/resources/java/eclipse/AbstractType.clean
+++ b/testlib/src/main/resources/java/eclipse/AbstractType.clean
@@ -2,37 +2,40 @@ package test;
 
 public abstract class AbstractType {
 
-	private String _typeName;
-
-	AbstractType(String typeName) {
-		_typeName = typeName;
-	}
-
-	private String _type() {
-		String name = getClass().getSimpleName();
-		return name.endsWith("Type") ? name.substring(0, getClass().getSimpleName().length() - 4) : name;
-	}
-
-	AbstractType argument() {
-		throw new UnsupportedOperationException(getClass().getSimpleName());
-	}
-
-	@Override
-	public boolean equals(Object another) {
-		if (this == another) {
-			return true;
-		}
-		return another instanceof AbstractType t && _typeName.equals(t._typeName);
-	}
-
-	@Override
-	public int hashCode() {
-		return _typeName.hashCode();
-	}
-
-	@Override
-	public String toString() {
-		return getClass().getSimpleName() + "(typeName)";
-	}
+    private String _typeName;
+
+    AbstractType(String typeName) {
+        _typeName = typeName;
+    }
+
+    private String _type() {
+        String name = getClass().getSimpleName();
+        return name.endsWith("Type")
+                ? name.substring(0, getClass().getSimpleName().length() - 4)
+                : name;
+    }
+
+    AbstractType argument() {
+        throw new UnsupportedOperationException(getClass().getSimpleName());
+    }
+
+    @Override
+    public boolean equals(Object another) {
+        if (this == another) {
+            return true;
+        }
+        return another instanceof AbstractType t
+                && _typeName.equals(t._typeName);
+    }
+
+    @Override
+    public int hashCode() {
+        return _typeName.hashCode();
+    }
+
+    @Override
+    public String toString() {
+        return getClass().getSimpleName() + "(typeName)";
+    }
 
 }

From 34a14cd5028868b5e41a540ca78a23d3cb8fbe25 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 1 Nov 2023 17:38:21 -0700
Subject: [PATCH 21/57] Fix missing import.

---
 .../java/com/diffplug/spotless/maven/incremental/FileIndex.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/incremental/FileIndex.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/incremental/FileIndex.java
index 56c38ac3aa..c719419923 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/incremental/FileIndex.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/incremental/FileIndex.java
@@ -26,6 +26,7 @@
 import java.io.PrintWriter;
 import java.io.UncheckedIOException;
 import java.nio.file.Files;
+import java.nio.file.LinkOption;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.time.Instant;

From 7321d6f740ad09417dd2e88f5b4c01237e99a1ea Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Wed, 1 Nov 2023 17:39:54 -0700
Subject: [PATCH 22/57] Update changelog.

---
 plugin-maven/CHANGES.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index d86096ab05..0b504f0256 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -3,7 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
-
+### Fixed
+* Fix crash when build dir is a softlink to another directory. ([#1859](https://github.com/diffplug/spotless/pull/1859))
 ### Added
 * CompileSourceRoots and TestCompileSourceRoots are now respected as default includes. These properties are commonly set when adding extra source directories. ([#1846](https://github.com/diffplug/spotless/issues/1846))
 

From 74467e7e233c074fa9eb4a3e95debf3129ce25e3 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 2 Nov 2023 02:50:32 +0000
Subject: [PATCH 23/57] chore(deps): update plugin com.github.spotbugs to
 v5.2.1

---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index daa7567f1b..02c9c66ef5 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -12,7 +12,7 @@ plugins {
 	// https://github.com/gradle-nexus/publish-plugin/releases
 	id 'io.github.gradle-nexus.publish-plugin' version '1.3.0' apply false
 	// https://github.com/spotbugs/spotbugs-gradle-plugin/releases
-	id 'com.github.spotbugs' version '5.1.3' apply false
+	id 'com.github.spotbugs' version '5.2.1' apply false
 	// https://github.com/diffplug/spotless-changelog/blob/main/CHANGELOG.md
 	id 'com.diffplug.spotless-changelog' version '3.0.2' apply false
 	// https://github.com/diffplug/goomph/blob/main/CHANGES.md

From c3f376376be45c6c2ce4f6e2b44c22b306d66f2f Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 2 Nov 2023 02:53:19 +0000
Subject: [PATCH 24/57] chore(deps): update dependency gradle to v8.4

---
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 1d4d371453..3fa8f862f7 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-rc-3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

From 3eeb1fc077e911c098b44bfb4983671095d3bdf6 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 2 Nov 2023 04:47:49 +0000
Subject: [PATCH 25/57] fix(deps): update dependency org.mockito:mockito-core
 to v5.6.0

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 543d4cf0f1..c65ea39f94 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -32,4 +32,4 @@ VER_DURIAN=1.2.0
 VER_JGIT=6.7.0.202309050840-r
 VER_JUNIT=5.10.0
 VER_ASSERTJ=3.24.2
-VER_MOCKITO=5.5.0
+VER_MOCKITO=5.6.0

From 32715a200185a1e221157d8bf7d39de442dd9f43 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 2 Nov 2023 06:45:05 +0000
Subject: [PATCH 26/57] chore(deps): update plugin com.adarshr.test-logger to
 v4

---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 02c9c66ef5..e7b9649cf3 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -19,7 +19,7 @@ plugins {
 	// DO NOT UPDATE, see https://github.com/diffplug/spotless/pull/874
 	id 'com.diffplug.p2.asmaven' version '3.27.0' apply false
 	// https://github.com/radarsh/gradle-test-logger-plugin/blob/develop/CHANGELOG.md
-	id 'com.adarshr.test-logger' version '3.2.0' apply false
+	id 'com.adarshr.test-logger' version '4.0.0' apply false
 	// https://github.com/davidburstrom/version-compatibility-gradle-plugin/tags
 	id 'io.github.davidburstrom.version-compatibility' version '0.5.0' apply false
 	// https://plugins.gradle.org/plugin/com.gradle.enterprise

From e4527feeafdf36a2014ead218940f05c6eff88c9 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Thu, 2 Nov 2023 17:18:48 +0800
Subject: [PATCH 27/57] Fix reorderImports not working

---
 plugin-gradle/CHANGES.md                                        | 2 ++
 .../main/java/com/diffplug/gradle/spotless/JavaExtension.java   | 1 +
 2 files changed, 3 insertions(+)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 8e803eacf1..2d9788576a 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -5,6 +5,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Changes
 * Bump default `ktlint` version to latest `1.0.0` -> `1.0.1`. ([#1855](https://github.com/diffplug/spotless/pull/1855))
+### Fixed
+* Fix `GoogleJavaFormatConfig.reorderImports` not working. ([#1872](https://github.com/diffplug/spotless/issues/1872))
 
 ## [6.22.0] - 2023-09-28
 ### Added
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java
index c576eb7da8..ca73508f27 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java
@@ -211,6 +211,7 @@ public GoogleJavaFormatConfig reflowLongStrings(boolean reflowLongStrings) {
 
 		public GoogleJavaFormatConfig reorderImports(boolean reorderImports) {
 			this.reorderImports = reorderImports;
+			replaceStep(createStep());
 			return this;
 		}
 

From 9ac56166679d7ef81a02f536b4369f393ffc135e Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Thu, 2 Nov 2023 23:44:05 +0800
Subject: [PATCH 28/57] Add reorderImports tests

---
 .../spotless/java/GoogleJavaFormatStep.java   | 12 +++++++--
 .../GoogleJavaFormatIntegrationTest.java      | 26 +++++++++++++++++++
 .../maven/java/GoogleJavaFormatTest.java      | 18 ++++++++++++-
 ...vaWithReorderImportsDisabledFormatted.test | 11 ++++++++
 ...avaWithReorderImportsEnabledFormatted.test | 13 ++++++++++
 .../JavaWithReorderImportsUnformatted.test    | 11 ++++++++
 .../java/GoogleJavaFormatStepTest.java        | 13 ++++++++++
 7 files changed, 101 insertions(+), 3 deletions(-)
 create mode 100644 testlib/src/main/resources/java/googlejavaformat/JavaWithReorderImportsDisabledFormatted.test
 create mode 100644 testlib/src/main/resources/java/googlejavaformat/JavaWithReorderImportsEnabledFormatted.test
 create mode 100644 testlib/src/main/resources/java/googlejavaformat/JavaWithReorderImportsUnformatted.test

diff --git a/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java b/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java
index b2424cbe2a..e5d990d807 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java
@@ -58,7 +58,11 @@ public static FormatterStep create(String version, String style, Provisioner pro
 	}
 
 	public static FormatterStep create(String groupArtifact, String version, String style, Provisioner provisioner, boolean reflowLongStrings) {
-		return create(groupArtifact, version, style, provisioner, reflowLongStrings, false, DEFAULT_FORMAT_JAVADOC);
+		return create(groupArtifact, version, style, provisioner, reflowLongStrings, DEFAULT_REORDER_IMPORTS);
+	}
+
+	public static FormatterStep create(String groupArtifact, String version, String style, Provisioner provisioner, boolean reflowLongStrings, boolean reorderImports) {
+		return create(groupArtifact, version, style, provisioner, reflowLongStrings, reorderImports, DEFAULT_FORMAT_JAVADOC);
 	}
 
 	/** Creates a step which formats everything - groupArtifact, code, import order, and unused imports - and optionally reflows long strings. */
@@ -127,7 +131,11 @@ static final class State implements Serializable {
 		}
 
 		State(String stepName, String version, String style, Provisioner provisioner, boolean reflowLongStrings) throws Exception {
-			this(stepName, MAVEN_COORDINATE, version, style, provisioner, reflowLongStrings, DEFAULT_REORDER_IMPORTS, DEFAULT_FORMAT_JAVADOC);
+			this(stepName, version, style, provisioner, reflowLongStrings, DEFAULT_REORDER_IMPORTS);
+		}
+
+		State(String stepName, String version, String style, Provisioner provisioner, boolean reflowLongStrings, boolean reorderImports) throws Exception {
+			this(stepName, MAVEN_COORDINATE, version, style, provisioner, reflowLongStrings, reorderImports, DEFAULT_FORMAT_JAVADOC);
 		}
 
 		State(String stepName, String groupArtifact, String version, String style, Provisioner provisioner, boolean reflowLongStrings, boolean reorderImports, boolean formatJavadoc) throws Exception {
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GoogleJavaFormatIntegrationTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GoogleJavaFormatIntegrationTest.java
index 42d9f4314a..b2ee012091 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GoogleJavaFormatIntegrationTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GoogleJavaFormatIntegrationTest.java
@@ -46,6 +46,32 @@ void integration() throws IOException {
 		checkRunsThenUpToDate();
 	}
 
+	@Test
+	void integrationWithReorderImports() throws IOException {
+		setFile("build.gradle").toLines(
+				"plugins {",
+				"    id 'com.diffplug.spotless'",
+				"}",
+				"repositories { mavenCentral() }",
+				"",
+				"spotless {",
+				"    java {",
+				"        target file('test.java')",
+				"        googleJavaFormat('1.12.0').aosp().reorderImports(true)",
+				"    }",
+				"}");
+
+		setFile("test.java").toResource("java/googlejavaformat/JavaWithReorderImportsUnformatted.test");
+		gradleRunner().withArguments("spotlessApply").build();
+		assertFile("test.java").sameAsResource("java/googlejavaformat/JavaWithReorderImportsEnabledFormatted.test");
+
+		checkRunsThenUpToDate();
+		replace("build.gradle",
+				"googleJavaFormat('1.12.0')",
+				"googleJavaFormat()");
+		checkRunsThenUpToDate();
+	}
+
 	@Test
 	void integrationWithSkipJavadocFormatting() throws IOException {
 		setFile("build.gradle").toLines(
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/GoogleJavaFormatTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/GoogleJavaFormatTest.java
index 76b2c40fd3..40d8edfed2 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/GoogleJavaFormatTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/java/GoogleJavaFormatTest.java
@@ -52,6 +52,18 @@ void specificVersionReflowLongStrings() throws Exception {
 		runTest("java/googlejavaformat/JavaCodeFormattedReflowLongStrings.test");
 	}
 
+	@Test
+	void specificVersionReorderImports() throws Exception {
+		writePomWithJavaSteps(
+				"<googleJavaFormat>",
+				"  <version>1.12.0</version>",
+				"  <style>AOSP</style>",
+				"  <reorderImports>true</reorderImports>",
+				"</googleJavaFormat>");
+
+		runTest("java/googlejavaformat/JavaWithReorderImportsEnabledFormatted.test", "java/googlejavaformat/JavaWithReorderImportsUnformatted.test");
+	}
+
 	@Test
 	void specificVersionSkipJavadocFormatting() throws Exception {
 		writePomWithJavaSteps(
@@ -64,8 +76,12 @@ void specificVersionSkipJavadocFormatting() throws Exception {
 	}
 
 	private void runTest(String targetResource) throws Exception {
+		runTest(targetResource, "java/googlejavaformat/JavaCodeUnformatted.test");
+	}
+
+	private void runTest(String targetResource, String sourceResource) throws Exception {
 		String path = "src/main/java/test.java";
-		setFile(path).toResource("java/googlejavaformat/JavaCodeUnformatted.test");
+		setFile(path).toResource(sourceResource);
 		mavenRunner().withArguments("spotless:apply").runNoError();
 		assertFile(path).sameAsResource(targetResource);
 	}
diff --git a/testlib/src/main/resources/java/googlejavaformat/JavaWithReorderImportsDisabledFormatted.test b/testlib/src/main/resources/java/googlejavaformat/JavaWithReorderImportsDisabledFormatted.test
new file mode 100644
index 0000000000..5e62d24108
--- /dev/null
+++ b/testlib/src/main/resources/java/googlejavaformat/JavaWithReorderImportsDisabledFormatted.test
@@ -0,0 +1,11 @@
+import java.nio.file.Paths;
+import my.UsedB;
+import org.xml.sax.InputSource;
+
+public class Java {
+    public static void main(String[] args) {
+        UsedB b = new UsedB();
+        InputSource inputSource = new InputSource();
+        Paths.get("dir");
+    }
+}
diff --git a/testlib/src/main/resources/java/googlejavaformat/JavaWithReorderImportsEnabledFormatted.test b/testlib/src/main/resources/java/googlejavaformat/JavaWithReorderImportsEnabledFormatted.test
new file mode 100644
index 0000000000..d0d4951601
--- /dev/null
+++ b/testlib/src/main/resources/java/googlejavaformat/JavaWithReorderImportsEnabledFormatted.test
@@ -0,0 +1,13 @@
+import my.UsedB;
+
+import org.xml.sax.InputSource;
+
+import java.nio.file.Paths;
+
+public class Java {
+    public static void main(String[] args) {
+        UsedB b = new UsedB();
+        InputSource inputSource = new InputSource();
+        Paths.get("dir");
+    }
+}
diff --git a/testlib/src/main/resources/java/googlejavaformat/JavaWithReorderImportsUnformatted.test b/testlib/src/main/resources/java/googlejavaformat/JavaWithReorderImportsUnformatted.test
new file mode 100644
index 0000000000..bfdbe83d88
--- /dev/null
+++ b/testlib/src/main/resources/java/googlejavaformat/JavaWithReorderImportsUnformatted.test
@@ -0,0 +1,11 @@
+import my.UsedB;
+import java.nio.file.Paths;
+import org.xml.sax.InputSource;
+
+public class Java {
+    public static void main(String[] args) {
+        UsedB b = new UsedB();
+        InputSource inputSource = new InputSource();
+        Paths.get("dir");
+    }
+}
\ No newline at end of file
diff --git a/testlib/src/test/java/com/diffplug/spotless/java/GoogleJavaFormatStepTest.java b/testlib/src/test/java/com/diffplug/spotless/java/GoogleJavaFormatStepTest.java
index df08c483df..f8766d7c6f 100644
--- a/testlib/src/test/java/com/diffplug/spotless/java/GoogleJavaFormatStepTest.java
+++ b/testlib/src/test/java/com/diffplug/spotless/java/GoogleJavaFormatStepTest.java
@@ -119,6 +119,19 @@ void behaviorWithCustomGroupArtifact() throws Exception {
 				.testResource("java/googlejavaformat/JavaCodeWithPackageUnformatted.test", "java/googlejavaformat/JavaCodeWithPackageFormatted.test");
 	}
 
+	@Test
+	void behaviorWithReorderImports() throws Exception {
+		FormatterStep enabled = GoogleJavaFormatStep.create(GoogleJavaFormatStep.defaultGroupArtifact(), GoogleJavaFormatStep.defaultVersion(), "AOSP", TestProvisioner.mavenCentral(), GoogleJavaFormatStep.defaultReflowLongStrings(), true);
+		FormatterStep disabled = GoogleJavaFormatStep.create(GoogleJavaFormatStep.defaultGroupArtifact(), GoogleJavaFormatStep.defaultVersion(), "AOSP", TestProvisioner.mavenCentral(), GoogleJavaFormatStep.defaultReflowLongStrings(), false);
+		String unformatted = "java/googlejavaformat/JavaWithReorderImportsUnformatted.test";
+		try (StepHarness step = StepHarness.forStep(enabled)) {
+			step.testResource(unformatted, "java/googlejavaformat/JavaWithReorderImportsEnabledFormatted.test");
+		}
+		try (StepHarness step = StepHarness.forStep(disabled)) {
+			step.testResource(unformatted, "java/googlejavaformat/JavaWithReorderImportsDisabledFormatted.test");
+		}
+	}
+
 	@Test
 	void equality() throws Exception {
 		new SerializableEqualityTester() {

From d090d4b896809004f7031ae79f87b2f7ddbd6b04 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Fri, 3 Nov 2023 01:02:44 +0800
Subject: [PATCH 29/57] Execute tests in parallel

https://docs.gradle.org/8.4/userguide/performance.html#execute_tests_in_parallel
---
 gradle/special-tests.gradle | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/gradle/special-tests.gradle b/gradle/special-tests.gradle
index d4de449bdd..b096efbe13 100644
--- a/gradle/special-tests.gradle
+++ b/gradle/special-tests.gradle
@@ -17,6 +17,12 @@ tasks.withType(Test).configureEach {
 			maxRetries = 2
 			maxFailures = 10
 		}
+
+		// There are only 2 cores in each GitHub Action Runner, we use all of them here.
+		maxParallelForks = Runtime.getRuntime().availableProcessors()
+	} else {
+		// https://docs.gradle.org/8.4/userguide/performance.html#execute_tests_in_parallel
+		maxParallelForks = Runtime.runtime.availableProcessors().intdiv(2) ?: 1
 	}
 }
 

From de815f40d4d93a846004a91dcc99c4798d652580 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Fri, 3 Nov 2023 08:34:06 -0700
Subject: [PATCH 30/57] `spotlessApply`.

---
 .../extra/glue/jdt/EclipseJdtFormatterStepImpl.java      | 9 ++++-----
 .../java/EclipseJdtFormatterStepSpecialCaseTest.java     | 7 +++----
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/lib-extra/src/jdt/java/com/diffplug/spotless/extra/glue/jdt/EclipseJdtFormatterStepImpl.java b/lib-extra/src/jdt/java/com/diffplug/spotless/extra/glue/jdt/EclipseJdtFormatterStepImpl.java
index 40e10beaed..b394b6278d 100644
--- a/lib-extra/src/jdt/java/com/diffplug/spotless/extra/glue/jdt/EclipseJdtFormatterStepImpl.java
+++ b/lib-extra/src/jdt/java/com/diffplug/spotless/extra/glue/jdt/EclipseJdtFormatterStepImpl.java
@@ -21,7 +21,6 @@
 import java.util.Properties;
 import java.util.stream.Collectors;
 
-import org.eclipse.jdt.core.ToolFactory;
 import org.eclipse.jdt.core.formatter.CodeFormatter;
 import org.eclipse.jdt.internal.compiler.env.IModule;
 import org.eclipse.jdt.internal.formatter.DefaultCodeFormatter;
@@ -38,10 +37,10 @@ public class EclipseJdtFormatterStepImpl {
 
 	public EclipseJdtFormatterStepImpl(Properties settings) {
 		Map<String, String> options = settings.entrySet().stream().collect(Collectors.toMap(
-			e -> String.valueOf(e.getKey()),
-			e -> String.valueOf(e.getValue()),
-			(prev, next) -> next,
-			HashMap::new));
+				e -> String.valueOf(e.getKey()),
+				e -> String.valueOf(e.getValue()),
+				(prev, next) -> next,
+				HashMap::new));
 		this.codeFormatter = new DefaultCodeFormatter(options);
 	}
 
diff --git a/lib-extra/src/test/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStepSpecialCaseTest.java b/lib-extra/src/test/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStepSpecialCaseTest.java
index 474b2156bf..21ec889ed6 100644
--- a/lib-extra/src/test/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStepSpecialCaseTest.java
+++ b/lib-extra/src/test/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStepSpecialCaseTest.java
@@ -15,15 +15,14 @@
  */
 package com.diffplug.spotless.extra.java;
 
-import com.diffplug.spotless.extra.EquoBasedStepBuilder;
+import java.io.File;
+import java.util.List;
 
 import org.junit.jupiter.api.Test;
 
 import com.diffplug.spotless.StepHarness;
 import com.diffplug.spotless.TestProvisioner;
-
-import java.io.File;
-import java.util.List;
+import com.diffplug.spotless.extra.EquoBasedStepBuilder;
 
 public class EclipseJdtFormatterStepSpecialCaseTest {
 	/** https://github.com/diffplug/spotless/issues/1638 */

From b08741a60ae65a8542de354070de25561bd9e78b Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Fri, 3 Nov 2023 08:37:04 -0700
Subject: [PATCH 31/57] Bump changelogs.

---
 CHANGES.md               | 2 ++
 plugin-gradle/CHANGES.md | 2 ++
 plugin-maven/CHANGES.md  | 1 +
 3 files changed, 5 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 6e6da03181..93e693ebf5 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,8 @@ 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]
+### Fixed
+* Fix Eclipse JDT on some settings files. ([#1864](https://github.com/diffplug/spotless/pull/1864) fixes [#1638](https://github.com/diffplug/spotless/issues/1638))
 ### Changes
 * Bump default `ktlint` version to latest `1.0.0` -> `1.0.1`. ([#1855](https://github.com/diffplug/spotless/pull/1855))
 
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 8e803eacf1..2a197e7cac 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+### Fixed
+* Fix Eclipse JDT on some settings files. ([#1864](https://github.com/diffplug/spotless/pull/1864) fixes [#1638](https://github.com/diffplug/spotless/issues/1638))
 ### Changes
 * Bump default `ktlint` version to latest `1.0.0` -> `1.0.1`. ([#1855](https://github.com/diffplug/spotless/pull/1855))
 
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index e07eadad4c..e941297aa3 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -7,6 +7,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * CompileSourceRoots and TestCompileSourceRoots are now respected as default includes. These properties are commonly set when adding extra source directories. ([#1846](https://github.com/diffplug/spotless/issues/1846))
 ### Fixed
 * Fix crash when build dir is a softlink to another directory. ([#1859](https://github.com/diffplug/spotless/pull/1859))
+* Fix Eclipse JDT on some settings files. ([#1864](https://github.com/diffplug/spotless/pull/1864) fixes [#1638](https://github.com/diffplug/spotless/issues/1638))
 ### Changes
 * Bump default `ktlint` version to latest `1.0.0` -> `1.0.1`. ([#1855](https://github.com/diffplug/spotless/pull/1855))
 

From a7523be35ba7d9f17f1c92d79dc9ce9c720bc92d Mon Sep 17 00:00:00 2001
From: Marcono1234 <Marcono1234@users.noreply.github.com>
Date: Mon, 6 Nov 2023 22:55:31 +0100
Subject: [PATCH 32/57] Fix misleading sentence in Maven plugin README

The previous "add the Spotless dependency" could be misunderstood as
having to add a regular Maven dependency entry for the Spotless plugin.
---
 plugin-maven/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 3294575e20..b3347d50e1 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -73,7 +73,7 @@ user@machine repo % mvn spotless:check
 
 ## Quickstart
 
-To use it in your pom, just [add the Spotless dependency](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-maven-plugin%22), and configure it like so:
+To use it in your pom, just [add the Spotless plugin](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-maven-plugin%22), and configure it like so:
 
 ```xml
 <plugin>

From 1899bb08b4c6f0fe6229b9749b586c840eb3b20d Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Tue, 7 Nov 2023 10:42:28 +0800
Subject: [PATCH 33/57] Disable trimTrailingWhitespace for md files

---
 .editorconfig                    | 1 +
 gradle/spotless-freshmark.gradle | 1 -
 plugin-gradle/README.md          | 2 +-
 plugin-maven/README.md           | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index 5d0704bd2b..9fe2fbc6c6 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -11,6 +11,7 @@ charset = utf-8
 [*.md]
 indent_style = space
 indent_size = 2
+trim_trailing_whitespace = false
 
 [*.java]
 # Doc: https://youtrack.jetbrains.com/issue/IDEA-170643#focus=streamItem-27-3708697.0-0
diff --git a/gradle/spotless-freshmark.gradle b/gradle/spotless-freshmark.gradle
index 2a79ab01ba..54623eb05a 100644
--- a/gradle/spotless-freshmark.gradle
+++ b/gradle/spotless-freshmark.gradle
@@ -11,7 +11,6 @@ Action<FreshMarkExtension> freshmarkSetup = {
 		it.put('no', ':white_large_square:')
 	}
 	it.indentWithSpaces(2)
-	it.trimTrailingWhitespace()
 	it.endWithNewline()
 }
 
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 16285f88ad..f53028418b 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -105,7 +105,7 @@ spotless {
 
   format 'misc', {
     // define the files to apply `misc` to
-    target '*.gradle', '*.md', '.gitignore'
+    target '*.gradle', '.gitattributes', '.gitignore'
 
     // define the steps to apply to those files
     trimTrailingWhitespace()
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 3294575e20..c9342f985b 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -88,7 +88,7 @@ To use it in your pom, just [add the Spotless dependency](https://search.maven.o
       <format>
         <!-- define the files to apply to -->
         <includes>
-          <include>*.md</include>
+          <include>.gitattributes</include>
           <include>.gitignore</include>
         </includes>
         <!-- define the steps to apply to those files -->

From 0ab9e62f5dbf90edb46ae534e60ba85aceaae913 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Wed, 8 Nov 2023 00:17:55 +0800
Subject: [PATCH 34/57] Manually declaring junit-platform-launcher for
 testCommon

Follow up e52c46fdaf9c91b9c44350b8d9d6d7bd18e71fe4.
---
 lib/build.gradle | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/build.gradle b/lib/build.gradle
index 0288277c78..a3424a7ee9 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -69,6 +69,7 @@ dependencies {
 	testCommonImplementation "org.junit.jupiter:junit-jupiter:$VER_JUNIT"
 	testCommonImplementation "org.assertj:assertj-core:$VER_ASSERTJ"
 	testCommonImplementation "com.diffplug.durian:durian-testlib:$VER_DURIAN"
+	testCommonRuntimeOnly "org.junit.platform:junit-platform-launcher"
 
 	// GLUE CODE (alphabetic order please)
 	// cleanthat

From 9f79a329fd9d667887ab55024cdcf675e957e498 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Wed, 8 Nov 2023 10:34:18 +0800
Subject: [PATCH 35/57] Capitalized Gradle names in docs

---
 CHANGES.md                                     | 18 +++++++++---------
 ISSUE_TEMPLATE.md                              |  2 +-
 README.md                                      |  6 +++---
 _ext/eclipse-wtp/CHANGES.md                    |  2 +-
 gradle/java-publish.gradle                     |  2 +-
 .../com/diffplug/spotless/FormatterStep.java   |  2 +-
 .../npm/PrettierMissingParserException.java    |  2 +-
 plugin-gradle/CHANGES.md                       | 12 ++++++------
 .../gradle/spotless/FormatExtension.java       |  2 +-
 .../gradle/spotless/SpotlessCheck.java         |  4 ++--
 .../spotless/SpotlessPluginRedirect.java       |  2 +-
 .../spotless/SpotlessPluginRedirectTest.java   |  2 +-
 plugin-maven/CHANGES.md                        |  2 +-
 .../diffplug/spotless/maven/MavenRunner.java   |  2 +-
 14 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 93e693ebf5..d8d6a2a168 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -579,9 +579,9 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Changed
 * **BREAKING** `FileSignature` can no longer sign folders, only files.  Signatures are now based only on filename (not path), size, and a content hash.  It throws an error if a signature is attempted on a folder or on multiple files with different paths but the same filename - it never breaks silently.  This change does not break any of Spotless' internal logic, so it is unlikely to affect any of Spotless' consumers either. ([#571](https://github.com/diffplug/spotless/pull/571))
   * This change allows the maven plugin to cache classloaders across subprojects when loading config resources from the classpath (fixes [#559](https://github.com/diffplug/spotless/issues/559)).
-  * This change also allows the gradle plugin to work with the remote buildcache (fixes [#280](https://github.com/diffplug/spotless/issues/280)).
+  * This change also allows the Gradle plugin to work with the remote buildcache (fixes [#280](https://github.com/diffplug/spotless/issues/280)).
 * **BREAKING** `FormatterFunc` no longer `extends ThrowingEx.Function` and `BiFunction`. In a major win for Java's idea of ["target typing"](https://cr.openjdk.java.net/~briangoetz/lambda/lambda-state-final.html), this required no changes anywhere in the codebase except deleting the `extends` part of `FormatterFunc` ([#638](https://github.com/diffplug/spotless/issues/638)).
-* **BREAKING** Heavy refactor of the `LicenseHeaderStep` public API.  Doesn't change internal behavior, but makes implementation of the gradle and maven plugins much easier. ([#628](https://github.com/diffplug/spotless/pull/628))
+* **BREAKING** Heavy refactor of the `LicenseHeaderStep` public API.  Doesn't change internal behavior, but makes implementation of the Gradle and maven plugins much easier. ([#628](https://github.com/diffplug/spotless/pull/628))
 * **BREAKING** Removed all deprecated methods and classes from `lib` and `lib-extra`.
   * [#629](https://github.com/diffplug/spotless/pull/629) removes the code which wasn't being used in plugin-gradle or plugin-maven.
   * [#630](https://github.com/diffplug/spotless/pull/630) moves the code which was still being used in deprecated parts of plugin-gradle into `.deprecated` package in `plugin-gradle`, which allows us to break `lib` without a breaking change in `plugin-gradle`.
@@ -614,7 +614,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * `NodeJsGlobal.setSharedLibFolder` allows to set the location of nodejs shared libs. ([#586](https://github.com/diffplug/spotless/pull/586))
 * `PaddedCell.isClean()` returns the instance of `PaddedCell.DirtyState` which represents clean. ([#590](https://github.com/diffplug/spotless/pull/590))
 ### Fixed
-* Previously, the nodejs-based steps would throw `UnsatisfiedLinkError` if they were ever used from more than one classloader.  Now they can be used from any number of classloaders (important for gradle build daemon). ([#586](https://github.com/diffplug/spotless/pull/586))
+* Previously, the nodejs-based steps would throw `UnsatisfiedLinkError` if they were ever used from more than one classloader.  Now they can be used from any number of classloaders (important for Gradle build daemon). ([#586](https://github.com/diffplug/spotless/pull/586))
 
 ## [1.31.0] - 2020-05-21
 ### Added
@@ -636,8 +636,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Changed
 * Updated a bunch of dependencies, most notably: ([#564](https://github.com/diffplug/spotless/pull/564))
   * jgit `5.5.0.201909110433-r` -> `5.7.0.202003110725-r`
-  * gradle `6.2.2` -> `6.3`
-  * spotbugs gradle plugin `2.0.0` -> `4.0.8`
+  * Gradle `6.2.2` -> `6.3`
+  * spotbugs Gradle plugin `2.0.0` -> `4.0.8`
 
 ## [1.28.1] - 2020-04-02
 ### Fixed
@@ -654,7 +654,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * We now use [javadoc.io](https://javadoc.io/) instead of github pages. ([#508](https://github.com/diffplug/spotless/pull/508))
 * We no longer publish `-SNAPSHOT` for every build to `main`, since we have good [JitPack integration](https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#gradle---any-commit-in-a-public-github-repo-this-one-or-any-fork). ([#508](https://github.com/diffplug/spotless/pull/508))
 * Improved how we use Spotless on itself. ([#509](https://github.com/diffplug/spotless/pull/509))
-* Fix build warnings when building on Gradle 6+, bump build gradle to 6.2.2, and fix javadoc links. ([#536](https://github.com/diffplug/spotless/pull/536))
+* Fix build warnings when building on Gradle 6+, bump build Gradle to 6.2.2, and fix javadoc links. ([#536](https://github.com/diffplug/spotless/pull/536))
 
 ## [1.27.0] - 2020-01-01
 * Ignored `KtLintStepTest`, because [gradle/gradle#11752](https://github.com/gradle/gradle/issues/11752) is causing too many CI failures. ([#499](https://github.com/diffplug/spotless/pull/499))
@@ -694,7 +694,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
     - but incorrectly marked as good by "check"
     - this led to "check" says all good, but then "apply" still causes format (https://github.com/diffplug/spotless/issues/453)
     - combined with up-to-date checking, could lead to even more confusing results (https://github.com/diffplug/spotless/issues/338)
-    - only affects the gradle plugin, since that was the only plugin to use this feature
+    - only affects the Gradle plugin, since that was the only plugin to use this feature
 * Minor change to `TestProvisioner`, which should fix the cache-breaking issues, allowing us to speed-up the CI builds a bit.
 * Bumped `scalafmt` default version from `1.1.0` to `2.0.1`, since there are [bugs](https://github.com/diffplug/spotless/issues/454) in the old default ([#458](https://github.com/diffplug/spotless/pull/458)).
 
@@ -711,7 +711,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [1.23.1] - 2019-06-17
 * Fixes incorrect M2 cache directory path handling of Eclipse based formatters ([#401](https://github.com/diffplug/spotless/issues/401))
-* Update jgit from `4.9.0.201710071750-r` to `5.3.2.201906051522-r` because gradle project is sometimes broken by `apache httpcomponents` in transitive dependency. ([#407](https://github.com/diffplug/spotless/pull/407))
+* Update jgit from `4.9.0.201710071750-r` to `5.3.2.201906051522-r` because Gradle project is sometimes broken by `apache httpcomponents` in transitive dependency. ([#407](https://github.com/diffplug/spotless/pull/407))
 
 ## [1.23.0] - 2019-04-24
 * Updated default ktlint from 0.21.0 to 0.32.0, and Maven coords to com.pinterest ([#394](https://github.com/diffplug/spotless/pull/394))
@@ -787,7 +787,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [1.12.0] - 2018-05-14
 * Fixed a bug in `LicenseHeaderStep` which caused an exception with some malformed date-aware licenses. ([#222](https://github.com/diffplug/spotless/pull/222))
 * Updated default ktlint from 0.14.0 to 0.21.0
-* Add ability to pass custom options to ktlint in gradle plugin. See plugin-gradle/README for details.
+* Add ability to pass custom options to ktlint in Gradle plugin. See plugin-gradle/README for details.
 
 ## [1.11.0] - 2018-02-26
 * Added default indentation of `4` to `IndentStep`. ([#209](https://github.com/diffplug/spotless/pull/209))
diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
index 0ae5167a13..36cda06b7e 100644
--- a/ISSUE_TEMPLATE.md
+++ b/ISSUE_TEMPLATE.md
@@ -1,7 +1,7 @@
 If you are submitting a **bug**, please include the following:
 
 - [ ] summary of problem
-- [ ] gradle or maven version
+- [ ] Gradle or maven version
 - [ ] spotless version
 - [ ] operating system and version
 - [ ] copy-paste your full Spotless configuration block(s), and a link to a public git repo that reproduces the problem if possible
diff --git a/README.md b/README.md
index 80dcec21eb..2c45e9e444 100644
--- a/README.md
+++ b/README.md
@@ -176,7 +176,7 @@ Once someone has filled in one square of the formatter/build system matrix, it's
   - breaking spotless into libraries [#56](https://github.com/diffplug/spotless/issues/56)
   - lots of other things, but especially the diff support in `spotlessCheck`
   - constant improvements on a variety of topics with high-quality code reviews
-- Thanks to [Daz DeBoer](https://github.com/bigdaz) for the reworking the guts of our gradle plugin to support [buildcache](https://github.com/diffplug/spotless/pull/576), [InputChanges](https://github.com/diffplug/spotless/pull/607), and [lazy configuration](https://github.com/diffplug/spotless/pull/617).
+- Thanks to [Daz DeBoer](https://github.com/bigdaz) for the reworking the guts of our Gradle plugin to support [buildcache](https://github.com/diffplug/spotless/pull/576), [InputChanges](https://github.com/diffplug/spotless/pull/607), and [lazy configuration](https://github.com/diffplug/spotless/pull/617).
 - Thanks to [Richard Willis](https://github.com/badsyntax) for creating the [VS Code extension for Spotless Gradle](https://marketplace.visualstudio.com/items?itemName=richardwillis.vscode-spotless-gradle).
 - Thanks to [Ryan Gurney](https://github.com/ragurney) for creating the [IntelliJ plugin for Spotless Gradle](https://plugins.jetbrains.com/plugin/18321-spotless-gradle).
 - Thanks to [Markus Heberling](https://github.com/tisoft) for adding [generic native formatters](https://github.com/diffplug/spotless/pull/949), [jsr-223 formatters](https://github.com/diffplug/spotless/pull/945), and [maven pom sorting](https://github.com/diffplug/spotless/pull/946).
@@ -195,7 +195,7 @@ Once someone has filled in one square of the formatter/build system matrix, it's
 - Thanks to [Baptiste Mesta](https://github.com/baptistemesta) for
   - porting the DBeaver formatter to Spotless, and thanks to [DBeaver](https://dbeaver.jkiss.org/) and [its authors](https://github.com/serge-rider/dbeaver/graphs/contributors) for their excellent SQL formatter.
   - making license headers date-aware [#179](https://github.com/diffplug/spotless/pull/179)
-- Thanks to [vmdominguez](https://github.com/vmdominguez) and [Luis Fors](https://github.com/luis-fors-cb) for adding the ability to limit formatting to specific files in gradle ([#322](https://github.com/diffplug/spotless/pull/322)) and maven ([#392](https://github.com/diffplug/spotless/pull/392)), respectively.
+- Thanks to [vmdominguez](https://github.com/vmdominguez) and [Luis Fors](https://github.com/luis-fors-cb) for adding the ability to limit formatting to specific files in Gradle ([#322](https://github.com/diffplug/spotless/pull/322)) and maven ([#392](https://github.com/diffplug/spotless/pull/392)), respectively.
 - Thanks to [bender316](https://github.com/bender316) for fixing classloading on Java 9 ([#426](https://github.com/diffplug/spotless/pull/426)).
 - Thanks to [Stefan Oehme](https://github.com/oehme) for tons of help on the internal mechanics of Gradle.
 - Thanks to [eyalkaspi](https://github.com/eyalkaspi) for adding configurable date ranges to the date-aware license headers.
@@ -203,7 +203,7 @@ Once someone has filled in one square of the formatter/build system matrix, it's
 - Thanks to [Oliver Horn](https://github.com/ohorn) for adding AOSP support for Spotless' google-java-format integration.
 - Formatting by Eclipse
   - Special thanks to [Mateusz Matela](https://waynebeaton.wordpress.com/2015/03/15/great-fixes-for-mars-winners-part-i/) for huge improvements to the eclipse code formatter!
-- Thanks to [Zac Sweers](https://github.com/ZacSweers) for fixing the highly requested ktlint 0.34+ support ([#469](https://github.com/diffplug/spotless/pull/469)), multiple build updates and fixing a gradle deprecation warning ([#434](https://github.com/diffplug/spotless/pull/434) and others).
+- Thanks to [Zac Sweers](https://github.com/ZacSweers) for fixing the highly requested ktlint 0.34+ support ([#469](https://github.com/diffplug/spotless/pull/469)), multiple build updates and fixing a Gradle deprecation warning ([#434](https://github.com/diffplug/spotless/pull/434) and others).
 - Thanks to [Stephen Panaro](https://github.com/smpanaro) for adding support for ktlint FilenameRule ([#974](https://github.com/diffplug/spotless/pull/974)).
 - Thanks to [Nelson Osacky](https://github.com/runningcode) for android doc improvements, versions bump, and a build improvement.
 - Thanks to [Stanley Shyiko](https://github.com/shyiko) for his help integrating [ktlint](https://github.com/shyiko/ktlint).
diff --git a/_ext/eclipse-wtp/CHANGES.md b/_ext/eclipse-wtp/CHANGES.md
index 0001618b1f..d57618ad8c 100644
--- a/_ext/eclipse-wtp/CHANGES.md
+++ b/_ext/eclipse-wtp/CHANGES.md
@@ -4,7 +4,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 ### Fixed
-* Fix typo in gradle variable names ([#1425](https://github.com/diffplug/spotless/pull/1425))
+* Fix typo in Gradle variable names ([#1425](https://github.com/diffplug/spotless/pull/1425))
 
 ## [3.23.0] - 2021-09-22
 ### Added
diff --git a/gradle/java-publish.gradle b/gradle/java-publish.gradle
index 495694a5be..49075c5970 100644
--- a/gradle/java-publish.gradle
+++ b/gradle/java-publish.gradle
@@ -192,7 +192,7 @@ if (System.env['JITPACK'] == 'true' || version.endsWith('-SNAPSHOT')) {
 	changelogTasks.named('changelogBump').configure {
 		dependsOn ":${thisProj.path}:publishPluginMavenPublicationToSonatypeRepository"
 		dependsOn ":closeAndReleaseSonatypeStagingRepository"
-		// if we have a gradle plugin, we need to push it up to the plugin portal too
+		// if we have a Gradle plugin, we need to push it up to the plugin portal too
 		if (thisProj.tasks.names.contains('publishPlugins')) {
 			dependsOn thisProj.tasks.named('publishPlugins')
 		}
diff --git a/lib/src/main/java/com/diffplug/spotless/FormatterStep.java b/lib/src/main/java/com/diffplug/spotless/FormatterStep.java
index 5f6ec168d4..ce24921509 100644
--- a/lib/src/main/java/com/diffplug/spotless/FormatterStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/FormatterStep.java
@@ -86,7 +86,7 @@ public default FormatterStep filterByFile(SerializableFileFilter filter) {
 	 * Implements a FormatterStep in a strict way which guarantees correct and lazy implementation
 	 * of up-to-date checks.  This maximizes performance for cases where the FormatterStep is not
 	 * actually needed (e.g. don't load eclipse setting file unless this step is actually running)
-	 * while also ensuring that gradle can detect changes in a step's settings to determine that
+	 * while also ensuring that Gradle can detect changes in a step's settings to determine that
 	 * it needs to rerun a format.
 	 */
 	abstract class Strict<State extends Serializable> extends LazyForwardingEquality<State> implements FormatterStep {
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/PrettierMissingParserException.java b/lib/src/main/java/com/diffplug/spotless/npm/PrettierMissingParserException.java
index 6956545135..4debfd5720 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/PrettierMissingParserException.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/PrettierMissingParserException.java
@@ -95,7 +95,7 @@ private static String recommendPlugin(File file) {
 				+ String.format("<https://www.npmjs.com/search?ranking=popularity&q=%s>", pluginName)
 				+ "\n\n"
 				+ "For instructions on how to include plugins for prettier in spotless see our documentation:\n"
-				+ "- for gradle <https://github.com/diffplug/spotless/tree/main/plugin-gradle#prettier-plugins>\n"
+				+ "- for Gradle <https://github.com/diffplug/spotless/tree/main/plugin-gradle#prettier-plugins>\n"
 				+ "- for maven <https://github.com/diffplug/spotless/tree/main/plugin-maven#prettier-plugins>";
 	}
 
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index ec26cf5c63..ac3e4f1c38 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -161,7 +161,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
   * `KtLint` does not maintain a stable API - before this PR, we supported every breaking change in the API since 2019.
   * From now on, we will support no more than 2 breaking changes at a time.
 * `npm`-based formatters `ESLint`, `prettier` and `tsfmt` delay their `npm install` call until the formatters are first
-  used. For gradle this effectively moves the `npm install` call out of the configuration phase and as such enables
+  used. For Gradle this effectively moves the `npm install` call out of the configuration phase and as such enables
   better integration with `gradle-node-plugin`. ([#1522](https://github.com/diffplug/spotless/pull/1522))
 * Bump default `ktlint` version to latest `0.48.1` -> `0.48.2` ([#1529](https://github.com/diffplug/spotless/pull/1529))
 * Bump default `scalafmt` version to latest `3.6.1` -> `3.7.1` ([#1529](https://github.com/diffplug/spotless/pull/1529))
@@ -371,7 +371,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [6.0.4] - 2021-12-07
 ### Fixed
-* Fix gradle composite builds ([#860](https://github.com/diffplug/spotless/issues/860)).
+* Fix Gradle composite builds ([#860](https://github.com/diffplug/spotless/issues/860)).
 
 ## [6.0.3] - 2021-12-06
 ### Fixed
@@ -687,7 +687,7 @@ println "isEager $isEager"
 * LineEndings.GIT_ATTRIBUTES is now a bit more efficient, and paves the way for remote build cache support in Gradle. ([#621](https://github.com/diffplug/spotless/pull/621))
 * `ratchetFrom` now ratchets from the merge base of `HEAD` and the specified branch.  This fixes the surprising behavior when a remote branch advanced ([#631](https://github.com/diffplug/spotless/pull/631) fixes [#627](https://github.com/diffplug/spotless/issues/627)).
 ### Deprecated
-* The default targets for `C/C++`, `freshmark`, `sql`, and `typescript` now generate a warning, asking the user to specify a target manually. There is no well-established convention for these languages in the gradle ecosystem, and the performance of the default target is far worse than a user-provided one.  If you dislike this change, please complain in [#634](https://github.com/diffplug/spotless/pull/634).
+* The default targets for `C/C++`, `freshmark`, `sql`, and `typescript` now generate a warning, asking the user to specify a target manually. There is no well-established convention for these languages in the Gradle ecosystem, and the performance of the default target is far worse than a user-provided one.  If you dislike this change, please complain in [#634](https://github.com/diffplug/spotless/pull/634).
 * `customLazy` and `customLazyGroovy` now generate a warning, asking the user to migrate to `custom`.  There is no longer a performance advantage to `customLazy` in the new modern plugin. See [#635](https://github.com/diffplug/spotless/pull/635/files) for example migrations.
 * inside the `cpp { }` block, the `eclipse` step now generates a warning, asking you to switch to `eclipseCdt`.  It is the same underlying step, but the new name clears up any confusion with the more common Java `eclipse`. [#636](https://github.com/diffplug/spotless/pull/635/files)
 
@@ -765,7 +765,7 @@ spotless {
 **TLDR: This version improves performance and adds support for the local Gradle Build Cache.  You will not need to make any changes in your buildscript.**  It is a breaking change only for a few users who have built *other* plugins on top of this one.
 
 ### Added
-* Support for the gradle build cache. ([#576](https://github.com/diffplug/spotless/pull/576))
+* Support for the Gradle build cache. ([#576](https://github.com/diffplug/spotless/pull/576))
   * The local cache will work great, but the remote cache will always miss until [#566](https://github.com/diffplug/spotless/issues/566) is resolved.
 ### Removed
 * **BREAKING** it used to be possible for any project to format files in any other project.  For example, `:a` could format files in `:b`.  It is now only possible to format files within the project directory.  It is okay (but not advised) to format files in subprojects, since they are within the project directory.
@@ -773,7 +773,7 @@ spotless {
   * Previously, the `check` and `apply` tasks were just marker tasks, and they called `setCheck` and `setApply` on the "worker" task.  Now `check` and `apply` are real tasks in their own right, so the marker-task kludge is no longer necessary.
 ### Changed
 * (Power users only) **BREAKING** `SpotlessTask FormatExtension::createIndependentTask` has been removed, and replaced with `SpotlessApply::createIndependentApplyTask`. ([#576](https://github.com/diffplug/spotless/pull/576))
-* Improve suggested gradle invocation for running `spotlessApply`. ([#578](https://github.com/diffplug/spotless/pull/578))
+* Improve suggested Gradle invocation for running `spotlessApply`. ([#578](https://github.com/diffplug/spotless/pull/578))
 
 ## [3.30.0] - 2020-05-11
 ### Added
@@ -868,7 +868,7 @@ spotless {
 
 ## [3.23.1] - 2019-06-17
 * Fixes incorrect M2 cache directory path handling of Eclipse based formatters ([#401](https://github.com/diffplug/spotless/issues/401))
-* Update jgit from `4.9.0.201710071750-r` to `5.3.2.201906051522-r` because gradle project is sometimes broken by `apache httpcomponents` in transitive dependency. ([#407](https://github.com/diffplug/spotless/pull/407))
+* Update jgit from `4.9.0.201710071750-r` to `5.3.2.201906051522-r` because Gradle project is sometimes broken by `apache httpcomponents` in transitive dependency. ([#407](https://github.com/diffplug/spotless/pull/407))
 
 ## [3.23.0] - 2019-04-24
 * Updated default ktlint from 0.21.0 to 0.32.0, and Maven coords to com.pinterest ([#394](https://github.com/diffplug/spotless/pull/394))
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
index 30fded9d5f..ff0d71b15a 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
@@ -395,7 +395,7 @@ public void clearSteps() {
 	 *
 	 * Spotless tracks what files have changed from run to run, so that it can run
 	 * faster by only checking files which have changed, or whose formatting steps
-	 * have changed. If you use the {@code custom} methods, then gradle can never
+	 * have changed. If you use the {@code custom} methods, then Gradle can never
 	 * mark your files as {@code up-to-date}, because it can't know if perhaps the
 	 * behavior of your custom function has changed.
 	 *
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessCheck.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessCheck.java
index d0e27d60bf..98b88315ad 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessCheck.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessCheck.java
@@ -86,8 +86,8 @@ public void visitFile(FileVisitDetails fileVisitDetails) {
 						// in its output directory which ought to have been removed. As
 						// best I can tell, this is a filesytem race which is very hard
 						// to trigger.  GitRatchetGradleTest can *sometimes* reproduce it
-						// but it's very erratic, and that test writes both to gradle cache
-						// and git cache very quickly.  Either of gradle or jgit might be
+						// but it's very erratic, and that test writes both to Gradle cache
+						// and git cache very quickly.  Either of Gradle or jgit might be
 						// caching something wrong because of the fast repeated writes.
 						if (!Arrays.equals(userFile, formatted)) {
 							// If the on-disk content is equal to the formatted content,
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessPluginRedirect.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessPluginRedirect.java
index 975ec5576e..bca8ea7c70 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessPluginRedirect.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessPluginRedirect.java
@@ -73,7 +73,7 @@ public void apply(Project project) {
 				"If you like the idea behind 'ratchetFrom', you should checkout spotless-changelog",
 				"https://github.com/diffplug/spotless-changelog");
 		if (gradleIsTooOld(project)) {
-			errorMsg = errorMsg.replace("To migrate:\n", "To migrate:\n- Upgrade gradle to " + SpotlessPlugin.VER_GRADLE_min + " or newer (you're on " + project.getGradle().getGradleVersion() + ")\n");
+			errorMsg = errorMsg.replace("To migrate:\n", "To migrate:\n- Upgrade Gradle to " + SpotlessPlugin.VER_GRADLE_min + " or newer (you're on " + project.getGradle().getGradleVersion() + ")\n");
 		}
 		throw new GradleException(errorMsg);
 	}
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/SpotlessPluginRedirectTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/SpotlessPluginRedirectTest.java
index acb57f3763..e8616043d1 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/SpotlessPluginRedirectTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/SpotlessPluginRedirectTest.java
@@ -54,7 +54,7 @@ void redirectPluginOldGradle() throws IOException {
 						"   > We have moved from 'com.diffplug.gradle.spotless'",
 						"                     to 'com.diffplug.spotless'",
 						"     To migrate:",
-						"     - Upgrade gradle to 6.1.1 or newer (you're on 5.0)",
+						"     - Upgrade Gradle to 6.1.1 or newer (you're on 5.0)",
 						"     - Test your build with: id 'com.diffplug.gradle.spotless' version '4.5.1'"));
 	}
 
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index e941297aa3..ec10d96592 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -696,7 +696,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [1.23.1] - 2019-06-17
 * Fixes incorrect M2 cache directory path handling of Eclipse based formatters ([#401](https://github.com/diffplug/spotless/issues/401))
-* Update jgit from `4.9.0.201710071750-r` to `5.3.2.201906051522-r` because gradle project is sometimes broken by `apache httpcomponents` in transitive dependency. ([#407](https://github.com/diffplug/spotless/pull/407))
+* Update jgit from `4.9.0.201710071750-r` to `5.3.2.201906051522-r` because Gradle project is sometimes broken by `apache httpcomponents` in transitive dependency. ([#407](https://github.com/diffplug/spotless/pull/407))
 
 ## [1.23.0] - 2019-04-24
 * Updated default ktlint from 0.21.0 to 0.32.0, and Maven coords to com.pinterest ([#394](https://github.com/diffplug/spotless/pull/394))
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenRunner.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenRunner.java
index d878b18c5f..3f4c163443 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenRunner.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenRunner.java
@@ -29,7 +29,7 @@
 
 /**
  * Harness for running a maven build, same idea as the
- * <a href="https://docs.gradle.org/current/javadoc/org/gradle/testkit/runner/GradleRunner.html">GradleRunner from the gradle testkit</a>.
+ * <a href="https://docs.gradle.org/current/javadoc/org/gradle/testkit/runner/GradleRunner.html">GradleRunner from the Gradle testkit</a>.
  */
 public class MavenRunner {
 	public static MavenRunner create() {

From 5cc0c55f37cdbce9d4c7e2f887b6f986ee6ee409 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Wed, 8 Nov 2023 10:38:01 +0800
Subject: [PATCH 36/57] Capitalized Maven names in docs

---
 CHANGES.md                                     | 18 +++++++++---------
 CONTRIBUTING.md                                |  2 +-
 ISSUE_TEMPLATE.md                              |  2 +-
 README.md                                      |  4 ++--
 .../npm/PrettierMissingParserException.java    |  2 +-
 plugin-gradle/CHANGES.md                       |  8 ++++----
 plugin-gradle/README.md                        |  4 ++--
 .../gradle/spotless/SpotlessCheck.java         |  2 +-
 .../spotless/SpotlessPluginRedirectTest.java   |  2 +-
 plugin-maven/CHANGES.md                        | 12 ++++++------
 plugin-maven/README.md                         |  4 ++--
 .../diffplug/spotless/maven/MavenRunner.java   |  4 ++--
 12 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index d8d6a2a168..c1a11e3a0a 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -21,7 +21,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
   The configuration is still the same, but you should switch to the new `biome` tag / function and adjust
   the version accordingly. ([#1804](https://github.com/diffplug/spotless/issues/1804)).
 * Support for `google-java-format`'s `skip-javadoc-formatting` option. ([#1793](https://github.com/diffplug/spotless/pull/1793))
-* Support configuration of mirrors for P2 repositories in maven DSL ([#1697](https://github.com/diffplug/spotless/issues/1697)).
+* Support configuration of mirrors for P2 repositories in Maven DSL ([#1697](https://github.com/diffplug/spotless/issues/1697)).
 * New line endings mode `GIT_ATTRIBUTES_FAST_ALLSAME`. ([#1838](https://github.com/diffplug/spotless/pull/1838))
 ### Fixed
 * Fix support for plugins when using Prettier version `3.0.0` and newer. ([#1802](https://github.com/diffplug/spotless/pull/1802))
@@ -135,7 +135,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [2.33.0] - 2023-01-26
 ### Added
-* `ProcessRunner` has added some convenience methods so it can be used for maven testing. ([#1496](https://github.com/diffplug/spotless/pull/1496))
+* `ProcessRunner` has added some convenience methods so it can be used for Maven testing. ([#1496](https://github.com/diffplug/spotless/pull/1496))
 * `ProcessRunner` allows to limit captured output to a certain number of bytes. ([#1511](https://github.com/diffplug/spotless/pull/1511))
 * `ProcessRunner` is now capable of handling long-running tasks where waiting for exit is delegated to the caller. ([#1511](https://github.com/diffplug/spotless/pull/1511))
 * Allow to specify node executable for node-based formatters using `nodeExecutable` parameter ([#1500](https://github.com/diffplug/spotless/pull/1500))
@@ -208,7 +208,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [2.29.0] - 2022-08-23
 ### Added
-* `scalafmt` integration now has a configuration option `majorScalaVersion` that allows you to configure the Scala version that gets resolved from the maven artifact ([#1283](https://github.com/diffplug/spotless/pull/1283))
+* `scalafmt` integration now has a configuration option `majorScalaVersion` that allows you to configure the Scala version that gets resolved from the Maven artifact ([#1283](https://github.com/diffplug/spotless/pull/1283))
   * Converted `scalafmt` integration to use a compile-only source set (fixes [#524](https://github.com/diffplug/spotless/issues/524))
 ### Changes
 * Add the `ktlint` rule in error messages when `ktlint` fails to apply a fix ([#1279](https://github.com/diffplug/spotless/pull/1279))
@@ -433,7 +433,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Changed
 * Update ktfmt from 0.21 to 0.24
 ### Fixed
-* The `<url>` field in the maven POM is now set correctly ([#798](https://github.com/diffplug/spotless/issues/798))
+* The `<url>` field in the Maven POM is now set correctly ([#798](https://github.com/diffplug/spotless/issues/798))
 * Node is re-installed if some other build step removed it ([#863](https://github.com/diffplug/spotless/issues/863))
 
 ## [2.13.4] - 2021-04-21
@@ -507,7 +507,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [2.8.0] - 2020-10-05
 ### Added
-* Exposed new methods in `GitRatchet` to support faster ratcheting in the maven plugin ([#706](https://github.com/diffplug/spotless/pull/706)).
+* Exposed new methods in `GitRatchet` to support faster ratcheting in the Maven plugin ([#706](https://github.com/diffplug/spotless/pull/706)).
 
 ## [2.7.0] - 2020-09-21
 ### Added
@@ -578,10 +578,10 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * `FormatterFunc.NeedsFile` for implementing file-based formatters more cleanly than we have so far ([#637](https://github.com/diffplug/spotless/issues/637)).
 ### Changed
 * **BREAKING** `FileSignature` can no longer sign folders, only files.  Signatures are now based only on filename (not path), size, and a content hash.  It throws an error if a signature is attempted on a folder or on multiple files with different paths but the same filename - it never breaks silently.  This change does not break any of Spotless' internal logic, so it is unlikely to affect any of Spotless' consumers either. ([#571](https://github.com/diffplug/spotless/pull/571))
-  * This change allows the maven plugin to cache classloaders across subprojects when loading config resources from the classpath (fixes [#559](https://github.com/diffplug/spotless/issues/559)).
+  * This change allows the Maven plugin to cache classloaders across subprojects when loading config resources from the classpath (fixes [#559](https://github.com/diffplug/spotless/issues/559)).
   * This change also allows the Gradle plugin to work with the remote buildcache (fixes [#280](https://github.com/diffplug/spotless/issues/280)).
 * **BREAKING** `FormatterFunc` no longer `extends ThrowingEx.Function` and `BiFunction`. In a major win for Java's idea of ["target typing"](https://cr.openjdk.java.net/~briangoetz/lambda/lambda-state-final.html), this required no changes anywhere in the codebase except deleting the `extends` part of `FormatterFunc` ([#638](https://github.com/diffplug/spotless/issues/638)).
-* **BREAKING** Heavy refactor of the `LicenseHeaderStep` public API.  Doesn't change internal behavior, but makes implementation of the Gradle and maven plugins much easier. ([#628](https://github.com/diffplug/spotless/pull/628))
+* **BREAKING** Heavy refactor of the `LicenseHeaderStep` public API.  Doesn't change internal behavior, but makes implementation of the Gradle and Maven plugins much easier. ([#628](https://github.com/diffplug/spotless/pull/628))
 * **BREAKING** Removed all deprecated methods and classes from `lib` and `lib-extra`.
   * [#629](https://github.com/diffplug/spotless/pull/629) removes the code which wasn't being used in plugin-gradle or plugin-maven.
   * [#630](https://github.com/diffplug/spotless/pull/630) moves the code which was still being used in deprecated parts of plugin-gradle into `.deprecated` package in `plugin-gradle`, which allows us to break `lib` without a breaking change in `plugin-gradle`.
@@ -659,7 +659,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [1.27.0] - 2020-01-01
 * Ignored `KtLintStepTest`, because [gradle/gradle#11752](https://github.com/gradle/gradle/issues/11752) is causing too many CI failures. ([#499](https://github.com/diffplug/spotless/pull/499))
     * Also fixed a minor problem in TestProvisioner.
-* If you set the environment variable `SPOTLESS_EXCLUDE_MAVEN=true` then the maven plugin will be excluded from the build. ([#502](https://github.com/diffplug/spotless/pull/502))
+* If you set the environment variable `SPOTLESS_EXCLUDE_MAVEN=true` then the Maven plugin will be excluded from the build. ([#502](https://github.com/diffplug/spotless/pull/502))
     * We have set this in JitPack, as a workaround for [jitpack/jitpack.io#4112](https://github.com/jitpack/jitpack.io/issues/4112)
 * Deprecated `SpotlessCache.clear()` in favor of the new `SpotlessCache.clearOnce(Object key)`. ([#501](https://github.com/diffplug/spotless/issues/#501))
 
@@ -707,7 +707,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Updated default eclipse-jdt from 4.11.0 to 4.12.0 ([#423](https://github.com/diffplug/spotless/pull/423)).
 * Updated default eclipse-cdt from 4.11.0 to 4.12.0 ([#423](https://github.com/diffplug/spotless/pull/423)).
     * **KNOWN BUG - accidentally published CDT 9.7 rather than 9.8 - fixed in 1.26.0**
-* Added new maven coordinates for scalafmt 2.0.0+, maintains backwards compatability ([#415](https://github.com/diffplug/spotless/issues/415))
+* Added new Maven coordinates for scalafmt 2.0.0+, maintains backwards compatability ([#415](https://github.com/diffplug/spotless/issues/415))
 
 ## [1.23.1] - 2019-06-17
 * Fixes incorrect M2 cache directory path handling of Eclipse based formatters ([#401](https://github.com/diffplug/spotless/issues/401))
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 852a694470..287d835bca 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -27,7 +27,7 @@ Spotless also provides `PaddedCell`, which makes it easy to diagnose and correct
 
 ## Project layout
 
-For the folders below in monospace text, they are published on maven central at the coordinate `com.diffplug.spotless:spotless-${FOLDER_NAME}`.  The other folders are dev infrastructure.
+For the folders below in monospace text, they are published on MavenCentral at the coordinate `com.diffplug.spotless:spotless-${FOLDER_NAME}`.  The other folders are dev infrastructure.
 
 | Folder | Description |
 | ------ | ----------- |
diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
index 36cda06b7e..76d0ce19ab 100644
--- a/ISSUE_TEMPLATE.md
+++ b/ISSUE_TEMPLATE.md
@@ -1,7 +1,7 @@
 If you are submitting a **bug**, please include the following:
 
 - [ ] summary of problem
-- [ ] Gradle or maven version
+- [ ] Gradle or Maven version
 - [ ] spotless version
 - [ ] operating system and version
 - [ ] copy-paste your full Spotless configuration block(s), and a link to a public git repo that reproduces the problem if possible
diff --git a/README.md b/README.md
index 2c45e9e444..d31fd15b8c 100644
--- a/README.md
+++ b/README.md
@@ -169,7 +169,7 @@ Once someone has filled in one square of the formatter/build system matrix, it's
 
 ## Acknowledgements
 
-- Thanks to [Konstantin Lutovich](https://github.com/lutovich) for [implementing and maintaining the maven plugin](https://github.com/diffplug/spotless/pull/188), as well as fixing [remote-build cache support for Gradle](https://github.com/diffplug/spotless/pull/571).
+- Thanks to [Konstantin Lutovich](https://github.com/lutovich) for [implementing and maintaining the Maven plugin](https://github.com/diffplug/spotless/pull/188), as well as fixing [remote-build cache support for Gradle](https://github.com/diffplug/spotless/pull/571).
 - Thanks to [Frank Vennemeyer](https://github.com/fvgh) for [Groovy support via greclipse](https://github.com/diffplug/spotless/issues/13), [C++ support via CDT](https://github.com/diffplug/spotless/issues/232), [XML support via WTP](https://github.com/diffplug/spotless/pull/241) and a huge body of work with other eclipse-based formatters.
 - Thanks to [Jonathan Bluett-Duncan](https://github.com/jbduncan) for
   - implementing up-to-date checking [#31](https://github.com/diffplug/spotless/issues/31)
@@ -195,7 +195,7 @@ Once someone has filled in one square of the formatter/build system matrix, it's
 - Thanks to [Baptiste Mesta](https://github.com/baptistemesta) for
   - porting the DBeaver formatter to Spotless, and thanks to [DBeaver](https://dbeaver.jkiss.org/) and [its authors](https://github.com/serge-rider/dbeaver/graphs/contributors) for their excellent SQL formatter.
   - making license headers date-aware [#179](https://github.com/diffplug/spotless/pull/179)
-- Thanks to [vmdominguez](https://github.com/vmdominguez) and [Luis Fors](https://github.com/luis-fors-cb) for adding the ability to limit formatting to specific files in Gradle ([#322](https://github.com/diffplug/spotless/pull/322)) and maven ([#392](https://github.com/diffplug/spotless/pull/392)), respectively.
+- Thanks to [vmdominguez](https://github.com/vmdominguez) and [Luis Fors](https://github.com/luis-fors-cb) for adding the ability to limit formatting to specific files in Gradle ([#322](https://github.com/diffplug/spotless/pull/322)) and Maven ([#392](https://github.com/diffplug/spotless/pull/392)), respectively.
 - Thanks to [bender316](https://github.com/bender316) for fixing classloading on Java 9 ([#426](https://github.com/diffplug/spotless/pull/426)).
 - Thanks to [Stefan Oehme](https://github.com/oehme) for tons of help on the internal mechanics of Gradle.
 - Thanks to [eyalkaspi](https://github.com/eyalkaspi) for adding configurable date ranges to the date-aware license headers.
diff --git a/lib/src/main/java/com/diffplug/spotless/npm/PrettierMissingParserException.java b/lib/src/main/java/com/diffplug/spotless/npm/PrettierMissingParserException.java
index 4debfd5720..cc04c7b182 100644
--- a/lib/src/main/java/com/diffplug/spotless/npm/PrettierMissingParserException.java
+++ b/lib/src/main/java/com/diffplug/spotless/npm/PrettierMissingParserException.java
@@ -96,7 +96,7 @@ private static String recommendPlugin(File file) {
 				+ "\n\n"
 				+ "For instructions on how to include plugins for prettier in spotless see our documentation:\n"
 				+ "- for Gradle <https://github.com/diffplug/spotless/tree/main/plugin-gradle#prettier-plugins>\n"
-				+ "- for maven <https://github.com/diffplug/spotless/tree/main/plugin-maven#prettier-plugins>";
+				+ "- for Maven <https://github.com/diffplug/spotless/tree/main/plugin-maven#prettier-plugins>";
 	}
 
 	private static String guessPlugin(File file) {
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index ac3e4f1c38..e2379a8b5c 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -211,7 +211,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [6.10.0] - 2022-08-23
 ### Added
-* `scalafmt` integration now has a configuration option `majorScalaVersion` that allows you to configure the Scala version that gets resolved from the maven artifact ([#1283](https://github.com/diffplug/spotless/pull/1283))
+* `scalafmt` integration now has a configuration option `majorScalaVersion` that allows you to configure the Scala version that gets resolved from the Maven artifact ([#1283](https://github.com/diffplug/spotless/pull/1283))
 ### Changes
 * Add the `ktlint` rule in error messages when `ktlint` fails to apply a fix ([#1279](https://github.com/diffplug/spotless/pull/1279))
 * Bump default `scalafmt` to latest `3.0.8` -> `3.5.9` (removed support for pre-`3.0.0`) ([#1283](https://github.com/diffplug/spotless/pull/1283))
@@ -496,7 +496,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Changed
 * Update ktfmt from 0.21 to 0.24
 ### Fixed
-* The `<url>` field in the maven POM is now set correctly ([#798](https://github.com/diffplug/spotless/issues/798))
+* The `<url>` field in the Maven POM is now set correctly ([#798](https://github.com/diffplug/spotless/issues/798))
 * Node is re-installed if some other build step removed it ([#863](https://github.com/diffplug/spotless/issues/863))
 
 ## [5.12.4] - 2021-04-21
@@ -864,7 +864,7 @@ spotless {
 * Updated default eclipse-jdt from 4.11.0 to 4.12.0 ([#423](https://github.com/diffplug/spotless/pull/423)).
 * Updated default eclipse-cdt from 4.11.0 to 4.12.0 ([#423](https://github.com/diffplug/spotless/pull/423)).
     * **KNOWN BUG - accidentally published CDT 9.7 rather than 9.8 - fixed in 3.26.0**
-* Added new maven coordinates for scalafmt 2.0.0+, maintains backwards compatability ([#415](https://github.com/diffplug/spotless/issues/415))
+* Added new Maven coordinates for scalafmt 2.0.0+, maintains backwards compatability ([#415](https://github.com/diffplug/spotless/issues/415))
 
 ## [3.23.1] - 2019-06-17
 * Fixes incorrect M2 cache directory path handling of Eclipse based formatters ([#401](https://github.com/diffplug/spotless/issues/401))
@@ -1028,7 +1028,7 @@ spotless {
 
 ## [3.0.0] - 2017-01-09
 * BREAKING CHANGE: `customReplace` and `customReplaceRegex` renamed to just `replace` and `replaceRegex`.
-* BREAKING CHANGE: Plugin portal ID is still `com.diffplug.gradle.spotless`, but maven coordinate has changed to `com.diffplug.spotless:spotless-plugin-gradle`.
+* BREAKING CHANGE: Plugin portal ID is still `com.diffplug.gradle.spotless`, but Maven coordinate has changed to `com.diffplug.spotless:spotless-plugin-gradle`.
 * HUGE SPEEDUP: Now supports incremental build / up-to-date-checking.
   + If you are using `custom` or `customLazy`, you might want to take a look at [this javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/3.27.0/com/diffplug/gradle/spotless/FormatExtension.html#bumpThisNumberIfACustomStepChanges-int-).
 * BREAKING CHANGE: `freshmark` no longer includes all project properties by default.  All properties must now be added manually:
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 16285f88ad..4a879fe49a 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -5,7 +5,7 @@
 output = [
   link(shield('Gradle plugin', 'plugins.gradle.org', 'com.diffplug.spotless', 'blue'), 'https://plugins.gradle.org/plugin/com.diffplug.spotless'),
   link(shield('Changelog', 'changelog', '{{versionLast}}', 'blue'), 'CHANGES.md'),
-  link(shield('Maven central', 'mavencentral', 'here', 'blue'), 'https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-plugin-gradle%22'),
+  link(shield('MavenCentral', 'mavencentral', 'here', 'blue'), 'https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-plugin-gradle%22'),
   link(shield('Javadoc', 'javadoc', 'here', 'blue'), 'https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/{{versionLast}}/index.html'),
   '',
   link(shield('VS Code plugin', 'IDE', 'VS Code', 'blueviolet'), 'https://marketplace.visualstudio.com/items?itemName=richardwillis.vscode-spotless-gradle'),
@@ -15,7 +15,7 @@ output = [
 -->
 [![Gradle plugin](https://img.shields.io/badge/plugins.gradle.org-com.diffplug.spotless-blue.svg)](https://plugins.gradle.org/plugin/com.diffplug.spotless)
 [![Changelog](https://img.shields.io/badge/changelog-6.22.0-blue.svg)](CHANGES.md)
-[![Maven central](https://img.shields.io/badge/mavencentral-here-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-plugin-gradle%22)
+[![MavenCentral](https://img.shields.io/badge/mavencentral-here-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-plugin-gradle%22)
 [![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/6.22.0/index.html)
 
 [![VS Code plugin](https://img.shields.io/badge/IDE-VS_Code-blueviolet.svg)](https://marketplace.visualstudio.com/items?itemName=richardwillis.vscode-spotless-gradle)
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessCheck.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessCheck.java
index 98b88315ad..95f051371b 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessCheck.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessCheck.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/SpotlessPluginRedirectTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/SpotlessPluginRedirectTest.java
index e8616043d1..a427d6f2ec 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/SpotlessPluginRedirectTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/SpotlessPluginRedirectTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 DiffPlug
+ * Copyright 2020-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index ec10d96592..10ebfc57c1 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -142,7 +142,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Fixed
 * Respect `sourceDirectory` and `testSourceDirectory` POM configurations for Java formatters ([#1553](https://github.com/diffplug/spotless/pull/1553))
 * **POTENTIALLY BREAKING** `sortByKeys` for JSON formatting now takes into account objects inside arrays ([#1546](https://github.com/diffplug/spotless/pull/1546))
-* Any commit of the Spotless maven plugin now available via JitPack ([#1547](https://github.com/diffplug/spotless/pull/1547))
+* Any commit of the Spotless Maven plugin now available via JitPack ([#1547](https://github.com/diffplug/spotless/pull/1547))
 
 ## [2.31.0] - 2023-01-26
 ### Added
@@ -228,7 +228,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [2.25.0] - 2022-08-23
 ### Added
-* `scalafmt` integration now has a configuration option `majorScalaVersion` that allows you to configure the Scala version that gets resolved from the maven artifact ([#1283](https://github.com/diffplug/spotless/pull/1283))
+* `scalafmt` integration now has a configuration option `majorScalaVersion` that allows you to configure the Scala version that gets resolved from the Maven artifact ([#1283](https://github.com/diffplug/spotless/pull/1283))
 ### Changes
 * Add the `ktlint` rule in error messages when `ktlint` fails to apply a fix ([#1279](https://github.com/diffplug/spotless/pull/1279))
 * Bump default `scalafmt` to latest `3.0.8` -> `3.5.9` (removed support for pre-`3.0.0`) ([#1283](https://github.com/diffplug/spotless/pull/1283))
@@ -462,7 +462,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Changed
 * Update ktfmt from 0.21 to 0.24
 ### Fixed
-* The `<url>` field in the maven POM is now set correctly ([#798](https://github.com/diffplug/spotless/issues/798))
+* The `<url>` field in the Maven POM is now set correctly ([#798](https://github.com/diffplug/spotless/issues/798))
 
 ## [2.10.3] - 2021-04-21
 ### Fixed
@@ -596,7 +596,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * `prettier` will now autodetect the parser (and formatter) to use based on the filename, unless you override this using `config` or `configFile` with the option `parser` or `filepath` ([#620](https://github.com/diffplug/spotless/pull/620)).
 * Added ANTLR4 support ([#326](https://github.com/diffplug/spotless/issues/326)).
 ### Removed
-* **BREAKING** the default includes for `<typescript>` and `<cpp>` were removed, and will now generate an error if an `<include>` is not specified.  There is no well-established convention for these languages in the maven ecosystem, and the performance of the default includes is far worse than a user-provided one.  If you dislike this change, please complain in [#634](https://github.com/diffplug/spotless/pull/634), it would not be a breaking change to bring the defaults back.
+* **BREAKING** the default includes for `<typescript>` and `<cpp>` were removed, and will now generate an error if an `<include>` is not specified.  There is no well-established convention for these languages in the Maven ecosystem, and the performance of the default includes is far worse than a user-provided one.  If you dislike this change, please complain in [#634](https://github.com/diffplug/spotless/pull/634), it would not be a breaking change to bring the defaults back.
 * **BREAKING** inside the `<cpp>` block, `<eclipse>` has been renamed to `<eclipseCdt>` to avoid any confusion with the java `<eclipse>` ([#636](https://github.com/diffplug/spotless/pull/636)).
 * **BREAKING** the long-deprecated `<xml>` and `<css>` formats have been removed, in favor of the long-available [`<eclipseWtp>`](https://github.com/diffplug/spotless/tree/main/plugin-maven#eclipse-wtp) step which is available in every generic format ([#630](https://github.com/diffplug/spotless/pull/630)).
   * This probably doesn't affect you, but if it does, you just need to change `<xml>...` into `<formats><format><eclipseWtp><type>XML</type>...`
@@ -644,7 +644,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Added
 * Enable IntelliJ-compatible token `$today.year` for specifying the year in license header files. ([#542](https://github.com/diffplug/spotless/pull/542))
 ### Fixed
-* Fix scala and kotlin maven config documentation.
+* Fix scala and kotlin Maven config documentation.
 * Eclipse-WTP formatter (web tools platform, not java) could encounter errors in parallel multiproject builds [#492](https://github.com/diffplug/spotless/issues/492). Fixed for Eclipse-WTP formatter Eclipse version 4.13.0 (default version).
 
 ## [1.27.0] - 2020-01-01
@@ -692,7 +692,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Updated default eclipse-jdt from 4.11.0 to 4.12.0 ([#423](https://github.com/diffplug/spotless/pull/423)).
 * Updated default eclipse-cdt from 4.11.0 to 4.12.0 ([#423](https://github.com/diffplug/spotless/pull/423)).
     * **KNOWN BUG - accidentally published CDT 9.7 rather than 9.8 fixed in 1.26.0**
-* Added new maven coordinates for scalafmt 2.0.0+, maintains backwards compatability ([#415](https://github.com/diffplug/spotless/issues/415))
+* Added new Maven coordinates for scalafmt 2.0.0+, maintains backwards compatability ([#415](https://github.com/diffplug/spotless/issues/415))
 
 ## [1.23.1] - 2019-06-17
 * Fixes incorrect M2 cache directory path handling of Eclipse based formatters ([#401](https://github.com/diffplug/spotless/issues/401))
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 3294575e20..651eaa6720 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -2,12 +2,12 @@
 
 <!---freshmark shields
 output = [
-  link(shield('Maven central', 'mavencentral', '{{group}}:{{artifactIdMaven}}', 'blue'), 'https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22{{group}}%22%20AND%20a%3A%22{{artifactIdMaven}}%22'),
+  link(shield('MavenCentral', 'mavencentral', '{{group}}:{{artifactIdMaven}}', 'blue'), 'https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22{{group}}%22%20AND%20a%3A%22{{artifactIdMaven}}%22'),
   link(shield('Changelog', 'changelog', '{{versionLast}}', 'blue'), 'CHANGES.md'),
   link(shield('Javadoc', 'javadoc', 'here', 'blue'), 'https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/{{versionLast}}/index.html')
   ].join('\n');
 -->
-[![Maven central](https://img.shields.io/badge/mavencentral-com.diffplug.spotless%3Aspotless--maven--plugin-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-maven-plugin%22)
+[![MavenCentral](https://img.shields.io/badge/mavencentral-com.diffplug.spotless%3Aspotless--maven--plugin-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-maven-plugin%22)
 [![Changelog](https://img.shields.io/badge/changelog-2.40.0-blue.svg)](CHANGES.md)
 [![Javadoc](https://img.shields.io/badge/javadoc-here-blue.svg)](https://javadoc.io/doc/com.diffplug.spotless/spotless-maven-plugin/2.40.0/index.html)
 <!---freshmark /shields -->
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenRunner.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenRunner.java
index 3f4c163443..c8d845f8a2 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenRunner.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenRunner.java
@@ -28,7 +28,7 @@
 import com.diffplug.spotless.ProcessRunner;
 
 /**
- * Harness for running a maven build, same idea as the
+ * Harness for running a Maven build, same idea as the
  * <a href="https://docs.gradle.org/current/javadoc/org/gradle/testkit/runner/GradleRunner.html">GradleRunner from the Gradle testkit</a>.
  */
 public class MavenRunner {
@@ -67,7 +67,7 @@ public MavenRunner withRemoteDebug(int port) {
 	private ProcessRunner.Result run() throws IOException, InterruptedException {
 		Objects.requireNonNull(projectDir, "Need to call withProjectDir() first");
 		Objects.requireNonNull(args, "Need to call withArguments() first");
-		// run maven with the given args in the given directory
+		// run Maven with the given args in the given directory
 		String argsString = "-e " + String.join(" ", Arrays.asList(args));
 		return runner.shellWinUnix(projectDir, environment, "mvnw " + argsString, "./mvnw " + argsString);
 	}

From 2ff556b74e485dec0115bf1db35cde99e78e025a Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Sun, 19 Nov 2023 01:46:50 +0800
Subject: [PATCH 37/57] Check if EditorConfig file exist for Ktlint in
 KotlinGradleExtension

Follow up 959fd854c36080caa13123de2089ebcb7396adb4.
---
 plugin-gradle/CHANGES.md                                   | 1 +
 .../diffplug/gradle/spotless/KotlinGradleExtension.java    | 7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index e2379a8b5c..9d833b0076 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -5,6 +5,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Fixed
 * Fix Eclipse JDT on some settings files. ([#1864](https://github.com/diffplug/spotless/pull/1864) fixes [#1638](https://github.com/diffplug/spotless/issues/1638))
+* Check if EditorConfig file exist for Ktlint in KotlinGradleExtension. ([#1889](https://github.com/diffplug/spotless/pull/1889)
 ### Changes
 * Bump default `ktlint` version to latest `1.0.0` -> `1.0.1`. ([#1855](https://github.com/diffplug/spotless/pull/1855))
 ### Fixed
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java
index b3351194ba..751b649491 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java
@@ -74,11 +74,14 @@ public class KotlinFormatExtension {
 		}
 
 		public KotlinFormatExtension setEditorConfigPath(Object editorConfigPath) throws IOException {
-
 			if (editorConfigPath == null) {
 				this.editorConfigPath = null;
 			} else {
-				this.editorConfigPath = FileSignature.signAsList(getProject().file(editorConfigPath));
+				File editorConfigFile = getProject().file(editorConfigPath);
+				if (!editorConfigFile.exists()) {
+					throw new IllegalArgumentException("EditorConfig file does not exist: " + editorConfigFile);
+				}
+				this.editorConfigPath = FileSignature.signAsList(editorConfigFile);
 			}
 			replaceStep(createStep());
 			return this;

From 459708539308161e9f9f91de99a453053535dfb1 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Sun, 19 Nov 2023 01:55:53 +0800
Subject: [PATCH 38/57] Reuse configs for KotlinExtension and
 KotlinGradleExtension

---
 .../diffplug/spotless/kotlin/DiktatStep.java  |   4 -
 .../diffplug/spotless/kotlin/KtLintStep.java  |  17 --
 .../gradle/spotless/BaseKotlinExtension.java  | 209 ++++++++++++++++++
 .../gradle/spotless/KotlinExtension.java      | 183 +--------------
 .../spotless/KotlinGradleExtension.java       | 189 +---------------
 5 files changed, 217 insertions(+), 385 deletions(-)
 create mode 100644 plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BaseKotlinExtension.java

diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java
index fefda39784..a2650e31fc 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java
@@ -53,10 +53,6 @@ public static FormatterStep create(String versionDiktat, Provisioner provisioner
 		return create(versionDiktat, provisioner, false, config);
 	}
 
-	public static FormatterStep createForScript(String versionDiktat, Provisioner provisioner, @Nullable FileSignature config) {
-		return create(versionDiktat, provisioner, true, config);
-	}
-
 	public static FormatterStep create(String versionDiktat, Provisioner provisioner, boolean isScript, @Nullable FileSignature config) {
 		if (BadSemver.version(versionDiktat) < BadSemver.version(MIN_SUPPORTED_VERSION)) {
 			throw new IllegalStateException("Minimum required Diktat version is " + MIN_SUPPORTED_VERSION + ", you tried " + versionDiktat + " which is too old");
diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
index 4aca4da02e..13fba97c57 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
@@ -54,23 +54,6 @@ public static FormatterStep create(String version, Provisioner provisioner,
 		return create(version, provisioner, false, null, userData, editorConfigOverride);
 	}
 
-	public static FormatterStep createForScript(String version, Provisioner provisioner) {
-		return create(version, provisioner, true, null, Collections.emptyMap(), Collections.emptyMap());
-	}
-
-	public static FormatterStep createForScript(String version,
-			Provisioner provisioner,
-			@Nullable FileSignature editorConfigPath,
-			Map<String, String> userData,
-			Map<String, Object> editorConfigOverride) {
-		return create(version,
-				provisioner,
-				true,
-				editorConfigPath,
-				userData,
-				editorConfigOverride);
-	}
-
 	public static FormatterStep create(String version,
 			Provisioner provisioner,
 			boolean isScript,
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BaseKotlinExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BaseKotlinExtension.java
new file mode 100644
index 0000000000..5ced54a94e
--- /dev/null
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BaseKotlinExtension.java
@@ -0,0 +1,209 @@
+/*
+ * Copyright 2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.gradle.spotless;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Collections;
+import java.util.Map;
+import java.util.Objects;
+import java.util.function.Consumer;
+
+import javax.annotation.Nullable;
+
+import com.diffplug.common.collect.ImmutableSortedMap;
+import com.diffplug.spotless.FileSignature;
+import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.kotlin.DiktatStep;
+import com.diffplug.spotless.kotlin.KtLintStep;
+import com.diffplug.spotless.kotlin.KtfmtStep;
+
+public abstract class BaseKotlinExtension extends FormatExtension {
+	public BaseKotlinExtension(SpotlessExtension spotless) {
+		super(spotless);
+	}
+
+	public DiktatConfig diktat() {
+		return diktat(DiktatStep.defaultVersionDiktat());
+	}
+
+	/** Adds the specified version of <a href="https://github.com/cqfn/diKTat">diktat</a>. */
+	public DiktatConfig diktat(String version) {
+		return new DiktatConfig(version);
+	}
+
+	public KtlintConfig ktlint() throws IOException {
+		return ktlint(KtLintStep.defaultVersion());
+	}
+
+	/** Adds the specified version of <a href="https://github.com/pinterest/ktlint">ktlint</a>. */
+	public KtlintConfig ktlint(String version) throws IOException {
+		return new KtlintConfig(version, Collections.emptyMap(), Collections.emptyMap());
+	}
+
+	/** Uses the <a href="https://github.com/facebookincubator/ktfmt">ktfmt</a> jar to format source code. */
+	public KtfmtConfig ktfmt() {
+		return ktfmt(KtfmtStep.defaultVersion());
+	}
+
+	/**
+	 * Uses the given version of <a href="https://github.com/facebookincubator/ktfmt">ktfmt</a> and applies the dropbox style
+	 * option to format source code.
+	 */
+	public KtfmtConfig ktfmt(String version) {
+		return new KtfmtConfig(version);
+	}
+
+	protected abstract boolean isScript();
+
+	public class DiktatConfig {
+
+		private final String version;
+		private FileSignature config;
+
+		DiktatConfig(String version) {
+			Objects.requireNonNull(version, "version");
+			this.version = version;
+			addStep(createStep());
+		}
+
+		public DiktatConfig configFile(Object file) throws IOException {
+			// Specify the path to the configuration file
+			if (file == null) {
+				this.config = null;
+			} else {
+				this.config = FileSignature.signAsList(getProject().file(file));
+			}
+			replaceStep(createStep());
+			return this;
+		}
+
+		private FormatterStep createStep() {
+			return DiktatStep.create(version, provisioner(), isScript(), config);
+		}
+	}
+
+	public class KtfmtConfig {
+		final String version;
+		KtfmtStep.Style style;
+		KtfmtStep.KtfmtFormattingOptions options;
+
+		private final ConfigurableStyle configurableStyle = new ConfigurableStyle();
+
+		KtfmtConfig(String version) {
+			Objects.requireNonNull(version);
+			this.version = Objects.requireNonNull(version);
+			addStep(createStep());
+		}
+
+		private ConfigurableStyle style(KtfmtStep.Style style) {
+			this.style = style;
+			replaceStep(createStep());
+			return configurableStyle;
+		}
+
+		public ConfigurableStyle dropboxStyle() {
+			return style(KtfmtStep.Style.DROPBOX);
+		}
+
+		public ConfigurableStyle googleStyle() {
+			return style(KtfmtStep.Style.GOOGLE);
+		}
+
+		public ConfigurableStyle kotlinlangStyle() {
+			return style(KtfmtStep.Style.KOTLINLANG);
+		}
+
+		public void configure(Consumer<KtfmtStep.KtfmtFormattingOptions> optionsConfiguration) {
+			this.configurableStyle.configure(optionsConfiguration);
+		}
+
+		private FormatterStep createStep() {
+			return KtfmtStep.create(version, provisioner(), style, options);
+		}
+
+		public class ConfigurableStyle {
+
+			public void configure(Consumer<KtfmtStep.KtfmtFormattingOptions> optionsConfiguration) {
+				KtfmtStep.KtfmtFormattingOptions ktfmtFormattingOptions = new KtfmtStep.KtfmtFormattingOptions();
+				optionsConfiguration.accept(ktfmtFormattingOptions);
+				options = ktfmtFormattingOptions;
+				replaceStep(createStep());
+			}
+		}
+	}
+
+	public class KtlintConfig {
+
+		private final String version;
+		@Nullable
+		private FileSignature editorConfigPath;
+		private Map<String, String> userData;
+		private Map<String, Object> editorConfigOverride;
+
+		KtlintConfig(String version, Map<String, String> config,
+				Map<String, Object> editorConfigOverride) throws IOException {
+			Objects.requireNonNull(version);
+			File defaultEditorConfig = getProject().getRootProject().file(".editorconfig");
+			FileSignature editorConfigPath = defaultEditorConfig.exists() ? FileSignature.signAsList(defaultEditorConfig) : null;
+			this.version = version;
+			this.editorConfigPath = editorConfigPath;
+			this.userData = config;
+			this.editorConfigOverride = editorConfigOverride;
+			addStep(createStep());
+		}
+
+		public KtlintConfig setEditorConfigPath(Object editorConfigPath) throws IOException {
+			if (editorConfigPath == null) {
+				this.editorConfigPath = null;
+			} else {
+				File editorConfigFile = getProject().file(editorConfigPath);
+				if (!editorConfigFile.exists()) {
+					throw new IllegalArgumentException("EditorConfig file does not exist: " + editorConfigFile);
+				}
+				this.editorConfigPath = FileSignature.signAsList(editorConfigFile);
+			}
+			replaceStep(createStep());
+			return this;
+		}
+
+		public KtlintConfig userData(Map<String, String> userData) {
+			// Copy the map to a sorted map because up-to-date checking is based on binary-equals of the serialized
+			// representation.
+			this.userData = ImmutableSortedMap.copyOf(userData);
+			replaceStep(createStep());
+			return this;
+		}
+
+		public KtlintConfig editorConfigOverride(Map<String, Object> editorConfigOverride) {
+			// Copy the map to a sorted map because up-to-date checking is based on binary-equals of the serialized
+			// representation.
+			this.editorConfigOverride = ImmutableSortedMap.copyOf(editorConfigOverride);
+			replaceStep(createStep());
+			return this;
+		}
+
+		private FormatterStep createStep() {
+			return KtLintStep.create(
+					version,
+					provisioner(),
+					isScript(),
+					editorConfigPath,
+					userData,
+					editorConfigOverride);
+		}
+	}
+}
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java
index 27d93717f4..21ccb8dd0f 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java
@@ -17,28 +17,11 @@
 
 import static com.diffplug.spotless.kotlin.KotlinConstants.LICENSE_HEADER_DELIMITER;
 
-import java.io.File;
-import java.io.IOException;
-import java.util.Collections;
-import java.util.Map;
-import java.util.Objects;
-import java.util.function.Consumer;
-
-import javax.annotation.Nullable;
 import javax.inject.Inject;
 
 import org.gradle.api.tasks.SourceSet;
 
-import com.diffplug.common.collect.ImmutableSortedMap;
-import com.diffplug.spotless.FileSignature;
-import com.diffplug.spotless.FormatterStep;
-import com.diffplug.spotless.kotlin.DiktatStep;
-import com.diffplug.spotless.kotlin.KtLintStep;
-import com.diffplug.spotless.kotlin.KtfmtStep;
-import com.diffplug.spotless.kotlin.KtfmtStep.KtfmtFormattingOptions;
-import com.diffplug.spotless.kotlin.KtfmtStep.Style;
-
-public class KotlinExtension extends FormatExtension implements HasBuiltinDelimiterForLicense, JvmLang {
+public class KotlinExtension extends BaseKotlinExtension implements HasBuiltinDelimiterForLicense, JvmLang {
 	static final String NAME = "kotlin";
 
 	@Inject
@@ -56,167 +39,9 @@ public LicenseHeaderConfig licenseHeaderFile(Object licenseHeaderFile) {
 		return licenseHeaderFile(licenseHeaderFile, LICENSE_HEADER_DELIMITER);
 	}
 
-	/** Adds the specified version of <a href="https://github.com/pinterest/ktlint">ktlint</a>. */
-	public KotlinFormatExtension ktlint(String version) throws IOException {
-		Objects.requireNonNull(version);
-		File defaultEditorConfig = getProject().getRootProject().file(".editorconfig");
-		FileSignature editorConfigPath = defaultEditorConfig.exists() ? FileSignature.signAsList(defaultEditorConfig) : null;
-		return new KotlinFormatExtension(version, editorConfigPath, Collections.emptyMap(), Collections.emptyMap());
-	}
-
-	public KotlinFormatExtension ktlint() throws IOException {
-		return ktlint(KtLintStep.defaultVersion());
-	}
-
-	public class KotlinFormatExtension {
-
-		private final String version;
-		@Nullable
-		private FileSignature editorConfigPath;
-		private Map<String, String> userData;
-		private Map<String, Object> editorConfigOverride;
-
-		KotlinFormatExtension(String version, @Nullable FileSignature editorConfigPath, Map<String, String> config,
-				Map<String, Object> editorConfigOverride) {
-			this.version = version;
-			this.editorConfigPath = editorConfigPath;
-			this.userData = config;
-			this.editorConfigOverride = editorConfigOverride;
-			addStep(createStep());
-		}
-
-		public KotlinFormatExtension setEditorConfigPath(Object editorConfigPath) throws IOException {
-			if (editorConfigPath == null) {
-				this.editorConfigPath = null;
-			} else {
-				File editorConfigFile = getProject().file(editorConfigPath);
-				if (!editorConfigFile.exists()) {
-					throw new IllegalArgumentException("EditorConfig file does not exist: " + editorConfigFile);
-				}
-				this.editorConfigPath = FileSignature.signAsList(editorConfigFile);
-			}
-			replaceStep(createStep());
-			return this;
-		}
-
-		public KotlinFormatExtension userData(Map<String, String> userData) {
-			// Copy the map to a sorted map because up-to-date checking is based on binary-equals of the serialized
-			// representation.
-			this.userData = ImmutableSortedMap.copyOf(userData);
-			replaceStep(createStep());
-			return this;
-		}
-
-		public KotlinFormatExtension editorConfigOverride(Map<String, Object> editorConfigOverride) {
-			// Copy the map to a sorted map because up-to-date checking is based on binary-equals of the serialized
-			// representation.
-			this.editorConfigOverride = ImmutableSortedMap.copyOf(editorConfigOverride);
-			replaceStep(createStep());
-			return this;
-		}
-
-		private FormatterStep createStep() {
-			return KtLintStep.create(version, provisioner(), false, editorConfigPath, userData, editorConfigOverride);
-		}
-	}
-
-	/** Uses the <a href="https://github.com/facebookincubator/ktfmt">ktfmt</a> jar to format source code. */
-	public KtfmtConfig ktfmt() {
-		return ktfmt(KtfmtStep.defaultVersion());
-	}
-
-	/**
-	 * Uses the given version of <a href="https://github.com/facebookincubator/ktfmt">ktfmt</a> and applies the dropbox style
-	 * option to format source code.
-	 */
-	public KtfmtConfig ktfmt(String version) {
-		Objects.requireNonNull(version);
-		return new KtfmtConfig(version);
-	}
-
-	public class KtfmtConfig {
-		final String version;
-		Style style;
-		KtfmtFormattingOptions options;
-
-		private final ConfigurableStyle configurableStyle = new ConfigurableStyle();
-
-		KtfmtConfig(String version) {
-			this.version = Objects.requireNonNull(version);
-			addStep(createStep());
-		}
-
-		private ConfigurableStyle style(Style style) {
-			this.style = style;
-			replaceStep(createStep());
-			return configurableStyle;
-		}
-
-		public ConfigurableStyle dropboxStyle() {
-			return style(Style.DROPBOX);
-		}
-
-		public ConfigurableStyle googleStyle() {
-			return style(Style.GOOGLE);
-		}
-
-		public ConfigurableStyle kotlinlangStyle() {
-			return style(Style.KOTLINLANG);
-		}
-
-		public void configure(Consumer<KtfmtFormattingOptions> optionsConfiguration) {
-			this.configurableStyle.configure(optionsConfiguration);
-		}
-
-		private FormatterStep createStep() {
-			return KtfmtStep.create(version, provisioner(), style, options);
-		}
-
-		public class ConfigurableStyle {
-
-			public void configure(Consumer<KtfmtFormattingOptions> optionsConfiguration) {
-				KtfmtFormattingOptions ktfmtFormattingOptions = new KtfmtFormattingOptions();
-				optionsConfiguration.accept(ktfmtFormattingOptions);
-				options = ktfmtFormattingOptions;
-				replaceStep(createStep());
-			}
-		}
-	}
-
-	/** Adds the specified version of <a href="https://github.com/cqfn/diKTat">diktat</a>. */
-	public DiktatFormatExtension diktat(String version) {
-		Objects.requireNonNull(version);
-		return new DiktatFormatExtension(version);
-	}
-
-	public DiktatFormatExtension diktat() {
-		return diktat(DiktatStep.defaultVersionDiktat());
-	}
-
-	public class DiktatFormatExtension {
-
-		private final String version;
-		private FileSignature config;
-
-		DiktatFormatExtension(String version) {
-			this.version = version;
-			addStep(createStep());
-		}
-
-		public DiktatFormatExtension configFile(Object file) throws IOException {
-			// Specify the path to the configuration file
-			if (file == null) {
-				this.config = null;
-			} else {
-				this.config = FileSignature.signAsList(getProject().file(file));
-			}
-			replaceStep(createStep());
-			return this;
-		}
-
-		private FormatterStep createStep() {
-			return DiktatStep.create(version, provisioner(), config);
-		}
+	@Override
+	protected boolean isScript() {
+		return false;
 	}
 
 	/** If the user hasn't specified the files yet, we'll assume he/she means all of the kotlin files. */
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java
index 751b649491..5cf2847d62 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java
@@ -15,26 +15,9 @@
  */
 package com.diffplug.gradle.spotless;
 
-import java.io.File;
-import java.io.IOException;
-import java.util.Collections;
-import java.util.Map;
-import java.util.Objects;
-import java.util.function.Consumer;
-
-import javax.annotation.Nullable;
 import javax.inject.Inject;
 
-import com.diffplug.common.collect.ImmutableSortedMap;
-import com.diffplug.spotless.FileSignature;
-import com.diffplug.spotless.FormatterStep;
-import com.diffplug.spotless.kotlin.DiktatStep;
-import com.diffplug.spotless.kotlin.KtLintStep;
-import com.diffplug.spotless.kotlin.KtfmtStep;
-import com.diffplug.spotless.kotlin.KtfmtStep.KtfmtFormattingOptions;
-import com.diffplug.spotless.kotlin.KtfmtStep.Style;
-
-public class KotlinGradleExtension extends FormatExtension {
+public class KotlinGradleExtension extends BaseKotlinExtension {
 	private static final String GRADLE_KOTLIN_DSL_FILE_EXTENSION = "*.gradle.kts";
 
 	static final String NAME = "kotlinGradle";
@@ -44,173 +27,9 @@ public KotlinGradleExtension(SpotlessExtension spotless) {
 		super(spotless);
 	}
 
-	/** Adds the specified version of <a href="https://github.com/pinterest/ktlint">ktlint</a>. */
-	public KotlinFormatExtension ktlint(String version) throws IOException {
-		Objects.requireNonNull(version, "version");
-		File defaultEditorConfig = getProject().getRootProject().file(".editorconfig");
-		FileSignature editorConfigPath = defaultEditorConfig.exists() ? FileSignature.signAsList(defaultEditorConfig) : null;
-		return new KotlinFormatExtension(version, editorConfigPath, Collections.emptyMap(), Collections.emptyMap());
-	}
-
-	public KotlinFormatExtension ktlint() throws IOException {
-		return ktlint(KtLintStep.defaultVersion());
-	}
-
-	public class KotlinFormatExtension {
-
-		private final String version;
-		@Nullable
-		private FileSignature editorConfigPath;
-		private Map<String, String> userData;
-		private Map<String, Object> editorConfigOverride;
-
-		KotlinFormatExtension(String version, FileSignature editorConfigPath, Map<String, String> config,
-				Map<String, Object> editorConfigOverride) {
-			this.version = version;
-			this.editorConfigPath = editorConfigPath;
-			this.userData = config;
-			this.editorConfigOverride = editorConfigOverride;
-			addStep(createStep());
-		}
-
-		public KotlinFormatExtension setEditorConfigPath(Object editorConfigPath) throws IOException {
-			if (editorConfigPath == null) {
-				this.editorConfigPath = null;
-			} else {
-				File editorConfigFile = getProject().file(editorConfigPath);
-				if (!editorConfigFile.exists()) {
-					throw new IllegalArgumentException("EditorConfig file does not exist: " + editorConfigFile);
-				}
-				this.editorConfigPath = FileSignature.signAsList(editorConfigFile);
-			}
-			replaceStep(createStep());
-			return this;
-		}
-
-		public KotlinFormatExtension userData(Map<String, String> userData) {
-			// Copy the map to a sorted map because up-to-date checking is based on binary-equals of the serialized
-			// representation.
-			this.userData = ImmutableSortedMap.copyOf(userData);
-			replaceStep(createStep());
-			return this;
-		}
-
-		public KotlinFormatExtension editorConfigOverride(Map<String, Object> editorConfigOverride) {
-			// Copy the map to a sorted map because up-to-date checking is based on binary-equals of the serialized
-			// representation.
-			this.editorConfigOverride = ImmutableSortedMap.copyOf(editorConfigOverride);
-			replaceStep(createStep());
-			return this;
-		}
-
-		private FormatterStep createStep() {
-			return KtLintStep.createForScript(
-					version,
-					provisioner(),
-					editorConfigPath,
-					userData,
-					editorConfigOverride);
-		}
-	}
-
-	/** Uses the <a href="https://github.com/facebookincubator/ktfmt">ktfmt</a> jar to format source code. */
-	public KtfmtConfig ktfmt() {
-		return ktfmt(KtfmtStep.defaultVersion());
-	}
-
-	/**
-	 * Uses the given version of <a href="https://github.com/facebookincubator/ktfmt">ktfmt</a> to format source
-	 * code.
-	 */
-	public KtfmtConfig ktfmt(String version) {
-		Objects.requireNonNull(version);
-		return new KtfmtConfig(version);
-	}
-
-	public class KtfmtConfig {
-		final String version;
-		Style style;
-		KtfmtFormattingOptions options;
-
-		private final ConfigurableStyle configurableStyle = new ConfigurableStyle();
-
-		KtfmtConfig(String version) {
-			this.version = Objects.requireNonNull(version);
-			this.style = Style.DEFAULT;
-			addStep(createStep());
-		}
-
-		private ConfigurableStyle style(Style style) {
-			this.style = style;
-			replaceStep(createStep());
-			return configurableStyle;
-		}
-
-		public ConfigurableStyle dropboxStyle() {
-			return style(Style.DROPBOX);
-		}
-
-		public ConfigurableStyle googleStyle() {
-			return style(Style.GOOGLE);
-		}
-
-		public ConfigurableStyle kotlinlangStyle() {
-			return style(Style.KOTLINLANG);
-		}
-
-		public void configure(Consumer<KtfmtFormattingOptions> optionsConfiguration) {
-			this.configurableStyle.configure(optionsConfiguration);
-		}
-
-		private FormatterStep createStep() {
-			return KtfmtStep.create(version, provisioner(), style, options);
-		}
-
-		public class ConfigurableStyle {
-
-			public void configure(Consumer<KtfmtFormattingOptions> optionsConfiguration) {
-				KtfmtFormattingOptions ktfmtFormattingOptions = new KtfmtFormattingOptions();
-				optionsConfiguration.accept(ktfmtFormattingOptions);
-				options = ktfmtFormattingOptions;
-				replaceStep(createStep());
-			}
-		}
-	}
-
-	/** Adds the specified version of <a href="https://github.com/cqfn/diKTat">diktat</a>. */
-	public DiktatFormatExtension diktat(String version) {
-		Objects.requireNonNull(version, "version");
-		return new DiktatFormatExtension(version);
-	}
-
-	public DiktatFormatExtension diktat() {
-		return diktat(DiktatStep.defaultVersionDiktat());
-	}
-
-	public class DiktatFormatExtension {
-
-		private final String version;
-		private FileSignature config;
-
-		DiktatFormatExtension(String version) {
-			this.version = version;
-			addStep(createStep());
-		}
-
-		public DiktatFormatExtension configFile(Object file) throws IOException {
-			// Specify the path to the configuration file
-			if (file == null) {
-				this.config = null;
-			} else {
-				this.config = FileSignature.signAsList(getProject().file(file));
-			}
-			replaceStep(createStep());
-			return this;
-		}
-
-		private FormatterStep createStep() {
-			return DiktatStep.createForScript(version, provisioner(), config);
-		}
+	@Override
+	protected boolean isScript() {
+		return true;
 	}
 
 	@Override

From a392c72e4383952faa564b892e38357666986cf9 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Sun, 19 Nov 2023 18:22:11 +0800
Subject: [PATCH 39/57] Clean up BaseKotlinExtension

---
 .../gradle/spotless/BaseKotlinExtension.java  | 41 +++++++++----------
 1 file changed, 19 insertions(+), 22 deletions(-)

diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BaseKotlinExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BaseKotlinExtension.java
index 5ced54a94e..69de375800 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BaseKotlinExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BaseKotlinExtension.java
@@ -31,8 +31,8 @@
 import com.diffplug.spotless.kotlin.KtLintStep;
 import com.diffplug.spotless.kotlin.KtfmtStep;
 
-public abstract class BaseKotlinExtension extends FormatExtension {
-	public BaseKotlinExtension(SpotlessExtension spotless) {
+abstract class BaseKotlinExtension extends FormatExtension {
+	protected BaseKotlinExtension(SpotlessExtension spotless) {
 		super(spotless);
 	}
 
@@ -70,11 +70,10 @@ public KtfmtConfig ktfmt(String version) {
 	protected abstract boolean isScript();
 
 	public class DiktatConfig {
-
 		private final String version;
 		private FileSignature config;
 
-		DiktatConfig(String version) {
+		private DiktatConfig(String version) {
 			Objects.requireNonNull(version, "version");
 			this.version = version;
 			addStep(createStep());
@@ -97,24 +96,17 @@ private FormatterStep createStep() {
 	}
 
 	public class KtfmtConfig {
-		final String version;
-		KtfmtStep.Style style;
-		KtfmtStep.KtfmtFormattingOptions options;
-
+		private final String version;
 		private final ConfigurableStyle configurableStyle = new ConfigurableStyle();
+		private KtfmtStep.Style style;
+		private KtfmtStep.KtfmtFormattingOptions options;
 
-		KtfmtConfig(String version) {
+		private KtfmtConfig(String version) {
 			Objects.requireNonNull(version);
 			this.version = Objects.requireNonNull(version);
 			addStep(createStep());
 		}
 
-		private ConfigurableStyle style(KtfmtStep.Style style) {
-			this.style = style;
-			replaceStep(createStep());
-			return configurableStyle;
-		}
-
 		public ConfigurableStyle dropboxStyle() {
 			return style(KtfmtStep.Style.DROPBOX);
 		}
@@ -131,13 +123,18 @@ public void configure(Consumer<KtfmtStep.KtfmtFormattingOptions> optionsConfigur
 			this.configurableStyle.configure(optionsConfiguration);
 		}
 
+		private ConfigurableStyle style(KtfmtStep.Style style) {
+			this.style = style;
+			replaceStep(createStep());
+			return configurableStyle;
+		}
+
 		private FormatterStep createStep() {
 			return KtfmtStep.create(version, provisioner(), style, options);
 		}
 
 		public class ConfigurableStyle {
-
-			public void configure(Consumer<KtfmtStep.KtfmtFormattingOptions> optionsConfiguration) {
+			private void configure(Consumer<KtfmtStep.KtfmtFormattingOptions> optionsConfiguration) {
 				KtfmtStep.KtfmtFormattingOptions ktfmtFormattingOptions = new KtfmtStep.KtfmtFormattingOptions();
 				optionsConfiguration.accept(ktfmtFormattingOptions);
 				options = ktfmtFormattingOptions;
@@ -147,26 +144,26 @@ public void configure(Consumer<KtfmtStep.KtfmtFormattingOptions> optionsConfigur
 	}
 
 	public class KtlintConfig {
-
 		private final String version;
-		@Nullable
 		private FileSignature editorConfigPath;
 		private Map<String, String> userData;
 		private Map<String, Object> editorConfigOverride;
 
-		KtlintConfig(String version, Map<String, String> config,
+		private KtlintConfig(
+				String version,
+				Map<String, String> userData,
 				Map<String, Object> editorConfigOverride) throws IOException {
 			Objects.requireNonNull(version);
 			File defaultEditorConfig = getProject().getRootProject().file(".editorconfig");
 			FileSignature editorConfigPath = defaultEditorConfig.exists() ? FileSignature.signAsList(defaultEditorConfig) : null;
 			this.version = version;
 			this.editorConfigPath = editorConfigPath;
-			this.userData = config;
+			this.userData = userData;
 			this.editorConfigOverride = editorConfigOverride;
 			addStep(createStep());
 		}
 
-		public KtlintConfig setEditorConfigPath(Object editorConfigPath) throws IOException {
+		public KtlintConfig setEditorConfigPath(@Nullable Object editorConfigPath) throws IOException {
 			if (editorConfigPath == null) {
 				this.editorConfigPath = null;
 			} else {

From 7cb08d1a4c6e5e44a8279c7abe5149d8782f6794 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Sun, 19 Nov 2023 18:37:58 +0800
Subject: [PATCH 40/57] Remove unused userData param in Ktlint format step

We don't need this param anymore.
---
 .../compat/KtLintCompat0Dot48Dot0Adapter.java    |  9 ++++++---
 .../compat/KtLintCompat0Dot49Dot0Adapter.java    |  9 ++++++---
 .../compat/KtLintCompat0Dot50Dot0Adapter.java    |  9 ++++++---
 .../compat/KtLintCompat1Dot0Dot0Adapter.java     |  9 ++++++---
 .../glue/ktlint/compat/KtLintCompatAdapter.java  |  6 +++++-
 .../glue/ktlint/KtlintFormatterFunc.java         |  6 ++----
 .../com/diffplug/spotless/kotlin/KtLintStep.java | 16 ++++++----------
 .../KtLintCompat0Dot48Dot0AdapterTest.java       |  8 ++------
 .../KtLintCompat0Dot49Dot0AdapterTest.java       |  8 ++------
 .../KtLintCompat0Dot50Dot0AdapterTest.java       |  8 ++------
 .../compat/KtLintCompat1Dot0Dot0AdapterTest.java |  8 ++------
 plugin-gradle/README.md                          |  3 +--
 .../gradle/spotless/BaseKotlinExtension.java     | 14 +-------------
 .../diffplug/spotless/maven/kotlin/Ktlint.java   |  3 +--
 14 files changed, 48 insertions(+), 68 deletions(-)

diff --git a/lib/src/compatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java b/lib/src/compatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java
index 418720aa59..b409552031 100644
--- a/lib/src/compatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java
+++ b/lib/src/compatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java
@@ -73,9 +73,12 @@ public Unit invoke(LintError lint, Boolean corrected) {
 	}
 
 	@Override
-	public String format(final String text, Path path, final boolean isScript,
-			Path editorConfigPath, final Map<String, String> userData,
-			final Map<String, Object> editorConfigOverrideMap) {
+	public String format(
+			String text,
+			Path path,
+			boolean isScript,
+			Path editorConfigPath,
+			Map<String, Object> editorConfigOverrideMap) {
 		final FormatterCallback formatterCallback = new FormatterCallback();
 
 		Set<RuleProvider> allRuleProviders = ServiceLoader.load(RuleSetProviderV2.class, RuleSetProviderV2.class.getClassLoader())
diff --git a/lib/src/compatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0Adapter.java b/lib/src/compatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0Adapter.java
index ad228c131d..b524ca0e91 100644
--- a/lib/src/compatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0Adapter.java
+++ b/lib/src/compatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0Adapter.java
@@ -119,9 +119,12 @@ public Unit invoke(LintError lint, Boolean corrected) {
 	}
 
 	@Override
-	public String format(final String text, Path path, final boolean isScript,
-			Path editorConfigPath, final Map<String, String> userData,
-			final Map<String, Object> editorConfigOverrideMap) {
+	public String format(
+			String text,
+			Path path,
+			boolean isScript,
+			Path editorConfigPath,
+			Map<String, Object> editorConfigOverrideMap) {
 		final FormatterCallback formatterCallback = new FormatterCallback();
 
 		Set<RuleProvider> allRuleProviders = ServiceLoader.load(RuleSetProviderV3.class, RuleSetProviderV3.class.getClassLoader())
diff --git a/lib/src/compatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0Adapter.java b/lib/src/compatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0Adapter.java
index f7c61439de..b78a539b76 100644
--- a/lib/src/compatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0Adapter.java
+++ b/lib/src/compatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0Adapter.java
@@ -82,9 +82,12 @@ public Unit invoke(LintError lint, Boolean corrected) {
 	}
 
 	@Override
-	public String format(final String text, Path path, final boolean isScript,
-			Path editorConfigPath, final Map<String, String> userData,
-			final Map<String, Object> editorConfigOverrideMap) {
+	public String format(
+			String text,
+			Path path,
+			boolean isScript,
+			Path editorConfigPath,
+			Map<String, Object> editorConfigOverrideMap) {
 		final FormatterCallback formatterCallback = new FormatterCallback();
 
 		Set<RuleProvider> allRuleProviders = ServiceLoader.load(RuleSetProviderV3.class, RuleSetProviderV3.class.getClassLoader())
diff --git a/lib/src/compatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0Adapter.java b/lib/src/compatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0Adapter.java
index 119cb86373..c38203b900 100644
--- a/lib/src/compatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0Adapter.java
+++ b/lib/src/compatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0Adapter.java
@@ -82,9 +82,12 @@ public Unit invoke(LintError lint, Boolean corrected) {
 	}
 
 	@Override
-	public String format(final String text, Path path, final boolean isScript,
-			Path editorConfigPath, final Map<String, String> userData,
-			final Map<String, Object> editorConfigOverrideMap) {
+	public String format(
+			String text,
+			Path path,
+			boolean isScript,
+			Path editorConfigPath,
+			Map<String, Object> editorConfigOverrideMap) {
 		final FormatterCallback formatterCallback = new FormatterCallback();
 
 		Set<RuleProvider> allRuleProviders = ServiceLoader.load(RuleSetProviderV3.class, RuleSetProviderV3.class.getClassLoader())
diff --git a/lib/src/compatKtLintApi/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompatAdapter.java b/lib/src/compatKtLintApi/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompatAdapter.java
index 5e5e5fb445..5cbbac843c 100644
--- a/lib/src/compatKtLintApi/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompatAdapter.java
+++ b/lib/src/compatKtLintApi/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompatAdapter.java
@@ -20,6 +20,10 @@
 
 public interface KtLintCompatAdapter {
 
-	String format(String text, Path path, boolean isScript, Path editorConfigPath, Map<String, String> userData,
+	String format(
+			String text,
+			Path path,
+			boolean isScript,
+			Path editorConfigPath,
 			Map<String, Object> editorConfigOverrideMap);
 }
diff --git a/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java b/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
index 7ae0222566..870d3d4139 100644
--- a/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
+++ b/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
@@ -25,13 +25,12 @@
 
 public class KtlintFormatterFunc implements FormatterFunc.NeedsFile {
 
-	private final Map<String, String> userData;
 	private final boolean isScript;
 	private final KtLintCompatAdapter adapter;
 	private final FileSignature editorConfigPath;
 	private final Map<String, Object> editorConfigOverrideMap;
 
-	public KtlintFormatterFunc(String version, boolean isScript, FileSignature editorConfigPath, Map<String, String> userData,
+	public KtlintFormatterFunc(String version, boolean isScript, FileSignature editorConfigPath,
 			Map<String, Object> editorConfigOverrideMap) {
 		String[] versions = version.split("\\.");
 		int majorVersion = Integer.parseInt(versions[0]);
@@ -58,7 +57,6 @@ public KtlintFormatterFunc(String version, boolean isScript, FileSignature edito
 		}
 		this.editorConfigPath = editorConfigPath;
 		this.editorConfigOverrideMap = editorConfigOverrideMap;
-		this.userData = userData;
 		this.isScript = isScript;
 	}
 
@@ -69,6 +67,6 @@ public String applyWithFile(String unix, File file) {
 		if (editorConfigPath != null) {
 			absoluteEditorConfigPath = editorConfigPath.getOnlyFile().toPath();
 		}
-		return adapter.format(unix, file.toPath(), isScript, absoluteEditorConfigPath, userData, editorConfigOverrideMap);
+		return adapter.format(unix, file.toPath(), isScript, absoluteEditorConfigPath, editorConfigOverrideMap);
 	}
 }
diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
index 13fba97c57..7c6801a2b6 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
@@ -46,24 +46,23 @@ public static FormatterStep create(Provisioner provisioner) {
 	}
 
 	public static FormatterStep create(String version, Provisioner provisioner) {
-		return create(version, provisioner, Collections.emptyMap(), Collections.emptyMap());
+		return create(version, provisioner, Collections.emptyMap());
 	}
 
 	public static FormatterStep create(String version, Provisioner provisioner,
-			Map<String, String> userData, Map<String, Object> editorConfigOverride) {
-		return create(version, provisioner, false, null, userData, editorConfigOverride);
+			Map<String, Object> editorConfigOverride) {
+		return create(version, provisioner, false, null, editorConfigOverride);
 	}
 
 	public static FormatterStep create(String version,
 			Provisioner provisioner,
 			boolean isScript,
 			@Nullable FileSignature editorConfig,
-			Map<String, String> userData,
 			Map<String, Object> editorConfigOverride) {
 		Objects.requireNonNull(version, "version");
 		Objects.requireNonNull(provisioner, "provisioner");
 		return FormatterStep.createLazy(NAME,
-				() -> new State(version, provisioner, isScript, editorConfig, userData, editorConfigOverride),
+				() -> new State(version, provisioner, isScript, editorConfig, editorConfigOverride),
 				State::createFormat);
 	}
 
@@ -78,7 +77,6 @@ static final class State implements Serializable {
 		private final boolean isScript;
 		/** The jar that contains the formatter. */
 		final JarState jarState;
-		private final TreeMap<String, String> userData;
 		private final TreeMap<String, Object> editorConfigOverride;
 		private final String version;
 		@Nullable
@@ -88,10 +86,8 @@ static final class State implements Serializable {
 				Provisioner provisioner,
 				boolean isScript,
 				@Nullable FileSignature editorConfigPath,
-				Map<String, String> userData,
 				Map<String, Object> editorConfigOverride) throws IOException {
 			this.version = version;
-			this.userData = new TreeMap<>(userData);
 			this.editorConfigOverride = new TreeMap<>(editorConfigOverride);
 			this.jarState = JarState.from((version.startsWith("0.") ? MAVEN_COORDINATE_0_DOT : MAVEN_COORDINATE_1_DOT) + version,
 					provisioner);
@@ -103,8 +99,8 @@ FormatterFunc createFormat() throws Exception {
 			final ClassLoader classLoader = jarState.getClassLoader();
 			Class<?> formatterFunc = classLoader.loadClass("com.diffplug.spotless.glue.ktlint.KtlintFormatterFunc");
 			Constructor<?> constructor = formatterFunc.getConstructor(
-					String.class, boolean.class, FileSignature.class, Map.class, Map.class);
-			return (FormatterFunc.NeedsFile) constructor.newInstance(version, isScript, editorConfigPath, userData, editorConfigOverride);
+					String.class, boolean.class, FileSignature.class, Map.class);
+			return (FormatterFunc.NeedsFile) constructor.newInstance(version, isScript, editorConfigPath, editorConfigOverride);
 		}
 	}
 }
diff --git a/lib/src/testCompatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0AdapterTest.java b/lib/src/testCompatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0AdapterTest.java
index 7fc9d1d9a4..4ad5bf46cc 100644
--- a/lib/src/testCompatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0AdapterTest.java
+++ b/lib/src/testCompatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0AdapterTest.java
@@ -36,11 +36,9 @@ public void testDefaults(@TempDir Path path) throws IOException {
 		String text = loadAndWriteText(path, "empty_class_body.kt");
 		final Path filePath = Paths.get(path.toString(), "empty_class_body.kt");
 
-		Map<String, String> userData = new HashMap<>();
-
 		Map<String, Object> editorConfigOverrideMap = new HashMap<>();
 
-		String formatted = ktLintCompat0Dot48Dot0Adapter.format(text, filePath, false, null, userData, editorConfigOverrideMap);
+		String formatted = ktLintCompat0Dot48Dot0Adapter.format(text, filePath, false, null, editorConfigOverrideMap);
 		assertEquals("class empty_class_body\n", formatted);
 	}
 
@@ -50,15 +48,13 @@ public void testEditorConfigCanDisable(@TempDir Path path) throws IOException {
 		String text = loadAndWriteText(path, "fails_no_semicolons.kt");
 		final Path filePath = Paths.get(path.toString(), "fails_no_semicolons.kt");
 
-		Map<String, String> userData = new HashMap<>();
-
 		Map<String, Object> editorConfigOverrideMap = new HashMap<>();
 		editorConfigOverrideMap.put("indent_style", "tab");
 		editorConfigOverrideMap.put("ktlint_standard_no-semi", "disabled");
 		// ktlint_filename is an invalid rule in ktlint 0.48.0
 		editorConfigOverrideMap.put("ktlint_filename", "disabled");
 
-		String formatted = ktLintCompat0Dot48Dot0Adapter.format(text, filePath, false, null, userData, editorConfigOverrideMap);
+		String formatted = ktLintCompat0Dot48Dot0Adapter.format(text, filePath, false, null, editorConfigOverrideMap);
 		assertEquals("class fails_no_semicolons {\n\tval i = 0;\n}\n", formatted);
 	}
 
diff --git a/lib/src/testCompatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0AdapterTest.java b/lib/src/testCompatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0AdapterTest.java
index a0db6ecddc..50897d875f 100644
--- a/lib/src/testCompatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0AdapterTest.java
+++ b/lib/src/testCompatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0AdapterTest.java
@@ -36,11 +36,9 @@ public void testDefaults(@TempDir Path path) throws IOException {
 		String text = loadAndWriteText(path, "EmptyClassBody.kt");
 		final Path filePath = Paths.get(path.toString(), "EmptyClassBody.kt");
 
-		Map<String, String> userData = new HashMap<>();
-
 		Map<String, Object> editorConfigOverrideMap = new HashMap<>();
 
-		String formatted = ktLintCompat0Dot49Dot0Adapter.format(text, filePath, false, null, userData, editorConfigOverrideMap);
+		String formatted = ktLintCompat0Dot49Dot0Adapter.format(text, filePath, false, null, editorConfigOverrideMap);
 		assertEquals("class EmptyClassBody\n", formatted);
 	}
 
@@ -50,13 +48,11 @@ public void testEditorConfigCanDisable(@TempDir Path path) throws IOException {
 		String text = loadAndWriteText(path, "FailsNoSemicolons.kt");
 		final Path filePath = Paths.get(path.toString(), "FailsNoSemicolons.kt");
 
-		Map<String, String> userData = new HashMap<>();
-
 		Map<String, Object> editorConfigOverrideMap = new HashMap<>();
 		editorConfigOverrideMap.put("indent_style", "tab");
 		editorConfigOverrideMap.put("ktlint_standard_no-semi", "disabled");
 
-		String formatted = ktLintCompat0Dot49Dot0Adapter.format(text, filePath, false, null, userData, editorConfigOverrideMap);
+		String formatted = ktLintCompat0Dot49Dot0Adapter.format(text, filePath, false, null, editorConfigOverrideMap);
 		assertEquals("class FailsNoSemicolons {\n\tval i = 0;\n}\n", formatted);
 	}
 
diff --git a/lib/src/testCompatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0AdapterTest.java b/lib/src/testCompatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0AdapterTest.java
index f5b76ccae0..a44ee93386 100644
--- a/lib/src/testCompatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0AdapterTest.java
+++ b/lib/src/testCompatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0AdapterTest.java
@@ -36,11 +36,9 @@ public void testDefaults(@TempDir Path path) throws IOException {
 		String text = loadAndWriteText(path, "EmptyClassBody.kt");
 		final Path filePath = Paths.get(path.toString(), "EmptyClassBody.kt");
 
-		Map<String, String> userData = new HashMap<>();
-
 		Map<String, Object> editorConfigOverrideMap = new HashMap<>();
 
-		String formatted = KtLintCompat0Dot50Dot0Adapter.format(text, filePath, false, null, userData, editorConfigOverrideMap);
+		String formatted = KtLintCompat0Dot50Dot0Adapter.format(text, filePath, false, null, editorConfigOverrideMap);
 		assertEquals("class EmptyClassBody\n", formatted);
 	}
 
@@ -50,13 +48,11 @@ public void testEditorConfigCanDisable(@TempDir Path path) throws IOException {
 		String text = loadAndWriteText(path, "FailsNoSemicolons.kt");
 		final Path filePath = Paths.get(path.toString(), "FailsNoSemicolons.kt");
 
-		Map<String, String> userData = new HashMap<>();
-
 		Map<String, Object> editorConfigOverrideMap = new HashMap<>();
 		editorConfigOverrideMap.put("indent_style", "tab");
 		editorConfigOverrideMap.put("ktlint_standard_no-semi", "disabled");
 
-		String formatted = KtLintCompat0Dot50Dot0Adapter.format(text, filePath, false, null, userData, editorConfigOverrideMap);
+		String formatted = KtLintCompat0Dot50Dot0Adapter.format(text, filePath, false, null, editorConfigOverrideMap);
 		assertEquals("class FailsNoSemicolons {\n\tval i = 0;\n}\n", formatted);
 	}
 
diff --git a/lib/src/testCompatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0AdapterTest.java b/lib/src/testCompatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0AdapterTest.java
index 1f8e6023b4..a62ab22610 100644
--- a/lib/src/testCompatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0AdapterTest.java
+++ b/lib/src/testCompatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0AdapterTest.java
@@ -36,11 +36,9 @@ public void testDefaults(@TempDir Path path) throws IOException {
 		String text = loadAndWriteText(path, "EmptyClassBody.kt");
 		final Path filePath = Paths.get(path.toString(), "EmptyClassBody.kt");
 
-		Map<String, String> userData = new HashMap<>();
-
 		Map<String, Object> editorConfigOverrideMap = new HashMap<>();
 
-		String formatted = KtLintCompat1Dot0Dot0Adapter.format(text, filePath, false, null, userData, editorConfigOverrideMap);
+		String formatted = KtLintCompat1Dot0Dot0Adapter.format(text, filePath, false, null, editorConfigOverrideMap);
 		assertEquals("class EmptyClassBody\n", formatted);
 	}
 
@@ -50,13 +48,11 @@ public void testEditorConfigCanDisable(@TempDir Path path) throws IOException {
 		String text = loadAndWriteText(path, "FailsNoSemicolons.kt");
 		final Path filePath = Paths.get(path.toString(), "FailsNoSemicolons.kt");
 
-		Map<String, String> userData = new HashMap<>();
-
 		Map<String, Object> editorConfigOverrideMap = new HashMap<>();
 		editorConfigOverrideMap.put("indent_style", "tab");
 		editorConfigOverrideMap.put("ktlint_standard_no-semi", "disabled");
 
-		String formatted = KtLintCompat1Dot0Dot0Adapter.format(text, filePath, false, null, userData, editorConfigOverrideMap);
+		String formatted = KtLintCompat1Dot0Dot0Adapter.format(text, filePath, false, null, editorConfigOverrideMap);
 		assertEquals("class FailsNoSemicolons {\n\tval i = 0;\n}\n", formatted);
 	}
 
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 64c8845d25..3341bb29ef 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -399,9 +399,8 @@ Additionally, `editorConfigOverride` options will override what's supplied in `.
 ```kotlin
 spotless {
   kotlin {
-    // version, userData and editorConfigOverride are all optional
+    // version, editorConfigPath and editorConfigOverride are all optional
     ktlint("1.0.0")
-      .userData(mapOf("android" to "true"))
       .setEditorConfigPath("$projectDir/config/.editorconfig")  // sample unusual placement
       .editorConfigOverride(
         mapOf(
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BaseKotlinExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BaseKotlinExtension.java
index 69de375800..e446ce67c4 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BaseKotlinExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BaseKotlinExtension.java
@@ -51,7 +51,7 @@ public KtlintConfig ktlint() throws IOException {
 
 	/** Adds the specified version of <a href="https://github.com/pinterest/ktlint">ktlint</a>. */
 	public KtlintConfig ktlint(String version) throws IOException {
-		return new KtlintConfig(version, Collections.emptyMap(), Collections.emptyMap());
+		return new KtlintConfig(version, Collections.emptyMap());
 	}
 
 	/** Uses the <a href="https://github.com/facebookincubator/ktfmt">ktfmt</a> jar to format source code. */
@@ -146,19 +146,16 @@ private void configure(Consumer<KtfmtStep.KtfmtFormattingOptions> optionsConfigu
 	public class KtlintConfig {
 		private final String version;
 		private FileSignature editorConfigPath;
-		private Map<String, String> userData;
 		private Map<String, Object> editorConfigOverride;
 
 		private KtlintConfig(
 				String version,
-				Map<String, String> userData,
 				Map<String, Object> editorConfigOverride) throws IOException {
 			Objects.requireNonNull(version);
 			File defaultEditorConfig = getProject().getRootProject().file(".editorconfig");
 			FileSignature editorConfigPath = defaultEditorConfig.exists() ? FileSignature.signAsList(defaultEditorConfig) : null;
 			this.version = version;
 			this.editorConfigPath = editorConfigPath;
-			this.userData = userData;
 			this.editorConfigOverride = editorConfigOverride;
 			addStep(createStep());
 		}
@@ -177,14 +174,6 @@ public KtlintConfig setEditorConfigPath(@Nullable Object editorConfigPath) throw
 			return this;
 		}
 
-		public KtlintConfig userData(Map<String, String> userData) {
-			// Copy the map to a sorted map because up-to-date checking is based on binary-equals of the serialized
-			// representation.
-			this.userData = ImmutableSortedMap.copyOf(userData);
-			replaceStep(createStep());
-			return this;
-		}
-
 		public KtlintConfig editorConfigOverride(Map<String, Object> editorConfigOverride) {
 			// Copy the map to a sorted map because up-to-date checking is based on binary-equals of the serialized
 			// representation.
@@ -199,7 +188,6 @@ private FormatterStep createStep() {
 					provisioner(),
 					isScript(),
 					editorConfigPath,
-					userData,
 					editorConfigOverride);
 		}
 	}
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/kotlin/Ktlint.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/kotlin/Ktlint.java
index fd59d8ba9d..1fc0e75ad3 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/kotlin/Ktlint.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/kotlin/Ktlint.java
@@ -15,7 +15,6 @@
  */
 package com.diffplug.spotless.maven.kotlin;
 
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -48,6 +47,6 @@ public FormatterStep newFormatterStep(final FormatterStepConfig stepConfig) {
 			editorConfigOverride = new HashMap<>();
 		}
 
-		return KtLintStep.create(ktlintVersion, stepConfig.getProvisioner(), false, configPath, Collections.emptyMap(), editorConfigOverride);
+		return KtLintStep.create(ktlintVersion, stepConfig.getProvisioner(), false, configPath, editorConfigOverride);
 	}
 }

From cb6a7888c3ff7a4f88192530f7f11c885e432338 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Mon, 20 Nov 2023 01:42:46 +0800
Subject: [PATCH 41/57] Reuse configs for GroovyExtension and
 GroovyGradleExtension

---
 .../gradle/spotless/BaseGroovyExtension.java  | 75 +++++++++++++++++++
 .../gradle/spotless/GroovyExtension.java      | 56 +-------------
 .../spotless/GroovyGradleExtension.java       | 26 +------
 3 files changed, 79 insertions(+), 78 deletions(-)
 create mode 100644 plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BaseGroovyExtension.java

diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BaseGroovyExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BaseGroovyExtension.java
new file mode 100644
index 0000000000..6aa28d1853
--- /dev/null
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BaseGroovyExtension.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.gradle.spotless;
+
+import static com.diffplug.gradle.spotless.PluginGradlePreconditions.requireElementsNonNull;
+
+import java.util.Map;
+import java.util.Objects;
+
+import org.gradle.api.Project;
+
+import com.diffplug.spotless.extra.EquoBasedStepBuilder;
+import com.diffplug.spotless.extra.groovy.GrEclipseFormatterStep;
+import com.diffplug.spotless.java.ImportOrderStep;
+
+abstract class BaseGroovyExtension extends FormatExtension {
+	protected BaseGroovyExtension(SpotlessExtension spotless) {
+		super(spotless);
+	}
+
+	public void importOrder(String... importOrder) {
+		addStep(ImportOrderStep.forGroovy().createFrom(importOrder));
+	}
+
+	public void importOrderFile(Object importOrderFile) {
+		Objects.requireNonNull(importOrderFile);
+		addStep(ImportOrderStep.forGroovy().createFrom(getProject().file(importOrderFile)));
+	}
+
+	public GrEclipseConfig greclipse() {
+		return greclipse(GrEclipseFormatterStep.defaultVersion());
+	}
+
+	public GrEclipseConfig greclipse(String version) {
+		return new GrEclipseConfig(version, this);
+	}
+
+	public static class GrEclipseConfig {
+		private final EquoBasedStepBuilder builder;
+		private final FormatExtension extension;
+
+		private GrEclipseConfig(String version, FormatExtension extension) {
+			this.extension = extension;
+			builder = GrEclipseFormatterStep.createBuilder(extension.provisioner());
+			builder.setVersion(version);
+			extension.addStep(builder.build());
+		}
+
+		public void configFile(Object... configFiles) {
+			requireElementsNonNull(configFiles);
+			Project project = extension.getProject();
+			builder.setPreferences(project.files(configFiles).getFiles());
+			extension.replaceStep(builder.build());
+		}
+
+		public GrEclipseConfig withP2Mirrors(Map<String, String> mirrors) {
+			builder.setP2Mirrors(mirrors);
+			extension.replaceStep(builder.build());
+			return this;
+		}
+	}
+}
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java
index a7f3d98ce4..676bed0aea 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java
@@ -15,27 +15,19 @@
  */
 package com.diffplug.gradle.spotless;
 
-import static com.diffplug.gradle.spotless.PluginGradlePreconditions.requireElementsNonNull;
-
-import java.util.Map;
-import java.util.Objects;
-
 import javax.inject.Inject;
 
 import org.gradle.api.GradleException;
-import org.gradle.api.Project;
 import org.gradle.api.internal.plugins.DslObject;
 import org.gradle.api.plugins.GroovyBasePlugin;
 import org.gradle.api.tasks.GroovySourceDirectorySet;
 import org.gradle.api.tasks.GroovySourceSet;
 import org.gradle.util.GradleVersion;
 
-import com.diffplug.spotless.extra.EquoBasedStepBuilder;
-import com.diffplug.spotless.extra.groovy.GrEclipseFormatterStep;
 import com.diffplug.spotless.generic.LicenseHeaderStep;
-import com.diffplug.spotless.java.ImportOrderStep;
 
-public class GroovyExtension extends FormatExtension implements HasBuiltinDelimiterForLicense, JvmLang {
+public class GroovyExtension extends BaseGroovyExtension implements HasBuiltinDelimiterForLicense, JvmLang {
+	private boolean excludeJava = false;
 	static final String NAME = "groovy";
 
 	@Inject
@@ -43,8 +35,6 @@ public GroovyExtension(SpotlessExtension spotless) {
 		super(spotless);
 	}
 
-	boolean excludeJava = false;
-
 	/** Excludes .java files, to focus on only .groovy files. */
 	public void excludeJava() {
 		excludeJava(true);
@@ -65,48 +55,6 @@ public LicenseHeaderConfig licenseHeaderFile(Object licenseHeaderFile) {
 		return licenseHeaderFile(licenseHeaderFile, JavaExtension.LICENSE_HEADER_DELIMITER);
 	}
 
-	public void importOrder(String... importOrder) {
-		addStep(ImportOrderStep.forGroovy().createFrom(importOrder));
-	}
-
-	public void importOrderFile(Object importOrderFile) {
-		Objects.requireNonNull(importOrderFile);
-		addStep(ImportOrderStep.forGroovy().createFrom(getProject().file(importOrderFile)));
-	}
-
-	public GrEclipseConfig greclipse() {
-		return greclipse(GrEclipseFormatterStep.defaultVersion());
-	}
-
-	public GrEclipseConfig greclipse(String version) {
-		return new GrEclipseConfig(version, this);
-	}
-
-	public static class GrEclipseConfig {
-		private final EquoBasedStepBuilder builder;
-		private final FormatExtension extension;
-
-		GrEclipseConfig(String version, FormatExtension extension) {
-			this.extension = extension;
-			builder = GrEclipseFormatterStep.createBuilder(extension.provisioner());
-			builder.setVersion(version);
-			extension.addStep(builder.build());
-		}
-
-		public void configFile(Object... configFiles) {
-			requireElementsNonNull(configFiles);
-			Project project = extension.getProject();
-			builder.setPreferences(project.files(configFiles).getFiles());
-			extension.replaceStep(builder.build());
-		}
-
-		public GrEclipseConfig withP2Mirrors(Map<String, String> mirrors) {
-			builder.setP2Mirrors(mirrors);
-			extension.replaceStep(builder.build());
-			return this;
-		}
-	}
-
 	/** If the user hasn't specified the files yet, we'll assume he/she means all of the groovy files. */
 	@Override
 	protected void setupTask(SpotlessTask task) {
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java
index 30cb75a2a3..120f99f27a 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyGradleExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,14 +15,9 @@
  */
 package com.diffplug.gradle.spotless;
 
-import java.util.Objects;
-
 import javax.inject.Inject;
 
-import com.diffplug.spotless.extra.groovy.GrEclipseFormatterStep;
-import com.diffplug.spotless.java.ImportOrderStep;
-
-public class GroovyGradleExtension extends FormatExtension {
+public class GroovyGradleExtension extends BaseGroovyExtension {
 	private static final String GRADLE_FILE_EXTENSION = "*.gradle";
 	static final String NAME = "groovyGradle";
 
@@ -31,23 +26,6 @@ public GroovyGradleExtension(SpotlessExtension spotless) {
 		super(spotless);
 	}
 
-	public void importOrder(String... importOrder) {
-		addStep(ImportOrderStep.forGroovy().createFrom(importOrder));
-	}
-
-	public void importOrderFile(Object importOrderFile) {
-		Objects.requireNonNull(importOrderFile);
-		addStep(ImportOrderStep.forGroovy().createFrom(getProject().file(importOrderFile)));
-	}
-
-	public GroovyExtension.GrEclipseConfig greclipse() {
-		return new GroovyExtension.GrEclipseConfig(GrEclipseFormatterStep.defaultVersion(), this);
-	}
-
-	public GroovyExtension.GrEclipseConfig greclipse(String version) {
-		return new GroovyExtension.GrEclipseConfig(version, this);
-	}
-
 	@Override
 	protected void setupTask(SpotlessTask task) {
 		if (target == null) {

From 705e72a7d66efc083e3a87997413f43b2682b756 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Tue, 21 Nov 2023 10:41:11 +0800
Subject: [PATCH 42/57] Support custom rule sets for Ktlint

---
 CHANGES.md                                    |  2 ++
 .../diffplug/spotless/kotlin/KtLintStep.java  | 19 ++++++++++-----
 plugin-gradle/CHANGES.md                      |  2 ++
 plugin-gradle/README.md                       |  7 +++++-
 .../gradle/spotless/BaseKotlinExtension.java  | 18 +++++++++++---
 .../gradle/spotless/KotlinExtensionTest.java  | 24 +++++++++++++++++++
 plugin-maven/CHANGES.md                       |  1 +
 plugin-maven/README.md                        |  3 +++
 .../spotless/maven/kotlin/Ktlint.java         |  9 ++++++-
 .../spotless/maven/kotlin/KtlintTest.java     | 18 ++++++++++++++
 .../resources/kotlin/ktlint/listScreen.dirty  |  6 +++++
 11 files changed, 98 insertions(+), 11 deletions(-)
 create mode 100644 testlib/src/main/resources/kotlin/ktlint/listScreen.dirty

diff --git a/CHANGES.md b/CHANGES.md
index c1a11e3a0a..404363e199 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,8 @@ 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]
+### Added
+* Support custom rule sets for Ktlint. ([#1896](https://github.com/diffplug/spotless/pull/1896)
 ### Fixed
 * Fix Eclipse JDT on some settings files. ([#1864](https://github.com/diffplug/spotless/pull/1864) fixes [#1638](https://github.com/diffplug/spotless/issues/1638))
 ### Changes
diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
index 7c6801a2b6..e131b2b46f 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
@@ -19,8 +19,11 @@
 import java.io.Serializable;
 import java.lang.reflect.Constructor;
 import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Set;
 import java.util.TreeMap;
 
 import javax.annotation.Nullable;
@@ -51,18 +54,19 @@ public static FormatterStep create(String version, Provisioner provisioner) {
 
 	public static FormatterStep create(String version, Provisioner provisioner,
 			Map<String, Object> editorConfigOverride) {
-		return create(version, provisioner, false, null, editorConfigOverride);
+		return create(version, provisioner, false, null, editorConfigOverride, Collections.emptyList());
 	}
 
 	public static FormatterStep create(String version,
 			Provisioner provisioner,
 			boolean isScript,
 			@Nullable FileSignature editorConfig,
-			Map<String, Object> editorConfigOverride) {
+			Map<String, Object> editorConfigOverride,
+			List<String> customRuleSets) {
 		Objects.requireNonNull(version, "version");
 		Objects.requireNonNull(provisioner, "provisioner");
 		return FormatterStep.createLazy(NAME,
-				() -> new State(version, provisioner, isScript, editorConfig, editorConfigOverride),
+				() -> new State(version, provisioner, isScript, editorConfig, editorConfigOverride, customRuleSets),
 				State::createFormat);
 	}
 
@@ -86,11 +90,14 @@ static final class State implements Serializable {
 				Provisioner provisioner,
 				boolean isScript,
 				@Nullable FileSignature editorConfigPath,
-				Map<String, Object> editorConfigOverride) throws IOException {
+				Map<String, Object> editorConfigOverride,
+				List<String> customRuleSets) throws IOException {
 			this.version = version;
 			this.editorConfigOverride = new TreeMap<>(editorConfigOverride);
-			this.jarState = JarState.from((version.startsWith("0.") ? MAVEN_COORDINATE_0_DOT : MAVEN_COORDINATE_1_DOT) + version,
-					provisioner);
+			String ktlintCoordinate = (version.startsWith("0.") ? MAVEN_COORDINATE_0_DOT : MAVEN_COORDINATE_1_DOT) + version;
+			Set<String> mavenCoordinates = new HashSet<>(customRuleSets);
+			mavenCoordinates.add(ktlintCoordinate);
+			this.jarState = JarState.from(mavenCoordinates, provisioner);
 			this.editorConfigPath = editorConfigPath;
 			this.isScript = isScript;
 		}
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 9d833b0076..04d3e9bb38 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+### Added
+* Support custom rule sets for Ktlint. ([#1896](https://github.com/diffplug/spotless/pull/1896)
 ### Fixed
 * Fix Eclipse JDT on some settings files. ([#1864](https://github.com/diffplug/spotless/pull/1864) fixes [#1638](https://github.com/diffplug/spotless/issues/1638))
 * Check if EditorConfig file exist for Ktlint in KotlinGradleExtension. ([#1889](https://github.com/diffplug/spotless/pull/1889)
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 3341bb29ef..6232f9c0e1 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -399,7 +399,7 @@ Additionally, `editorConfigOverride` options will override what's supplied in `.
 ```kotlin
 spotless {
   kotlin {
-    // version, editorConfigPath and editorConfigOverride are all optional
+    // version, editorConfigPath, editorConfigOverride and customRuleSets are all optional
     ktlint("1.0.0")
       .setEditorConfigPath("$projectDir/config/.editorconfig")  // sample unusual placement
       .editorConfigOverride(
@@ -407,6 +407,11 @@ spotless {
           "indent_size" to 2,
         )
       )
+      .customRuleSets(
+        listOf(
+          "io.nlopez.compose.rules:ktlint:0.3.3"
+        )
+      )
   }
 }
 ```
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BaseKotlinExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BaseKotlinExtension.java
index e446ce67c4..0d89e224f6 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BaseKotlinExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BaseKotlinExtension.java
@@ -18,12 +18,14 @@
 import java.io.File;
 import java.io.IOException;
 import java.util.Collections;
+import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.function.Consumer;
 
 import javax.annotation.Nullable;
 
+import com.diffplug.common.collect.ImmutableList;
 import com.diffplug.common.collect.ImmutableSortedMap;
 import com.diffplug.spotless.FileSignature;
 import com.diffplug.spotless.FormatterStep;
@@ -51,7 +53,7 @@ public KtlintConfig ktlint() throws IOException {
 
 	/** Adds the specified version of <a href="https://github.com/pinterest/ktlint">ktlint</a>. */
 	public KtlintConfig ktlint(String version) throws IOException {
-		return new KtlintConfig(version, Collections.emptyMap());
+		return new KtlintConfig(version, Collections.emptyMap(), Collections.emptyList());
 	}
 
 	/** Uses the <a href="https://github.com/facebookincubator/ktfmt">ktfmt</a> jar to format source code. */
@@ -147,16 +149,19 @@ public class KtlintConfig {
 		private final String version;
 		private FileSignature editorConfigPath;
 		private Map<String, Object> editorConfigOverride;
+		private List<String> customRuleSets;
 
 		private KtlintConfig(
 				String version,
-				Map<String, Object> editorConfigOverride) throws IOException {
+				Map<String, Object> editorConfigOverride,
+				List<String> customRuleSets) throws IOException {
 			Objects.requireNonNull(version);
 			File defaultEditorConfig = getProject().getRootProject().file(".editorconfig");
 			FileSignature editorConfigPath = defaultEditorConfig.exists() ? FileSignature.signAsList(defaultEditorConfig) : null;
 			this.version = version;
 			this.editorConfigPath = editorConfigPath;
 			this.editorConfigOverride = editorConfigOverride;
+			this.customRuleSets = customRuleSets;
 			addStep(createStep());
 		}
 
@@ -182,13 +187,20 @@ public KtlintConfig editorConfigOverride(Map<String, Object> editorConfigOverrid
 			return this;
 		}
 
+		public KtlintConfig customRuleSets(List<String> customRuleSets) {
+			this.customRuleSets = ImmutableList.copyOf(customRuleSets);
+			replaceStep(createStep());
+			return this;
+		}
+
 		private FormatterStep createStep() {
 			return KtLintStep.create(
 					version,
 					provisioner(),
 					isScript(),
 					editorConfigPath,
-					editorConfigOverride);
+					editorConfigOverride,
+					customRuleSets);
 		}
 	}
 }
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
index 7ce1819d60..dd0f2f5e21 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
@@ -141,6 +141,30 @@ void testSetEditorConfigCanOverrideEditorConfigFile() throws IOException {
 		checkKtlintOfficialStyle();
 	}
 
+	@Test
+	void withCustomRuleSetApply() throws IOException {
+		setFile("build.gradle").toLines(
+				"plugins {",
+				"    id 'org.jetbrains.kotlin.jvm' version '1.5.31'",
+				"    id 'com.diffplug.spotless'",
+				"}",
+				"repositories { mavenCentral() }",
+				"spotless {",
+				"    kotlin {",
+				"        ktlint(\"1.0.1\")",
+				"        .customRuleSets([",
+				"            \"io.nlopez.compose.rules:ktlint:0.3.3\"",
+				"        ])",
+				"        .editorConfigOverride([",
+				"            ktlint_function_naming_ignore_when_annotated_with: \"Composable\",",
+				"        ])",
+				"    }",
+				"}");
+		setFile("src/main/kotlin/Main.kt").toResource("kotlin/ktlint/listScreen.dirty");
+		String buildOutput = gradleRunner().withArguments("spotlessCheck").buildAndFail().getOutput();
+		assertThat(buildOutput).contains("Composable functions that return Unit should start with an uppercase letter.");
+	}
+
 	@Test
 	void testWithHeader() throws IOException {
 		setFile("build.gradle").toLines(
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 10ebfc57c1..5122402019 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -5,6 +5,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Added
 * CompileSourceRoots and TestCompileSourceRoots are now respected as default includes. These properties are commonly set when adding extra source directories. ([#1846](https://github.com/diffplug/spotless/issues/1846))
+* Support custom rule sets for Ktlint. ([#1896](https://github.com/diffplug/spotless/pull/1896)
 ### Fixed
 * Fix crash when build dir is a softlink to another directory. ([#1859](https://github.com/diffplug/spotless/pull/1859))
 * Fix Eclipse JDT on some settings files. ([#1864](https://github.com/diffplug/spotless/pull/1864) fixes [#1638](https://github.com/diffplug/spotless/issues/1638))
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 7944b5a450..f7849fbdfc 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -416,6 +416,9 @@ Additionally, `editorConfigOverride` options will override what's supplied in `.
     <ij_kotlin_allow_trailing_comma>true</ij_kotlin_allow_trailing_comma>
     <ij_kotlin_allow_trailing_comma_on_call_site>true</ij_kotlin_allow_trailing_comma_on_call_site>
   </editorConfigOverride>
+  <customRuleSets> <!-- optional -->
+    <value>io.nlopez.compose.rules:ktlint:0.3.3</value>
+  </customRuleSets>
 </ktlint>
 ```
 
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/kotlin/Ktlint.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/kotlin/Ktlint.java
index 1fc0e75ad3..5c939687b8 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/kotlin/Ktlint.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/kotlin/Ktlint.java
@@ -15,7 +15,9 @@
  */
 package com.diffplug.spotless.maven.kotlin;
 
+import java.util.Collections;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import org.apache.maven.plugins.annotations.Parameter;
@@ -35,6 +37,8 @@ public class Ktlint implements FormatterStepFactory {
 	private String editorConfigPath;
 	@Parameter
 	private Map<String, Object> editorConfigOverride;
+	@Parameter
+	private List<String> customRuleSets;
 
 	@Override
 	public FormatterStep newFormatterStep(final FormatterStepConfig stepConfig) {
@@ -46,7 +50,10 @@ public FormatterStep newFormatterStep(final FormatterStepConfig stepConfig) {
 		if (editorConfigOverride == null) {
 			editorConfigOverride = new HashMap<>();
 		}
+		if (customRuleSets == null) {
+			customRuleSets = Collections.emptyList();
+		}
 
-		return KtLintStep.create(ktlintVersion, stepConfig.getProvisioner(), false, configPath, editorConfigOverride);
+		return KtLintStep.create(ktlintVersion, stepConfig.getProvisioner(), false, configPath, editorConfigOverride, customRuleSets);
 	}
 }
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtlintTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtlintTest.java
index 2916e118a5..fe5b0e1b57 100644
--- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtlintTest.java
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtlintTest.java
@@ -15,8 +15,11 @@
  */
 package com.diffplug.spotless.maven.kotlin;
 
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 import org.junit.jupiter.api.Test;
 
+import com.diffplug.spotless.ProcessRunner;
 import com.diffplug.spotless.maven.MavenIntegrationHarness;
 
 class KtlintTest extends MavenIntegrationHarness {
@@ -63,6 +66,21 @@ void testSetEditorConfigCanOverrideEditorConfigFile() throws Exception {
 		checkKtlintOfficialStyle();
 	}
 
+	@Test
+	void testWithCustomRuleSetApply() throws Exception {
+		writePomWithKotlinSteps("<ktlint>\n" +
+				"  <customRuleSets>\n" +
+				"    <value>io.nlopez.compose.rules:ktlint:0.3.3</value>\n" +
+				"  </customRuleSets>\n" +
+				"  <editorConfigOverride>\n" +
+				"    <ktlint_function_naming_ignore_when_annotated_with>Composable</ktlint_function_naming_ignore_when_annotated_with>\n" +
+				"  </editorConfigOverride>\n" +
+				"</ktlint>");
+		setFile("src/main/kotlin/Main.kt").toResource("kotlin/ktlint/listScreen.dirty");
+		ProcessRunner.Result result = mavenRunner().withArguments("spotless:check").runHasError();
+		assertTrue(result.toString().contains("Composable functions that return Unit should start with an uppercase letter."));
+	}
+
 	private void checkKtlintOfficialStyle() throws Exception {
 		String path = "src/main/kotlin/Main.kt";
 		setFile(path).toResource("kotlin/ktlint/experimentalEditorConfigOverride.dirty");
diff --git a/testlib/src/main/resources/kotlin/ktlint/listScreen.dirty b/testlib/src/main/resources/kotlin/ktlint/listScreen.dirty
new file mode 100644
index 0000000000..14c06d6d43
--- /dev/null
+++ b/testlib/src/main/resources/kotlin/ktlint/listScreen.dirty
@@ -0,0 +1,6 @@
+import androidx.compose.runtime.Composable
+
+@Composable
+fun listScreen() {
+    val list: List<String> = mutableListOf<String>()
+}

From 8bbed1f6f2289bbc79645257851f619e0706ab84 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Tue, 21 Nov 2023 11:49:22 +0800
Subject: [PATCH 43/57] Remove unused isScript param in Ktlint format step

---
 .../compat/KtLintCompat0Dot48Dot0Adapter.java |  1 -
 .../compat/KtLintCompat0Dot49Dot0Adapter.java |  1 -
 .../compat/KtLintCompat0Dot50Dot0Adapter.java |  1 -
 .../compat/KtLintCompat1Dot0Dot0Adapter.java  |  1 -
 .../ktlint/compat/KtLintCompatAdapter.java    |  1 -
 .../glue/ktlint/KtlintFormatterFunc.java      |  6 ++----
 .../diffplug/spotless/kotlin/KtLintStep.java  | 19 ++++---------------
 .../KtLintCompat0Dot48Dot0AdapterTest.java    |  4 ++--
 .../KtLintCompat0Dot49Dot0AdapterTest.java    |  4 ++--
 .../KtLintCompat0Dot50Dot0AdapterTest.java    |  4 ++--
 .../KtLintCompat1Dot0Dot0AdapterTest.java     |  4 ++--
 .../gradle/spotless/BaseKotlinExtension.java  |  1 -
 .../spotless/maven/kotlin/Ktlint.java         |  2 +-
 13 files changed, 15 insertions(+), 34 deletions(-)

diff --git a/lib/src/compatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java b/lib/src/compatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java
index b409552031..d7e997abaf 100644
--- a/lib/src/compatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java
+++ b/lib/src/compatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java
@@ -76,7 +76,6 @@ public Unit invoke(LintError lint, Boolean corrected) {
 	public String format(
 			String text,
 			Path path,
-			boolean isScript,
 			Path editorConfigPath,
 			Map<String, Object> editorConfigOverrideMap) {
 		final FormatterCallback formatterCallback = new FormatterCallback();
diff --git a/lib/src/compatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0Adapter.java b/lib/src/compatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0Adapter.java
index b524ca0e91..ea8698cfe8 100644
--- a/lib/src/compatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0Adapter.java
+++ b/lib/src/compatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0Adapter.java
@@ -122,7 +122,6 @@ public Unit invoke(LintError lint, Boolean corrected) {
 	public String format(
 			String text,
 			Path path,
-			boolean isScript,
 			Path editorConfigPath,
 			Map<String, Object> editorConfigOverrideMap) {
 		final FormatterCallback formatterCallback = new FormatterCallback();
diff --git a/lib/src/compatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0Adapter.java b/lib/src/compatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0Adapter.java
index b78a539b76..c792e2bb62 100644
--- a/lib/src/compatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0Adapter.java
+++ b/lib/src/compatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0Adapter.java
@@ -85,7 +85,6 @@ public Unit invoke(LintError lint, Boolean corrected) {
 	public String format(
 			String text,
 			Path path,
-			boolean isScript,
 			Path editorConfigPath,
 			Map<String, Object> editorConfigOverrideMap) {
 		final FormatterCallback formatterCallback = new FormatterCallback();
diff --git a/lib/src/compatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0Adapter.java b/lib/src/compatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0Adapter.java
index c38203b900..ac90893157 100644
--- a/lib/src/compatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0Adapter.java
+++ b/lib/src/compatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0Adapter.java
@@ -85,7 +85,6 @@ public Unit invoke(LintError lint, Boolean corrected) {
 	public String format(
 			String text,
 			Path path,
-			boolean isScript,
 			Path editorConfigPath,
 			Map<String, Object> editorConfigOverrideMap) {
 		final FormatterCallback formatterCallback = new FormatterCallback();
diff --git a/lib/src/compatKtLintApi/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompatAdapter.java b/lib/src/compatKtLintApi/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompatAdapter.java
index 5cbbac843c..e508633b95 100644
--- a/lib/src/compatKtLintApi/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompatAdapter.java
+++ b/lib/src/compatKtLintApi/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompatAdapter.java
@@ -23,7 +23,6 @@ public interface KtLintCompatAdapter {
 	String format(
 			String text,
 			Path path,
-			boolean isScript,
 			Path editorConfigPath,
 			Map<String, Object> editorConfigOverrideMap);
 }
diff --git a/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java b/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
index 870d3d4139..ec5fbcb67b 100644
--- a/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
+++ b/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
@@ -25,12 +25,11 @@
 
 public class KtlintFormatterFunc implements FormatterFunc.NeedsFile {
 
-	private final boolean isScript;
 	private final KtLintCompatAdapter adapter;
 	private final FileSignature editorConfigPath;
 	private final Map<String, Object> editorConfigOverrideMap;
 
-	public KtlintFormatterFunc(String version, boolean isScript, FileSignature editorConfigPath,
+	public KtlintFormatterFunc(String version, FileSignature editorConfigPath,
 			Map<String, Object> editorConfigOverrideMap) {
 		String[] versions = version.split("\\.");
 		int majorVersion = Integer.parseInt(versions[0]);
@@ -57,7 +56,6 @@ public KtlintFormatterFunc(String version, boolean isScript, FileSignature edito
 		}
 		this.editorConfigPath = editorConfigPath;
 		this.editorConfigOverrideMap = editorConfigOverrideMap;
-		this.isScript = isScript;
 	}
 
 	@Override
@@ -67,6 +65,6 @@ public String applyWithFile(String unix, File file) {
 		if (editorConfigPath != null) {
 			absoluteEditorConfigPath = editorConfigPath.getOnlyFile().toPath();
 		}
-		return adapter.format(unix, file.toPath(), isScript, absoluteEditorConfigPath, editorConfigOverrideMap);
+		return adapter.format(unix, file.toPath(), absoluteEditorConfigPath, editorConfigOverrideMap);
 	}
 }
diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
index 7c6801a2b6..856b39cc4a 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
@@ -46,23 +46,17 @@ public static FormatterStep create(Provisioner provisioner) {
 	}
 
 	public static FormatterStep create(String version, Provisioner provisioner) {
-		return create(version, provisioner, Collections.emptyMap());
-	}
-
-	public static FormatterStep create(String version, Provisioner provisioner,
-			Map<String, Object> editorConfigOverride) {
-		return create(version, provisioner, false, null, editorConfigOverride);
+		return create(version, provisioner, null, Collections.emptyMap());
 	}
 
 	public static FormatterStep create(String version,
 			Provisioner provisioner,
-			boolean isScript,
 			@Nullable FileSignature editorConfig,
 			Map<String, Object> editorConfigOverride) {
 		Objects.requireNonNull(version, "version");
 		Objects.requireNonNull(provisioner, "provisioner");
 		return FormatterStep.createLazy(NAME,
-				() -> new State(version, provisioner, isScript, editorConfig, editorConfigOverride),
+				() -> new State(version, provisioner, editorConfig, editorConfigOverride),
 				State::createFormat);
 	}
 
@@ -72,9 +66,6 @@ public static String defaultVersion() {
 
 	static final class State implements Serializable {
 		private static final long serialVersionUID = 1L;
-
-		/** Are the files being linted Kotlin script files. */
-		private final boolean isScript;
 		/** The jar that contains the formatter. */
 		final JarState jarState;
 		private final TreeMap<String, Object> editorConfigOverride;
@@ -84,7 +75,6 @@ static final class State implements Serializable {
 
 		State(String version,
 				Provisioner provisioner,
-				boolean isScript,
 				@Nullable FileSignature editorConfigPath,
 				Map<String, Object> editorConfigOverride) throws IOException {
 			this.version = version;
@@ -92,15 +82,14 @@ static final class State implements Serializable {
 			this.jarState = JarState.from((version.startsWith("0.") ? MAVEN_COORDINATE_0_DOT : MAVEN_COORDINATE_1_DOT) + version,
 					provisioner);
 			this.editorConfigPath = editorConfigPath;
-			this.isScript = isScript;
 		}
 
 		FormatterFunc createFormat() throws Exception {
 			final ClassLoader classLoader = jarState.getClassLoader();
 			Class<?> formatterFunc = classLoader.loadClass("com.diffplug.spotless.glue.ktlint.KtlintFormatterFunc");
 			Constructor<?> constructor = formatterFunc.getConstructor(
-					String.class, boolean.class, FileSignature.class, Map.class);
-			return (FormatterFunc.NeedsFile) constructor.newInstance(version, isScript, editorConfigPath, editorConfigOverride);
+					String.class, FileSignature.class, Map.class);
+			return (FormatterFunc.NeedsFile) constructor.newInstance(version, editorConfigPath, editorConfigOverride);
 		}
 	}
 }
diff --git a/lib/src/testCompatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0AdapterTest.java b/lib/src/testCompatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0AdapterTest.java
index 4ad5bf46cc..bab3764147 100644
--- a/lib/src/testCompatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0AdapterTest.java
+++ b/lib/src/testCompatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0AdapterTest.java
@@ -38,7 +38,7 @@ public void testDefaults(@TempDir Path path) throws IOException {
 
 		Map<String, Object> editorConfigOverrideMap = new HashMap<>();
 
-		String formatted = ktLintCompat0Dot48Dot0Adapter.format(text, filePath, false, null, editorConfigOverrideMap);
+		String formatted = ktLintCompat0Dot48Dot0Adapter.format(text, filePath, null, editorConfigOverrideMap);
 		assertEquals("class empty_class_body\n", formatted);
 	}
 
@@ -54,7 +54,7 @@ public void testEditorConfigCanDisable(@TempDir Path path) throws IOException {
 		// ktlint_filename is an invalid rule in ktlint 0.48.0
 		editorConfigOverrideMap.put("ktlint_filename", "disabled");
 
-		String formatted = ktLintCompat0Dot48Dot0Adapter.format(text, filePath, false, null, editorConfigOverrideMap);
+		String formatted = ktLintCompat0Dot48Dot0Adapter.format(text, filePath, null, editorConfigOverrideMap);
 		assertEquals("class fails_no_semicolons {\n\tval i = 0;\n}\n", formatted);
 	}
 
diff --git a/lib/src/testCompatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0AdapterTest.java b/lib/src/testCompatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0AdapterTest.java
index 50897d875f..5804c0b2d7 100644
--- a/lib/src/testCompatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0AdapterTest.java
+++ b/lib/src/testCompatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0AdapterTest.java
@@ -38,7 +38,7 @@ public void testDefaults(@TempDir Path path) throws IOException {
 
 		Map<String, Object> editorConfigOverrideMap = new HashMap<>();
 
-		String formatted = ktLintCompat0Dot49Dot0Adapter.format(text, filePath, false, null, editorConfigOverrideMap);
+		String formatted = ktLintCompat0Dot49Dot0Adapter.format(text, filePath, null, editorConfigOverrideMap);
 		assertEquals("class EmptyClassBody\n", formatted);
 	}
 
@@ -52,7 +52,7 @@ public void testEditorConfigCanDisable(@TempDir Path path) throws IOException {
 		editorConfigOverrideMap.put("indent_style", "tab");
 		editorConfigOverrideMap.put("ktlint_standard_no-semi", "disabled");
 
-		String formatted = ktLintCompat0Dot49Dot0Adapter.format(text, filePath, false, null, editorConfigOverrideMap);
+		String formatted = ktLintCompat0Dot49Dot0Adapter.format(text, filePath, null, editorConfigOverrideMap);
 		assertEquals("class FailsNoSemicolons {\n\tval i = 0;\n}\n", formatted);
 	}
 
diff --git a/lib/src/testCompatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0AdapterTest.java b/lib/src/testCompatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0AdapterTest.java
index a44ee93386..1a1f595991 100644
--- a/lib/src/testCompatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0AdapterTest.java
+++ b/lib/src/testCompatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0AdapterTest.java
@@ -38,7 +38,7 @@ public void testDefaults(@TempDir Path path) throws IOException {
 
 		Map<String, Object> editorConfigOverrideMap = new HashMap<>();
 
-		String formatted = KtLintCompat0Dot50Dot0Adapter.format(text, filePath, false, null, editorConfigOverrideMap);
+		String formatted = KtLintCompat0Dot50Dot0Adapter.format(text, filePath, null, editorConfigOverrideMap);
 		assertEquals("class EmptyClassBody\n", formatted);
 	}
 
@@ -52,7 +52,7 @@ public void testEditorConfigCanDisable(@TempDir Path path) throws IOException {
 		editorConfigOverrideMap.put("indent_style", "tab");
 		editorConfigOverrideMap.put("ktlint_standard_no-semi", "disabled");
 
-		String formatted = KtLintCompat0Dot50Dot0Adapter.format(text, filePath, false, null, editorConfigOverrideMap);
+		String formatted = KtLintCompat0Dot50Dot0Adapter.format(text, filePath, null, editorConfigOverrideMap);
 		assertEquals("class FailsNoSemicolons {\n\tval i = 0;\n}\n", formatted);
 	}
 
diff --git a/lib/src/testCompatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0AdapterTest.java b/lib/src/testCompatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0AdapterTest.java
index a62ab22610..1d36082815 100644
--- a/lib/src/testCompatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0AdapterTest.java
+++ b/lib/src/testCompatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0AdapterTest.java
@@ -38,7 +38,7 @@ public void testDefaults(@TempDir Path path) throws IOException {
 
 		Map<String, Object> editorConfigOverrideMap = new HashMap<>();
 
-		String formatted = KtLintCompat1Dot0Dot0Adapter.format(text, filePath, false, null, editorConfigOverrideMap);
+		String formatted = KtLintCompat1Dot0Dot0Adapter.format(text, filePath, null, editorConfigOverrideMap);
 		assertEquals("class EmptyClassBody\n", formatted);
 	}
 
@@ -52,7 +52,7 @@ public void testEditorConfigCanDisable(@TempDir Path path) throws IOException {
 		editorConfigOverrideMap.put("indent_style", "tab");
 		editorConfigOverrideMap.put("ktlint_standard_no-semi", "disabled");
 
-		String formatted = KtLintCompat1Dot0Dot0Adapter.format(text, filePath, false, null, editorConfigOverrideMap);
+		String formatted = KtLintCompat1Dot0Dot0Adapter.format(text, filePath, null, editorConfigOverrideMap);
 		assertEquals("class FailsNoSemicolons {\n\tval i = 0;\n}\n", formatted);
 	}
 
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BaseKotlinExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BaseKotlinExtension.java
index e446ce67c4..ac6a03c2b8 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BaseKotlinExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BaseKotlinExtension.java
@@ -186,7 +186,6 @@ private FormatterStep createStep() {
 			return KtLintStep.create(
 					version,
 					provisioner(),
-					isScript(),
 					editorConfigPath,
 					editorConfigOverride);
 		}
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/kotlin/Ktlint.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/kotlin/Ktlint.java
index 1fc0e75ad3..fa033dd2e7 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/kotlin/Ktlint.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/kotlin/Ktlint.java
@@ -47,6 +47,6 @@ public FormatterStep newFormatterStep(final FormatterStepConfig stepConfig) {
 			editorConfigOverride = new HashMap<>();
 		}
 
-		return KtLintStep.create(ktlintVersion, stepConfig.getProvisioner(), false, configPath, editorConfigOverride);
+		return KtLintStep.create(ktlintVersion, stepConfig.getProvisioner(), configPath, editorConfigOverride);
 	}
 }

From 0bd1d066a2ae865a64d5d08adc6fe03443383498 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Tue, 21 Nov 2023 12:25:22 +0800
Subject: [PATCH 44/57] Remove unused text param in KtLintCompatAdapter

---
 .../glue/ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java | 1 -
 .../glue/ktlint/compat/KtLintCompat0Dot49Dot0Adapter.java | 1 -
 .../glue/ktlint/compat/KtLintCompat0Dot50Dot0Adapter.java | 1 -
 .../glue/ktlint/compat/KtLintCompat1Dot0Dot0Adapter.java  | 1 -
 .../spotless/glue/ktlint/compat/KtLintCompatAdapter.java  | 1 -
 .../spotless/glue/ktlint/KtlintFormatterFunc.java         | 3 +--
 .../ktlint/compat/KtLintCompat0Dot48Dot0AdapterTest.java  | 8 ++++----
 .../ktlint/compat/KtLintCompat0Dot49Dot0AdapterTest.java  | 8 ++++----
 .../ktlint/compat/KtLintCompat0Dot50Dot0AdapterTest.java  | 8 ++++----
 .../ktlint/compat/KtLintCompat1Dot0Dot0AdapterTest.java   | 8 ++++----
 10 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/lib/src/compatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java b/lib/src/compatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java
index d7e997abaf..32ef497de8 100644
--- a/lib/src/compatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java
+++ b/lib/src/compatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java
@@ -74,7 +74,6 @@ public Unit invoke(LintError lint, Boolean corrected) {
 
 	@Override
 	public String format(
-			String text,
 			Path path,
 			Path editorConfigPath,
 			Map<String, Object> editorConfigOverrideMap) {
diff --git a/lib/src/compatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0Adapter.java b/lib/src/compatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0Adapter.java
index ea8698cfe8..1ad52da661 100644
--- a/lib/src/compatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0Adapter.java
+++ b/lib/src/compatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0Adapter.java
@@ -120,7 +120,6 @@ public Unit invoke(LintError lint, Boolean corrected) {
 
 	@Override
 	public String format(
-			String text,
 			Path path,
 			Path editorConfigPath,
 			Map<String, Object> editorConfigOverrideMap) {
diff --git a/lib/src/compatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0Adapter.java b/lib/src/compatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0Adapter.java
index c792e2bb62..2c7fff3f2e 100644
--- a/lib/src/compatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0Adapter.java
+++ b/lib/src/compatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0Adapter.java
@@ -83,7 +83,6 @@ public Unit invoke(LintError lint, Boolean corrected) {
 
 	@Override
 	public String format(
-			String text,
 			Path path,
 			Path editorConfigPath,
 			Map<String, Object> editorConfigOverrideMap) {
diff --git a/lib/src/compatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0Adapter.java b/lib/src/compatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0Adapter.java
index ac90893157..e65d0503ba 100644
--- a/lib/src/compatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0Adapter.java
+++ b/lib/src/compatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0Adapter.java
@@ -83,7 +83,6 @@ public Unit invoke(LintError lint, Boolean corrected) {
 
 	@Override
 	public String format(
-			String text,
 			Path path,
 			Path editorConfigPath,
 			Map<String, Object> editorConfigOverrideMap) {
diff --git a/lib/src/compatKtLintApi/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompatAdapter.java b/lib/src/compatKtLintApi/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompatAdapter.java
index e508633b95..1bfa0da6da 100644
--- a/lib/src/compatKtLintApi/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompatAdapter.java
+++ b/lib/src/compatKtLintApi/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompatAdapter.java
@@ -21,7 +21,6 @@
 public interface KtLintCompatAdapter {
 
 	String format(
-			String text,
 			Path path,
 			Path editorConfigPath,
 			Map<String, Object> editorConfigOverrideMap);
diff --git a/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java b/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
index ec5fbcb67b..8b2331f3b9 100644
--- a/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
+++ b/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
@@ -60,11 +60,10 @@ public KtlintFormatterFunc(String version, FileSignature editorConfigPath,
 
 	@Override
 	public String applyWithFile(String unix, File file) {
-
 		Path absoluteEditorConfigPath = null;
 		if (editorConfigPath != null) {
 			absoluteEditorConfigPath = editorConfigPath.getOnlyFile().toPath();
 		}
-		return adapter.format(unix, file.toPath(), absoluteEditorConfigPath, editorConfigOverrideMap);
+		return adapter.format(file.toPath(), absoluteEditorConfigPath, editorConfigOverrideMap);
 	}
 }
diff --git a/lib/src/testCompatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0AdapterTest.java b/lib/src/testCompatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0AdapterTest.java
index bab3764147..17fe40fb9c 100644
--- a/lib/src/testCompatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0AdapterTest.java
+++ b/lib/src/testCompatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0AdapterTest.java
@@ -33,19 +33,19 @@ public class KtLintCompat0Dot48Dot0AdapterTest {
 	@Test
 	public void testDefaults(@TempDir Path path) throws IOException {
 		KtLintCompat0Dot48Dot0Adapter ktLintCompat0Dot48Dot0Adapter = new KtLintCompat0Dot48Dot0Adapter();
-		String text = loadAndWriteText(path, "empty_class_body.kt");
+		loadAndWriteText(path, "empty_class_body.kt");
 		final Path filePath = Paths.get(path.toString(), "empty_class_body.kt");
 
 		Map<String, Object> editorConfigOverrideMap = new HashMap<>();
 
-		String formatted = ktLintCompat0Dot48Dot0Adapter.format(text, filePath, null, editorConfigOverrideMap);
+		String formatted = ktLintCompat0Dot48Dot0Adapter.format(filePath, null, editorConfigOverrideMap);
 		assertEquals("class empty_class_body\n", formatted);
 	}
 
 	@Test
 	public void testEditorConfigCanDisable(@TempDir Path path) throws IOException {
 		KtLintCompat0Dot48Dot0Adapter ktLintCompat0Dot48Dot0Adapter = new KtLintCompat0Dot48Dot0Adapter();
-		String text = loadAndWriteText(path, "fails_no_semicolons.kt");
+		loadAndWriteText(path, "fails_no_semicolons.kt");
 		final Path filePath = Paths.get(path.toString(), "fails_no_semicolons.kt");
 
 		Map<String, Object> editorConfigOverrideMap = new HashMap<>();
@@ -54,7 +54,7 @@ public void testEditorConfigCanDisable(@TempDir Path path) throws IOException {
 		// ktlint_filename is an invalid rule in ktlint 0.48.0
 		editorConfigOverrideMap.put("ktlint_filename", "disabled");
 
-		String formatted = ktLintCompat0Dot48Dot0Adapter.format(text, filePath, null, editorConfigOverrideMap);
+		String formatted = ktLintCompat0Dot48Dot0Adapter.format(filePath, null, editorConfigOverrideMap);
 		assertEquals("class fails_no_semicolons {\n\tval i = 0;\n}\n", formatted);
 	}
 
diff --git a/lib/src/testCompatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0AdapterTest.java b/lib/src/testCompatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0AdapterTest.java
index 5804c0b2d7..b34a83ebc3 100644
--- a/lib/src/testCompatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0AdapterTest.java
+++ b/lib/src/testCompatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0AdapterTest.java
@@ -33,26 +33,26 @@ public class KtLintCompat0Dot49Dot0AdapterTest {
 	@Test
 	public void testDefaults(@TempDir Path path) throws IOException {
 		KtLintCompat0Dot49Dot0Adapter ktLintCompat0Dot49Dot0Adapter = new KtLintCompat0Dot49Dot0Adapter();
-		String text = loadAndWriteText(path, "EmptyClassBody.kt");
+		loadAndWriteText(path, "EmptyClassBody.kt");
 		final Path filePath = Paths.get(path.toString(), "EmptyClassBody.kt");
 
 		Map<String, Object> editorConfigOverrideMap = new HashMap<>();
 
-		String formatted = ktLintCompat0Dot49Dot0Adapter.format(text, filePath, null, editorConfigOverrideMap);
+		String formatted = ktLintCompat0Dot49Dot0Adapter.format(filePath, null, editorConfigOverrideMap);
 		assertEquals("class EmptyClassBody\n", formatted);
 	}
 
 	@Test
 	public void testEditorConfigCanDisable(@TempDir Path path) throws IOException {
 		KtLintCompat0Dot49Dot0Adapter ktLintCompat0Dot49Dot0Adapter = new KtLintCompat0Dot49Dot0Adapter();
-		String text = loadAndWriteText(path, "FailsNoSemicolons.kt");
+		loadAndWriteText(path, "FailsNoSemicolons.kt");
 		final Path filePath = Paths.get(path.toString(), "FailsNoSemicolons.kt");
 
 		Map<String, Object> editorConfigOverrideMap = new HashMap<>();
 		editorConfigOverrideMap.put("indent_style", "tab");
 		editorConfigOverrideMap.put("ktlint_standard_no-semi", "disabled");
 
-		String formatted = ktLintCompat0Dot49Dot0Adapter.format(text, filePath, null, editorConfigOverrideMap);
+		String formatted = ktLintCompat0Dot49Dot0Adapter.format(filePath, null, editorConfigOverrideMap);
 		assertEquals("class FailsNoSemicolons {\n\tval i = 0;\n}\n", formatted);
 	}
 
diff --git a/lib/src/testCompatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0AdapterTest.java b/lib/src/testCompatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0AdapterTest.java
index 1a1f595991..0bb501a06e 100644
--- a/lib/src/testCompatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0AdapterTest.java
+++ b/lib/src/testCompatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0AdapterTest.java
@@ -33,26 +33,26 @@ public class KtLintCompat0Dot50Dot0AdapterTest {
 	@Test
 	public void testDefaults(@TempDir Path path) throws IOException {
 		KtLintCompat0Dot50Dot0Adapter KtLintCompat0Dot50Dot0Adapter = new KtLintCompat0Dot50Dot0Adapter();
-		String text = loadAndWriteText(path, "EmptyClassBody.kt");
+		loadAndWriteText(path, "EmptyClassBody.kt");
 		final Path filePath = Paths.get(path.toString(), "EmptyClassBody.kt");
 
 		Map<String, Object> editorConfigOverrideMap = new HashMap<>();
 
-		String formatted = KtLintCompat0Dot50Dot0Adapter.format(text, filePath, null, editorConfigOverrideMap);
+		String formatted = KtLintCompat0Dot50Dot0Adapter.format(filePath, null, editorConfigOverrideMap);
 		assertEquals("class EmptyClassBody\n", formatted);
 	}
 
 	@Test
 	public void testEditorConfigCanDisable(@TempDir Path path) throws IOException {
 		KtLintCompat0Dot50Dot0Adapter KtLintCompat0Dot50Dot0Adapter = new KtLintCompat0Dot50Dot0Adapter();
-		String text = loadAndWriteText(path, "FailsNoSemicolons.kt");
+		loadAndWriteText(path, "FailsNoSemicolons.kt");
 		final Path filePath = Paths.get(path.toString(), "FailsNoSemicolons.kt");
 
 		Map<String, Object> editorConfigOverrideMap = new HashMap<>();
 		editorConfigOverrideMap.put("indent_style", "tab");
 		editorConfigOverrideMap.put("ktlint_standard_no-semi", "disabled");
 
-		String formatted = KtLintCompat0Dot50Dot0Adapter.format(text, filePath, null, editorConfigOverrideMap);
+		String formatted = KtLintCompat0Dot50Dot0Adapter.format(filePath, null, editorConfigOverrideMap);
 		assertEquals("class FailsNoSemicolons {\n\tval i = 0;\n}\n", formatted);
 	}
 
diff --git a/lib/src/testCompatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0AdapterTest.java b/lib/src/testCompatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0AdapterTest.java
index 1d36082815..0f5f9cf16c 100644
--- a/lib/src/testCompatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0AdapterTest.java
+++ b/lib/src/testCompatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0AdapterTest.java
@@ -33,26 +33,26 @@ public class KtLintCompat1Dot0Dot0AdapterTest {
 	@Test
 	public void testDefaults(@TempDir Path path) throws IOException {
 		KtLintCompat1Dot0Dot0Adapter KtLintCompat1Dot0Dot0Adapter = new KtLintCompat1Dot0Dot0Adapter();
-		String text = loadAndWriteText(path, "EmptyClassBody.kt");
+		loadAndWriteText(path, "EmptyClassBody.kt");
 		final Path filePath = Paths.get(path.toString(), "EmptyClassBody.kt");
 
 		Map<String, Object> editorConfigOverrideMap = new HashMap<>();
 
-		String formatted = KtLintCompat1Dot0Dot0Adapter.format(text, filePath, null, editorConfigOverrideMap);
+		String formatted = KtLintCompat1Dot0Dot0Adapter.format(filePath, null, editorConfigOverrideMap);
 		assertEquals("class EmptyClassBody\n", formatted);
 	}
 
 	@Test
 	public void testEditorConfigCanDisable(@TempDir Path path) throws IOException {
 		KtLintCompat1Dot0Dot0Adapter KtLintCompat1Dot0Dot0Adapter = new KtLintCompat1Dot0Dot0Adapter();
-		String text = loadAndWriteText(path, "FailsNoSemicolons.kt");
+		loadAndWriteText(path, "FailsNoSemicolons.kt");
 		final Path filePath = Paths.get(path.toString(), "FailsNoSemicolons.kt");
 
 		Map<String, Object> editorConfigOverrideMap = new HashMap<>();
 		editorConfigOverrideMap.put("indent_style", "tab");
 		editorConfigOverrideMap.put("ktlint_standard_no-semi", "disabled");
 
-		String formatted = KtLintCompat1Dot0Dot0Adapter.format(text, filePath, null, editorConfigOverrideMap);
+		String formatted = KtLintCompat1Dot0Dot0Adapter.format(filePath, null, editorConfigOverrideMap);
 		assertEquals("class FailsNoSemicolons {\n\tval i = 0;\n}\n", formatted);
 	}
 

From 84693002052c91bceaea4c84a3444106f3f5dedf Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Tue, 21 Nov 2023 13:07:27 +0800
Subject: [PATCH 45/57] Refine styles

---
 .../spotless/glue/ktlint/KtlintFormatterFunc.java      | 10 +++++++---
 .../java/com/diffplug/spotless/kotlin/KtLintStep.java  |  8 ++++----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java b/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
index 8b2331f3b9..b81e107609 100644
--- a/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
+++ b/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
@@ -24,12 +24,13 @@
 import com.diffplug.spotless.glue.ktlint.compat.*;
 
 public class KtlintFormatterFunc implements FormatterFunc.NeedsFile {
-
 	private final KtLintCompatAdapter adapter;
 	private final FileSignature editorConfigPath;
 	private final Map<String, Object> editorConfigOverrideMap;
 
-	public KtlintFormatterFunc(String version, FileSignature editorConfigPath,
+	public KtlintFormatterFunc(
+			String version,
+			FileSignature editorConfigPath,
 			Map<String, Object> editorConfigOverrideMap) {
 		String[] versions = version.split("\\.");
 		int majorVersion = Integer.parseInt(versions[0]);
@@ -64,6 +65,9 @@ public String applyWithFile(String unix, File file) {
 		if (editorConfigPath != null) {
 			absoluteEditorConfigPath = editorConfigPath.getOnlyFile().toPath();
 		}
-		return adapter.format(file.toPath(), absoluteEditorConfigPath, editorConfigOverrideMap);
+		return adapter.format(
+				file.toPath(),
+				absoluteEditorConfigPath,
+				editorConfigOverrideMap);
 	}
 }
diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
index 856b39cc4a..9564dd7d50 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
@@ -37,9 +37,9 @@ public class KtLintStep {
 	private KtLintStep() {}
 
 	private static final String DEFAULT_VERSION = "1.0.1";
-	static final String NAME = "ktlint";
-	static final String MAVEN_COORDINATE_0_DOT = "com.pinterest:ktlint:";
-	static final String MAVEN_COORDINATE_1_DOT = "com.pinterest.ktlint:ktlint-cli:";
+	private static final String NAME = "ktlint";
+	private static final String MAVEN_COORDINATE_0_DOT = "com.pinterest:ktlint:";
+	private static final String MAVEN_COORDINATE_1_DOT = "com.pinterest.ktlint:ktlint-cli:";
 
 	public static FormatterStep create(Provisioner provisioner) {
 		return create(defaultVersion(), provisioner);
@@ -67,7 +67,7 @@ public static String defaultVersion() {
 	static final class State implements Serializable {
 		private static final long serialVersionUID = 1L;
 		/** The jar that contains the formatter. */
-		final JarState jarState;
+		private final JarState jarState;
 		private final TreeMap<String, Object> editorConfigOverride;
 		private final String version;
 		@Nullable

From a83c2a994b3813b60c165df56654d9e17b8a90e4 Mon Sep 17 00:00:00 2001
From: AntsyLich <59261191+AntsyLich@users.noreply.github.com>
Date: Tue, 21 Nov 2023 14:17:34 +0600
Subject: [PATCH 46/57] Add missing bracket in plugin-gradle/CHANGES.md

---
 plugin-gradle/CHANGES.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 9d833b0076..c35e7879b1 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -5,7 +5,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ## [Unreleased]
 ### Fixed
 * Fix Eclipse JDT on some settings files. ([#1864](https://github.com/diffplug/spotless/pull/1864) fixes [#1638](https://github.com/diffplug/spotless/issues/1638))
-* Check if EditorConfig file exist for Ktlint in KotlinGradleExtension. ([#1889](https://github.com/diffplug/spotless/pull/1889)
+* Check if EditorConfig file exist for Ktlint in KotlinGradleExtension. ([#1889](https://github.com/diffplug/spotless/pull/1889))
 ### Changes
 * Bump default `ktlint` version to latest `1.0.0` -> `1.0.1`. ([#1855](https://github.com/diffplug/spotless/pull/1855))
 ### Fixed

From 6d4a67906d9c5e48aa5c0b745ce81ba30df8ca9c Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Wed, 22 Nov 2023 04:48:41 +0800
Subject: [PATCH 47/57] Cleanups

---
 .../java/com/diffplug/spotless/kotlin/KtLintStep.java    | 9 ++-------
 .../java/com/diffplug/spotless/maven/kotlin/Ktlint.java  | 9 ++++++---
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
index 8fa679e7aa..55b4ca4520 100644
--- a/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
@@ -49,12 +49,7 @@ public static FormatterStep create(Provisioner provisioner) {
 	}
 
 	public static FormatterStep create(String version, Provisioner provisioner) {
-		return create(version, provisioner, Collections.emptyMap());
-	}
-
-	public static FormatterStep create(String version, Provisioner provisioner,
-			Map<String, Object> editorConfigOverride) {
-		return create(version, provisioner, null, editorConfigOverride, Collections.emptyList());
+		return create(version, provisioner, null, Collections.emptyMap(), Collections.emptyList());
 	}
 
 	public static FormatterStep create(String version,
@@ -73,7 +68,7 @@ public static String defaultVersion() {
 		return DEFAULT_VERSION;
 	}
 
-	static final class State implements Serializable {
+	private static final class State implements Serializable {
 		private static final long serialVersionUID = 1L;
 		/** The jar that contains the formatter. */
 		private final JarState jarState;
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/kotlin/Ktlint.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/kotlin/Ktlint.java
index 7fe492ca6e..2459a52828 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/kotlin/Ktlint.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/kotlin/Ktlint.java
@@ -30,7 +30,6 @@
 import com.diffplug.spotless.maven.FormatterStepFactory;
 
 public class Ktlint implements FormatterStepFactory {
-
 	@Parameter
 	private String version;
 	@Parameter
@@ -53,7 +52,11 @@ public FormatterStep newFormatterStep(final FormatterStepConfig stepConfig) {
 		if (customRuleSets == null) {
 			customRuleSets = Collections.emptyList();
 		}
-
-		return KtLintStep.create(ktlintVersion, stepConfig.getProvisioner(), configPath, editorConfigOverride, customRuleSets);
+		return KtLintStep.create(
+				ktlintVersion,
+				stepConfig.getProvisioner(),
+				configPath,
+				editorConfigOverride,
+				customRuleSets);
 	}
 }

From 81c3511f3590b789516d41d630643e38ef051fef Mon Sep 17 00:00:00 2001
From: Jose Luis Badano <badanojoseluis@gmail.com>
Date: Mon, 6 Nov 2023 00:25:47 -0300
Subject: [PATCH 48/57] Add a step to remove semicolons in Groovy files

Co-authored-by: Goooler <wangzongler@gmail.com>
---
 CHANGES.md                                    |  1 +
 .../spotless/groovy/RemoveSemicolonsStep.java | 76 +++++++++++++++++++
 plugin-gradle/CHANGES.md                      |  1 +
 plugin-gradle/README.md                       |  2 +
 .../gradle/spotless/BaseGroovyExtension.java  |  5 ++
 .../gradle/spotless/GroovyExtensionTest.java  | 21 +++++
 plugin-maven/CHANGES.md                       |  1 +
 plugin-maven/README.md                        |  2 +
 .../spotless/maven/groovy/Groovy.java         |  4 +
 .../maven/groovy/RemoveSemicolons.java        | 29 +++++++
 .../maven/groovy/RemoveSemicolonsTest.java    | 52 +++++++++++++
 .../GroovyCodeWithSemicolons.test             | 10 +++
 .../GroovyCodeWithSemicolonsFormatted.test    | 10 +++
 13 files changed, 214 insertions(+)
 create mode 100644 lib/src/main/java/com/diffplug/spotless/groovy/RemoveSemicolonsStep.java
 create mode 100644 plugin-maven/src/main/java/com/diffplug/spotless/maven/groovy/RemoveSemicolons.java
 create mode 100644 plugin-maven/src/test/java/com/diffplug/spotless/maven/groovy/RemoveSemicolonsTest.java
 create mode 100644 testlib/src/main/resources/groovy/removeSemicolons/GroovyCodeWithSemicolons.test
 create mode 100644 testlib/src/main/resources/groovy/removeSemicolons/GroovyCodeWithSemicolonsFormatted.test

diff --git a/CHANGES.md b/CHANGES.md
index 404363e199..7d7c3dc355 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -16,6 +16,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Fix Eclipse JDT on some settings files. ([#1864](https://github.com/diffplug/spotless/pull/1864) fixes [#1638](https://github.com/diffplug/spotless/issues/1638))
 ### Changes
 * Bump default `ktlint` version to latest `1.0.0` -> `1.0.1`. ([#1855](https://github.com/diffplug/spotless/pull/1855))
+* Add a Step to remove semicolons from Groovy files. ([#1881](https://github.com/diffplug/spotless/pull/1881))
 
 ## [2.42.0] - 2023-09-28
 ### Added
diff --git a/lib/src/main/java/com/diffplug/spotless/groovy/RemoveSemicolonsStep.java b/lib/src/main/java/com/diffplug/spotless/groovy/RemoveSemicolonsStep.java
new file mode 100644
index 0000000000..e24feb5cd3
--- /dev/null
+++ b/lib/src/main/java/com/diffplug/spotless/groovy/RemoveSemicolonsStep.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.groovy;
+
+import java.io.BufferedReader;
+import java.io.Serializable;
+import java.io.StringReader;
+
+import com.diffplug.spotless.FormatterFunc;
+import com.diffplug.spotless.FormatterStep;
+
+/**
+ * Removes all semicolons from the end of lines.
+ *
+ * @author Jose Luis Badano
+ */
+public final class RemoveSemicolonsStep {
+	private static final String NAME = "Remove unnecessary semicolons";
+
+	private RemoveSemicolonsStep() {
+		// do not instantiate
+	}
+
+	public static FormatterStep create() {
+		return FormatterStep.createLazy(NAME,
+				State::new,
+				RemoveSemicolonsStep.State::toFormatter);
+	}
+
+	private static final class State implements Serializable {
+		private static final long serialVersionUID = 1L;
+
+		FormatterFunc toFormatter() {
+			return raw -> {
+				try (BufferedReader reader = new BufferedReader(new StringReader(raw))) {
+					StringBuilder result = new StringBuilder();
+					String line;
+					while ((line = reader.readLine()) != null) {
+						result.append(removeSemicolon(line));
+						result.append(System.lineSeparator());
+					}
+					return result.toString();
+				}
+			};
+		}
+
+		/**
+		 * Removes the last semicolon in a line if it exists.
+		 *
+		 * @param line the line to remove the semicolon from
+		 * @return the line without the last semicolon
+		 */
+		private String removeSemicolon(String line) {
+			// find last semicolon in a string a remove it
+			int lastSemicolon = line.lastIndexOf(";");
+			if (lastSemicolon != -1 && lastSemicolon == line.length() - 1) {
+				return line.substring(0, lastSemicolon);
+			} else {
+				return line;
+			}
+		}
+	}
+}
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 32bf1bd7c0..03ddf370f4 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -10,6 +10,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Check if EditorConfig file exist for Ktlint in KotlinGradleExtension. ([#1889](https://github.com/diffplug/spotless/pull/1889))
 ### Changes
 * Bump default `ktlint` version to latest `1.0.0` -> `1.0.1`. ([#1855](https://github.com/diffplug/spotless/pull/1855))
+* Add a Step to remove semicolons from Groovy files. ([#1881](https://github.com/diffplug/spotless/pull/1881))
 ### Fixed
 * Fix `GoogleJavaFormatConfig.reorderImports` not working. ([#1872](https://github.com/diffplug/spotless/issues/1872))
 
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 6232f9c0e1..6b707a1eaa 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -320,6 +320,8 @@ spotless {
     // optional: instead of specifying import groups directly you can specify a config file
     // export config file: https://github.com/diffplug/spotless/blob/main/ECLIPSE_SCREENSHOTS.md#creating-spotlessimportorder
     importOrderFile('eclipse-import-order.txt') // import order file as exported from eclipse
+    // removes semicolons at the end of lines
+    removeSemicolons()
 
     excludeJava() // excludes all Java sources within the Groovy source dirs from formatting
     // the Groovy Eclipse formatter extends the Java Eclipse formatter,
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BaseGroovyExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BaseGroovyExtension.java
index 6aa28d1853..657ef06a66 100644
--- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BaseGroovyExtension.java
+++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BaseGroovyExtension.java
@@ -24,6 +24,7 @@
 
 import com.diffplug.spotless.extra.EquoBasedStepBuilder;
 import com.diffplug.spotless.extra.groovy.GrEclipseFormatterStep;
+import com.diffplug.spotless.groovy.RemoveSemicolonsStep;
 import com.diffplug.spotless.java.ImportOrderStep;
 
 abstract class BaseGroovyExtension extends FormatExtension {
@@ -40,6 +41,10 @@ public void importOrderFile(Object importOrderFile) {
 		addStep(ImportOrderStep.forGroovy().createFrom(getProject().file(importOrderFile)));
 	}
 
+	public void removeSemicolons() {
+		addStep(RemoveSemicolonsStep.create());
+	}
+
 	public GrEclipseConfig greclipse() {
 		return greclipse(GrEclipseFormatterStep.defaultVersion());
 	}
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GroovyExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GroovyExtensionTest.java
index c38df40d54..7f87d8793c 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GroovyExtensionTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GroovyExtensionTest.java
@@ -88,6 +88,27 @@ void excludeJavaWithCustomTarget() throws IOException {
 		assertThat(error).hasMessageContaining("'excludeJava' is not supported");
 	}
 
+	@Test
+	void removeSemicolons() throws IOException {
+		setFile("build.gradle").toLines(
+				"plugins {",
+				"    id 'com.diffplug.spotless'",
+				"}",
+				"apply plugin: 'groovy'",
+				"",
+				"spotless {",
+				"    groovy {",
+				"        removeSemicolons()",
+				"    }",
+				"}");
+
+		String withSemicolons = getTestResource("groovy/removeSemicolons/GroovyCodeWithSemicolons.test");
+		String withoutSemicolons = getTestResource("groovy/removeSemicolons/GroovyCodeWithSemicolonsFormatted.test");
+		setFile("src/main/groovy/test.groovy").toContent(withSemicolons);
+		gradleRunner().withArguments("spotlessApply").build();
+		assertFile("src/main/groovy/test.groovy").hasContent(withoutSemicolons);
+	}
+
 	@Test
 	void groovyPluginMissingCheck() throws IOException {
 		setFile("build.gradle").toLines(
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 5122402019..78fb6f84ca 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -11,6 +11,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Fix Eclipse JDT on some settings files. ([#1864](https://github.com/diffplug/spotless/pull/1864) fixes [#1638](https://github.com/diffplug/spotless/issues/1638))
 ### Changes
 * Bump default `ktlint` version to latest `1.0.0` -> `1.0.1`. ([#1855](https://github.com/diffplug/spotless/pull/1855))
+* Add a Step to remove semicolons from Groovy files. ([#1881](https://github.com/diffplug/spotless/pull/1881))
 
 ## [2.40.0] - 2023-09-28
 ### Added
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index f7849fbdfc..5eb523eca2 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -336,6 +336,8 @@ These mechanisms already exist for the Gradle plugin.
       <order>java|javax,org,com,com.diffplug,,\#com.diffplug,\#</order>  <!-- or use <file>${project.basedir}/eclipse.importorder</file> -->
       <!-- you can use an empty string for all the imports you didn't specify explicitly, '|' to join group without blank line, and '\#` prefix for static imports. -->
     </importOrder>
+    
+    <removeSemicolons /> <!-- removes semicolons at the end of lines -->
 
     <greclipse />          <!-- has its own section below -->
 
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/groovy/Groovy.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/groovy/Groovy.java
index 35b91f3677..db4b35dfd6 100644
--- a/plugin-maven/src/main/java/com/diffplug/spotless/maven/groovy/Groovy.java
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/groovy/Groovy.java
@@ -52,4 +52,8 @@ public void addGreclipse(GrEclipse greclipse) {
 	public void addImportOrder(ImportOrder importOrder) {
 		addStepFactory(importOrder);
 	}
+
+	public void addRemoveSemicolons(RemoveSemicolons removeSemicolons) {
+		addStepFactory(removeSemicolons);
+	}
 }
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/groovy/RemoveSemicolons.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/groovy/RemoveSemicolons.java
new file mode 100644
index 0000000000..a96a078692
--- /dev/null
+++ b/plugin-maven/src/main/java/com/diffplug/spotless/maven/groovy/RemoveSemicolons.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2016-2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.maven.groovy;
+
+import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.groovy.RemoveSemicolonsStep;
+import com.diffplug.spotless.maven.FormatterStepConfig;
+import com.diffplug.spotless.maven.FormatterStepFactory;
+
+public class RemoveSemicolons implements FormatterStepFactory {
+
+	@Override
+	public FormatterStep newFormatterStep(FormatterStepConfig config) {
+		return RemoveSemicolonsStep.create();
+	}
+}
diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/groovy/RemoveSemicolonsTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/groovy/RemoveSemicolonsTest.java
new file mode 100644
index 0000000000..fc78c87a27
--- /dev/null
+++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/groovy/RemoveSemicolonsTest.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2023 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.maven.groovy;
+
+import org.junit.jupiter.api.Test;
+
+import com.diffplug.spotless.maven.MavenIntegrationHarness;
+
+class RemoveSemicolonsTest extends MavenIntegrationHarness {
+
+	@Test
+	void testRemoveSemicolonsString() throws Exception {
+		writePomWithGroovySteps("<removeSemicolons/>");
+		runTest("Hello World;", "Hello World");
+	}
+
+	@Test
+	void testNotRemoveSemicolonsString() throws Exception {
+		writePomWithGroovySteps("<removeSemicolons/>");
+		runTest("Hello;World", "Hello;World");
+	}
+
+	@Test
+	void testRemoveSemicolons() throws Exception {
+		writePomWithGroovySteps("<removeSemicolons/>");
+
+		String path = "src/main/groovy/test.groovy";
+		setFile(path).toResource("groovy/removeSemicolons/GroovyCodeWithSemicolons.test");
+		mavenRunner().withArguments("spotless:apply").runNoError();
+		assertFile(path).sameAsResource("groovy/removeSemicolons/GroovyCodeWithSemicolonsFormatted.test");
+	}
+
+	private void runTest(String sourceContent, String targetContent) throws Exception {
+		String path = "src/main/groovy/test.groovy";
+		setFile(path).toContent(sourceContent);
+		mavenRunner().withArguments("spotless:apply").runNoError();
+		assertFile(path).hasContent(targetContent);
+	}
+}
diff --git a/testlib/src/main/resources/groovy/removeSemicolons/GroovyCodeWithSemicolons.test b/testlib/src/main/resources/groovy/removeSemicolons/GroovyCodeWithSemicolons.test
new file mode 100644
index 0000000000..b66af4e820
--- /dev/null
+++ b/testlib/src/main/resources/groovy/removeSemicolons/GroovyCodeWithSemicolons.test
@@ -0,0 +1,10 @@
+import mylib.Unused;
+import mylib.UsedB;
+import mylib.UsedA;
+
+public class SomeClass {
+System.out.println("hello");
+UsedB.someMethod();
+UsedA.someMethod();
+}
+}
\ No newline at end of file
diff --git a/testlib/src/main/resources/groovy/removeSemicolons/GroovyCodeWithSemicolonsFormatted.test b/testlib/src/main/resources/groovy/removeSemicolons/GroovyCodeWithSemicolonsFormatted.test
new file mode 100644
index 0000000000..434addfa68
--- /dev/null
+++ b/testlib/src/main/resources/groovy/removeSemicolons/GroovyCodeWithSemicolonsFormatted.test
@@ -0,0 +1,10 @@
+import mylib.Unused
+import mylib.UsedB
+import mylib.UsedA
+
+public class SomeClass {
+System.out.println("hello")
+UsedB.someMethod()
+UsedA.someMethod()
+}
+}
\ No newline at end of file

From ad2f3ca8d2adceb1cc10cee131f9bd65ae9b2ac4 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Wed, 22 Nov 2023 11:00:23 +0800
Subject: [PATCH 49/57] Reorder section about Groovy integration

---
 plugin-gradle/README.md | 9 ++++++---
 plugin-maven/README.md  | 8 ++++----
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
index 6b707a1eaa..4f6b74bdb7 100644
--- a/plugin-gradle/README.md
+++ b/plugin-gradle/README.md
@@ -322,13 +322,16 @@ spotless {
     importOrderFile('eclipse-import-order.txt') // import order file as exported from eclipse
     // removes semicolons at the end of lines
     removeSemicolons()
-
-    excludeJava() // excludes all Java sources within the Groovy source dirs from formatting
     // the Groovy Eclipse formatter extends the Java Eclipse formatter,
     // so it formats Java files by default (unless `excludeJava` is used).
     greclipse() // has its own section below
+    
+    licenseHeader('/* (C) $YEAR */') // or licenseHeaderFile
 
-    licenseHeader '/* (C) $YEAR */' // or licenseHeaderFile
+    //---- Below is for `groovy` only ----
+    
+    // excludes all Java sources within the Groovy source dirs from formatting
+    excludeJava()
   }
   groovyGradle {
     target '*.gradle' // default target of groovyGradle
diff --git a/plugin-maven/README.md b/plugin-maven/README.md
index 5eb523eca2..857597beb2 100644
--- a/plugin-maven/README.md
+++ b/plugin-maven/README.md
@@ -331,16 +331,16 @@ These mechanisms already exist for the Gradle plugin.
       <include>src/test/groovy/**/*.groovy</include>
     </includes>
 
-    <importOrder /> <!-- standard import order -->
+    <importOrder/> <!-- standard import order -->
     <importOrder>  <!-- or a custom ordering -->
       <order>java|javax,org,com,com.diffplug,,\#com.diffplug,\#</order>  <!-- or use <file>${project.basedir}/eclipse.importorder</file> -->
       <!-- you can use an empty string for all the imports you didn't specify explicitly, '|' to join group without blank line, and '\#` prefix for static imports. -->
     </importOrder>
     
-    <removeSemicolons /> <!-- removes semicolons at the end of lines -->
-
-    <greclipse />          <!-- has its own section below -->
+    <removeSemicolons/> <!-- removes semicolons at the end of lines -->
+    <greclipse/>          <!-- has its own section below -->
 
+    <excludeJava/>
     <licenseHeader>
       <content>/* (C)$YEAR */</content>  <!-- or <file>${project.basedir}/license-header</file> -->
     </licenseHeader>

From 1f78412810a2f325993b05ae026ce558683dc717 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Sun, 26 Nov 2023 13:11:57 +0800
Subject: [PATCH 50/57] Bump SpotBugs plugin to 5.2.3

https://github.com/spotbugs/spotbugs-gradle-plugin/releases/tag/5.2.3
https://github.com/spotbugs/spotbugs-gradle-plugin?tab=readme-ov-file#refer-the-version-in-the-build-script
---
 gradle.properties        | 1 -
 gradle/java-setup.gradle | 9 +--------
 settings.gradle          | 2 +-
 3 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index c65ea39f94..b60fa2f805 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -21,7 +21,6 @@ artifactIdGradle=spotless-plugin-gradle
 
 # Build requirements
 VER_JAVA=11
-VER_SPOTBUGS=4.7.3
 VER_JSR_305=3.0.2
 
 # Dependencies provided by Spotless plugin
diff --git a/gradle/java-setup.gradle b/gradle/java-setup.gradle
index 5a1e23ef0a..91f2f13e8c 100644
--- a/gradle/java-setup.gradle
+++ b/gradle/java-setup.gradle
@@ -14,7 +14,6 @@ tasks.withType(JavaCompile).configureEach {
 //////////////
 apply plugin: 'com.github.spotbugs'
 spotbugs {
-	toolVersion = VER_SPOTBUGS
 	ignoreFailures = false 	// bug free or it doesn't ship!
 	reportLevel = 'medium'	// low|medium|high (low = sensitive to even minor mistakes)
 	omitVisitors = [
@@ -30,16 +29,10 @@ tasks.withType(com.github.spotbugs.snom.SpotBugsTask).configureEach {
 	reports {
 		html.enabled = true
 	}
-	notCompatibleWithConfigurationCache("https://github.com/spotbugs/spotbugs-gradle-plugin/issues/670")
 }
 
-tasks.named('spotbugsMain') {
-	reports {
-		html.enabled = true
-	}
-}
 dependencies {
 	compileOnly 'net.jcip:jcip-annotations:1.0'
-	compileOnly "com.github.spotbugs:spotbugs-annotations:${VER_SPOTBUGS}"
+	compileOnly "com.github.spotbugs:spotbugs-annotations:${spotbugs.toolVersion.get()}"
 	compileOnly "com.google.code.findbugs:jsr305:${VER_JSR_305}"
 }
diff --git a/settings.gradle b/settings.gradle
index e7b9649cf3..e7e5a6d4ea 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -12,7 +12,7 @@ plugins {
 	// https://github.com/gradle-nexus/publish-plugin/releases
 	id 'io.github.gradle-nexus.publish-plugin' version '1.3.0' apply false
 	// https://github.com/spotbugs/spotbugs-gradle-plugin/releases
-	id 'com.github.spotbugs' version '5.2.1' apply false
+	id 'com.github.spotbugs' version '5.2.3' apply false
 	// https://github.com/diffplug/spotless-changelog/blob/main/CHANGELOG.md
 	id 'com.diffplug.spotless-changelog' version '3.0.2' apply false
 	// https://github.com/diffplug/goomph/blob/main/CHANGES.md

From dd344320b5183a20d175d79f3766bde735c8d784 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Sun, 26 Nov 2023 15:28:57 +0800
Subject: [PATCH 51/57] Omit ConstructorThrow visitor

https://spotbugs.readthedocs.io/en/latest/detectors.html#constructorthrow
---
 gradle/java-setup.gradle | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/gradle/java-setup.gradle b/gradle/java-setup.gradle
index 91f2f13e8c..b152097653 100644
--- a/gradle/java-setup.gradle
+++ b/gradle/java-setup.gradle
@@ -17,7 +17,11 @@ spotbugs {
 	ignoreFailures = false 	// bug free or it doesn't ship!
 	reportLevel = 'medium'	// low|medium|high (low = sensitive to even minor mistakes)
 	omitVisitors = [
-		'FindReturnRef'] // https://spotbugs.readthedocs.io/en/latest/detectors.html#findreturnref
+		// https://spotbugs.readthedocs.io/en/latest/detectors.html#constructorthrow
+		'ConstructorThrow',
+		// https://spotbugs.readthedocs.io/en/latest/detectors.html#findreturnref
+		'FindReturnRef',
+	]
 }
 tasks.named('spotbugsTest') {
 	enabled = false

From 997ae051d3b4e3386ccf3d1b8e0229cc6756422e Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Sun, 26 Nov 2023 15:37:53 +0800
Subject: [PATCH 52/57] Sign task is now CC compatible

---
 gradle/java-publish.gradle | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/gradle/java-publish.gradle b/gradle/java-publish.gradle
index 49075c5970..d6f0afa5a0 100644
--- a/gradle/java-publish.gradle
+++ b/gradle/java-publish.gradle
@@ -199,10 +199,6 @@ if (System.env['JITPACK'] == 'true' || version.endsWith('-SNAPSHOT')) {
 	}
 }
 
-tasks.withType(Sign).configureEach {
-	notCompatibleWithConfigurationCache("https://github.com/gradle/gradle/issues/13470")
-}
-
 tasks.withType(AbstractArchiveTask).configureEach {
 	preserveFileTimestamps = false
 	reproducibleFileOrder = true

From 1031d15db96d159e42614532883d5f1319ffc206 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Sun, 26 Nov 2023 15:55:00 +0800
Subject: [PATCH 53/57] Defer Jar task configuration

---
 lib-extra/build.gradle | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib-extra/build.gradle b/lib-extra/build.gradle
index 07135ff726..e6524f76bf 100644
--- a/lib-extra/build.gradle
+++ b/lib-extra/build.gradle
@@ -56,16 +56,16 @@ for (needsP2 in NEEDS_P2_DEPS) {
 		add("${needsP2}CompileOnly", "dev.equo.ide:solstice:${VER_SOLSTICE}")
 	}
 }
-jar {
+
+def jar = tasks.named('jar', Jar) {
 	for (needsP2 in NEEDS_P2_DEPS) {
-		from sourceSets.getByName(needsP2).output.classesDirs
+		from sourceSets.named(needsP2).map { it.output.classesDirs }
 	}
 }
+
 tasks.withType(Test).configureEach {
 	dependsOn jar
-	doFirst {
-		classpath += jar.outputs.files
-	}
+	classpath += jar.get().outputs.files
 }
 
 apply plugin: 'dev.equo.p2deps'

From 53fe1e0bb2c063e6f9bbbea80bab52306975a1db Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Sun, 26 Nov 2023 13:11:57 +0800
Subject: [PATCH 54/57] Polish KotlinGradleExtensionTest

---
 .../gradle/spotless/KotlinExtensionTest.java  |  2 +-
 .../spotless/KotlinGradleExtensionTest.java   | 61 ++++++-------------
 2 files changed, 19 insertions(+), 44 deletions(-)

diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
index dd0f2f5e21..6973eb020c 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
@@ -30,7 +30,7 @@ class KotlinExtensionTest extends GradleIntegrationHarness {
 	void integrationDiktat() throws IOException {
 		setFile("build.gradle").toLines(
 				"plugins {",
-				"    id 'org.jetbrains.kotlin.jvm' version '1.4.30'",
+				"    id 'org.jetbrains.kotlin.jvm' version '1.5.31'",
 				"    id 'com.diffplug.spotless'",
 				"}",
 				"repositories { mavenCentral() }",
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinGradleExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinGradleExtensionTest.java
index 7dade5f2ff..f2b8590083 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinGradleExtensionTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinGradleExtensionTest.java
@@ -15,34 +15,19 @@
  */
 package com.diffplug.gradle.spotless;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 import java.io.IOException;
 
-import org.gradle.testkit.runner.BuildResult;
-import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
 
-class KotlinGradleExtensionTest extends GradleIntegrationHarness {
-	@Test
-	void integration_default_diktat() throws IOException {
-		setFile("build.gradle").toLines(
-				"plugins {",
-				"    id 'org.jetbrains.kotlin.jvm' version '1.4.30'",
-				"    id 'com.diffplug.spotless'",
-				"}",
-				"repositories { mavenCentral() }",
-				"spotless {",
-				"    kotlinGradle {",
-				"        diktat()",
-				"    }",
-				"}");
-		setFile("configuration.gradle.kts").toResource("kotlin/diktat/basic.dirty");
-		BuildResult result = gradleRunner().withArguments("spotlessApply").buildAndFail();
-		assertThat(result.getOutput()).contains("[AVOID_NESTED_FUNCTIONS] try to avoid using nested functions");
-	}
+/**
+ * We test KotlinGradleExtension only behaviors here.
+ */
+class KotlinGradleExtensionTest extends KotlinExtensionTest {
 
-	@Test
-	void withExperimentalEditorConfigOverride() throws IOException {
+	@ParameterizedTest
+	@ValueSource(booleans = {true, false})
+	void testTarget(boolean useDefaultTarget) throws IOException {
 		setFile("build.gradle").toLines(
 				"plugins {",
 				"    id 'org.jetbrains.kotlin.jvm' version '1.5.31'",
@@ -51,6 +36,7 @@ void withExperimentalEditorConfigOverride() throws IOException {
 				"repositories { mavenCentral() }",
 				"spotless {",
 				"    kotlinGradle {",
+				"        " + (useDefaultTarget ? "" : "target \"*.kts\""),
 				"        ktlint().editorConfigOverride([",
 				"            ktlint_experimental: \"enabled\",",
 				"            ij_kotlin_allow_trailing_comma: true,",
@@ -59,25 +45,14 @@ void withExperimentalEditorConfigOverride() throws IOException {
 				"    }",
 				"}");
 		setFile("configuration.gradle.kts").toResource("kotlin/ktlint/experimentalEditorConfigOverride.dirty");
+		setFile("configuration.kts").toResource("kotlin/ktlint/experimentalEditorConfigOverride.dirty");
 		gradleRunner().withArguments("spotlessApply").build();
-		assertFile("configuration.gradle.kts").sameAsResource("kotlin/ktlint/experimentalEditorConfigOverride.clean");
-	}
-
-	@Test
-	void integration_ktfmt_with_dropbox_style() throws IOException {
-		setFile("build.gradle").toLines(
-				"plugins {",
-				"    id 'org.jetbrains.kotlin.jvm' version '1.5.31'",
-				"    id 'com.diffplug.spotless'",
-				"}",
-				"repositories { mavenCentral() }",
-				"spotless {",
-				"    kotlinGradle {",
-				"        ktfmt().dropboxStyle()",
-				"    }",
-				"}");
-		setFile("configuration.gradle.kts").toResource("kotlin/ktfmt/dropboxstyle.dirty");
-		gradleRunner().withArguments("spotlessApply").build();
-		assertFile("configuration.gradle.kts").sameAsResource("kotlin/ktfmt/dropboxstyle.clean");
+		if (useDefaultTarget) {
+			assertFile("configuration.gradle.kts").sameAsResource("kotlin/ktlint/experimentalEditorConfigOverride.clean");
+			assertFile("configuration.kts").sameAsResource("kotlin/ktlint/experimentalEditorConfigOverride.dirty");
+		} else {
+			assertFile("configuration.gradle.kts").sameAsResource("kotlin/ktlint/experimentalEditorConfigOverride.clean");
+			assertFile("configuration.kts").sameAsResource("kotlin/ktlint/experimentalEditorConfigOverride.clean");
+		}
 	}
 }

From 4775485957c5cafcf5c6c65dab4f3203c5471b06 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Sun, 26 Nov 2023 17:17:21 +0800
Subject: [PATCH 55/57] Polish GroovyGradleExtensionTest

---
 .../spotless/GroovyGradleExtensionTest.java   | 24 ++++++++-----------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GroovyGradleExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GroovyGradleExtensionTest.java
index 7f4d593a9c..e94d269644 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GroovyGradleExtensionTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GroovyGradleExtensionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,24 +17,20 @@
 
 import java.io.IOException;
 
-import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
 
 import com.diffplug.common.base.StringPrinter;
 
-class GroovyGradleExtensionTest extends GradleIntegrationHarness {
+/**
+ * We test GroovyGradleExtension only behaviors here.
+ */
+class GroovyGradleExtensionTest extends GroovyExtensionTest {
 	private static final String HEADER = "//My tests header";
 
-	@Test
-	void defaultTarget() throws IOException {
-		testTarget(true);
-	}
-
-	@Test
-	void customTarget() throws IOException {
-		testTarget(false);
-	}
-
-	private void testTarget(boolean useDefaultTarget) throws IOException {
+	@ParameterizedTest
+	@ValueSource(booleans = {true, false})
+	void testTarget(boolean useDefaultTarget) throws IOException {
 		String target = useDefaultTarget ? "" : "target 'other.gradle'";
 		String buildContent = StringPrinter.buildStringFromLines(
 				"plugins {",

From f183b61485616b8c2eb2c5946e03759d5ecc5228 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Sun, 26 Nov 2023 18:18:43 +0800
Subject: [PATCH 56/57] Bump Kotlin to 1.6.21 in integration tests

We can't use the latest version, due to the Gradle matrix limit in tests.
---
 .../gradle/spotless/KotlinExtensionTest.java   | 18 +++++++++---------
 .../spotless/KotlinGradleExtensionTest.java    |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
index 6973eb020c..bd1175b992 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
@@ -30,7 +30,7 @@ class KotlinExtensionTest extends GradleIntegrationHarness {
 	void integrationDiktat() throws IOException {
 		setFile("build.gradle").toLines(
 				"plugins {",
-				"    id 'org.jetbrains.kotlin.jvm' version '1.5.31'",
+				"    id 'org.jetbrains.kotlin.jvm' version '1.6.21'",
 				"    id 'com.diffplug.spotless'",
 				"}",
 				"repositories { mavenCentral() }",
@@ -48,7 +48,7 @@ void integrationDiktat() throws IOException {
 	void integrationKtfmt_dropboxStyle_0_19() throws IOException {
 		setFile("build.gradle").toLines(
 				"plugins {",
-				"    id 'org.jetbrains.kotlin.jvm' version '1.5.31'",
+				"    id 'org.jetbrains.kotlin.jvm' version '1.6.21'",
 				"    id 'com.diffplug.spotless'",
 				"}",
 				"repositories { mavenCentral() }",
@@ -66,7 +66,7 @@ void integrationKtfmt_dropboxStyle_0_19() throws IOException {
 	void withExperimentalEditorConfigOverride() throws IOException {
 		setFile("build.gradle").toLines(
 				"plugins {",
-				"    id 'org.jetbrains.kotlin.jvm' version '1.5.31'",
+				"    id 'org.jetbrains.kotlin.jvm' version '1.6.21'",
 				"    id 'com.diffplug.spotless'",
 				"}",
 				"repositories { mavenCentral() }",
@@ -90,7 +90,7 @@ void testWithInvalidEditorConfigFile() throws IOException {
 
 		setFile("build.gradle").toLines(
 				"plugins {",
-				"    id 'org.jetbrains.kotlin.jvm' version '1.5.31'",
+				"    id 'org.jetbrains.kotlin.jvm' version '1.6.21'",
 				"    id 'com.diffplug.spotless'",
 				"}",
 				"repositories { mavenCentral() }",
@@ -110,7 +110,7 @@ void testReadCodeStyleFromEditorConfigFile() throws IOException {
 		setFile(".editorconfig").toResource("kotlin/ktlint/ktlint_official/.editorconfig");
 		setFile("build.gradle").toLines(
 				"plugins {",
-				"    id 'org.jetbrains.kotlin.jvm' version '1.5.31'",
+				"    id 'org.jetbrains.kotlin.jvm' version '1.6.21'",
 				"    id 'com.diffplug.spotless'",
 				"}",
 				"repositories { mavenCentral() }",
@@ -127,7 +127,7 @@ void testSetEditorConfigCanOverrideEditorConfigFile() throws IOException {
 		setFile(".editorconfig").toResource("kotlin/ktlint/intellij_idea/.editorconfig");
 		setFile("build.gradle").toLines(
 				"plugins {",
-				"    id 'org.jetbrains.kotlin.jvm' version '1.5.31'",
+				"    id 'org.jetbrains.kotlin.jvm' version '1.6.21'",
 				"    id 'com.diffplug.spotless'",
 				"}",
 				"repositories { mavenCentral() }",
@@ -145,7 +145,7 @@ void testSetEditorConfigCanOverrideEditorConfigFile() throws IOException {
 	void withCustomRuleSetApply() throws IOException {
 		setFile("build.gradle").toLines(
 				"plugins {",
-				"    id 'org.jetbrains.kotlin.jvm' version '1.5.31'",
+				"    id 'org.jetbrains.kotlin.jvm' version '1.6.21'",
 				"    id 'com.diffplug.spotless'",
 				"}",
 				"repositories { mavenCentral() }",
@@ -169,7 +169,7 @@ void withCustomRuleSetApply() throws IOException {
 	void testWithHeader() throws IOException {
 		setFile("build.gradle").toLines(
 				"plugins {",
-				"    id 'org.jetbrains.kotlin.jvm' version '1.5.31'",
+				"    id 'org.jetbrains.kotlin.jvm' version '1.6.21'",
 				"    id 'com.diffplug.spotless'",
 				"}",
 				"repositories { mavenCentral() }",
@@ -188,7 +188,7 @@ void testWithHeader() throws IOException {
 	void testWithCustomMaxWidthDefaultStyleKtfmt() throws IOException {
 		setFile("build.gradle").toLines(
 				"plugins {",
-				"    id 'org.jetbrains.kotlin.jvm' version '1.5.31'",
+				"    id 'org.jetbrains.kotlin.jvm' version '1.6.21'",
 				"    id 'com.diffplug.spotless'",
 				"}",
 				"repositories { mavenCentral() }",
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinGradleExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinGradleExtensionTest.java
index f2b8590083..c607c36912 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinGradleExtensionTest.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinGradleExtensionTest.java
@@ -30,7 +30,7 @@ class KotlinGradleExtensionTest extends KotlinExtensionTest {
 	void testTarget(boolean useDefaultTarget) throws IOException {
 		setFile("build.gradle").toLines(
 				"plugins {",
-				"    id 'org.jetbrains.kotlin.jvm' version '1.5.31'",
+				"    id 'org.jetbrains.kotlin.jvm' version '1.6.21'",
 				"    id 'com.diffplug.spotless'",
 				"}",
 				"repositories { mavenCentral() }",

From 23972d3fa9c9950bc34eb653f0e598cc968b2620 Mon Sep 17 00:00:00 2001
From: runner <runner@fv-az711-133>
Date: Mon, 27 Nov 2023 05:38:38 +0000
Subject: [PATCH 57/57] Published lib/2.43.0

---
 CHANGES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 7d7c3dc355..f2bc6974c6 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,8 @@ 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]
+
+## [2.43.0] - 2023-11-27
 ### Added
 * Support custom rule sets for Ktlint. ([#1896](https://github.com/diffplug/spotless/pull/1896)
 ### Fixed