Merge branch 'main' into renovate/gradle-7.x

Author: nedtwigg

CHANGES.md

@@ -11,12 +11,21 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 
+## [2.31.1] - 2023-01-02
+### Fixed
+* Improve memory usage when using git ratchet ([#1426](https://github.com/diffplug/spotless/pull/1426))
+* Support `ktlint` 0.48+ ([#1432](https://github.com/diffplug/spotless/pull/1432)) fixes ([#1430](https://github.com/diffplug/spotless/issues/1430))
+### Changes
+* Bump default `ktlint` version to latest `0.47.1` -> `0.48.0` ([#1432](https://github.com/diffplug/spotless/pull/1432))
+* Bump default `ktfmt` version to latest `0.41` -> `0.42` ([#1421](https://github.com/diffplug/spotless/pull/1421))
+
 ## [2.31.0] - 2022-11-24
 ### Added
 * `importOrder` now support groups of imports without blank lines ([#1401](https://github.com/diffplug/spotless/pull/1401))
 ### Fixed
 * Don't treat `@Value` as a type annotation [#1367](https://github.com/diffplug/spotless/pull/1367)
 * Support `ktlint_disabled_rules` in `ktlint` 0.47.x [#1378](https://github.com/diffplug/spotless/pull/1378)
+* Share git repositories across projects when using ratchet ([#1426](https://github.com/diffplug/spotless/pull/1426))
 ### Changes
 * Bump default `ktfmt` version to latest `0.40` -> `0.41` ([#1340](https://github.com/diffplug/spotless/pull/1340))
 * Bump default `scalafmt` version to latest `3.5.9` -> `3.6.1` ([#1373](https://github.com/diffplug/spotless/pull/1373))

CONTRIBUTING.md

@@ -36,7 +36,7 @@ For the folders below in monospace text, they are published on maven central at
 | `lib-extra` | Contains the optional parts of Spotless which require external dependencies.  `LineEnding.GIT_ATTRIBUTES` won't work unless `lib-extra` is available. |
 | `plugin-gradle` | Integrates spotless and all of its formatters into Gradle. |
 | `plugin-maven` | Integrates spotless and all of its formatters into Maven. |
-| _ext | Folder for generating glue jars (specifically packaging Eclipse jars from p2 for consumption using maven).
+| `_ext` | Folder for generating glue jars (specifically packaging Eclipse jars from p2 for consumption using maven).
 
 ## How to add a new FormatterStep
 
@@ -119,7 +119,7 @@ There are many great formatters (prettier, clang-format, black, etc.) which live
 
 Because of Spotless' up-to-date checking and [git ratcheting](https://github.com/diffplug/spotless/tree/main/plugin-gradle#ratchet), Spotless actually doesn't have to call formatters very often, so even an expensive shell call for every single invocation isn't that bad.  Anything that works is better than nothing, and we can always speed things up later if it feels too slow (but it probably won't).
 
-## How to enable the _ext projects
+## How to enable the `_ext` projects
 
 The `_ext` projects are disabled per default, since:
 

_ext/eclipse-cdt/CHANGES.md

@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `9.9.0`).
 
 ## [Unreleased]
+### Fixed
+* Fix typo in gradle variable names ([#1425](https://github.com/diffplug/spotless/pull/1425))
 
 ## [10.5.0] - 2021-12-13
 ### Added

_ext/eclipse-cdt/build.gradle

@@ -17,15 +17,15 @@ apply from: rootProject.file('gradle/java-publish.gradle')
 
 
 dependencies {
-	implementation "com.diffplug.spotless:spotless-eclipse-base:${VER_SPOTLESS_ECLISPE_BASE}"
+	implementation "com.diffplug.spotless:spotless-eclipse-base:${VER_SPOTLESS_ECLIPSE_BASE}"
 	// Provides text partitioners for formatters
-	implementation ("org.eclipse.platform:org.eclipse.jface.text:${VER_ECLISPE_JFACE}") {
+	implementation ("org.eclipse.platform:org.eclipse.jface.text:${VER_ECLIPSE_JFACE}") {
 		exclude group: 'org.eclipse.platform', module: 'org.eclipse.swt'
 	}
 	// Required to by CCorePlugin calling CDTLogWriter
 	implementation "com.ibm.icu:icu4j:${VER_IBM_ICU}"
 	// Required to by CCorePlugin calling PositionTrackerManager
-	implementation "org.eclipse.platform:org.eclipse.core.filebuffers:${VER_ECLISPE_EFS}"
+	implementation "org.eclipse.platform:org.eclipse.core.filebuffers:${VER_ECLIPSE_EFS}"
 
 	testImplementation("org.slf4j:slf4j-simple:${VER_SLF4J}")
 }

_ext/eclipse-cdt/gradle.properties

@@ -6,7 +6,7 @@ VER_JAVA=11
 
 # Compile dependencies
 VER_ECLIPSE_CDT=10.5
-VER_SPOTLESS_ECLISPE_BASE=[3.5.0,4.0.0[
-VER_ECLISPE_JFACE=[3.18.0,4.0.0[
-VER_ECLISPE_EFS=[3.7.0,4.0.0[
+VER_SPOTLESS_ECLIPSE_BASE=[3.5.0,4.0.0[
+VER_ECLIPSE_JFACE=[3.18.0,4.0.0[
+VER_ECLIPSE_EFS=[3.7.0,4.0.0[
 VER_IBM_ICU=[67.1,68[

_ext/eclipse-groovy/CHANGES.md

@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.5.0`).
 
 ## [Unreleased]
+### Fixed
+* Fix typo in gradle variable names ([#1425](https://github.com/diffplug/spotless/pull/1425))
 
 ## [4.3.0] - 2021-10-13
 ### Added

_ext/eclipse-groovy/build.gradle

@@ -39,9 +39,9 @@ apply from: rootProject.file('_ext/gradle/p2-fat-jar-setup.gradle')
 apply from: rootProject.file('gradle/java-publish.gradle')
 
 dependencies {
-	implementation "com.diffplug.spotless:spotless-eclipse-base:${VER_SPOTLESS_ECLISPE_BASE}"
+	implementation "com.diffplug.spotless:spotless-eclipse-base:${VER_SPOTLESS_ECLIPSE_BASE}"
 	// Provides text partitioners for formatters
-	implementation ("org.eclipse.platform:org.eclipse.jface.text:${VER_ECLISPE_JFACE}") {
+	implementation ("org.eclipse.platform:org.eclipse.jface.text:${VER_ECLIPSE_JFACE}") {
 		exclude group: 'org.eclipse.platform', module: 'org.eclipse.swt'
 	}
 	testImplementation("org.slf4j:slf4j-simple:${VER_SLF4J}")

_ext/eclipse-groovy/gradle.properties

@@ -6,8 +6,8 @@ VER_JAVA=11
 
 # Compile
 VER_ECLIPSE=4.21
-VER_SPOTLESS_ECLISPE_BASE=[3.4.2,4.0.0[
-VER_ECLISPE_JFACE=[3.15.300,4.0.0[
+VER_SPOTLESS_ECLIPSE_BASE=[3.4.2,4.0.0[
+VER_ECLIPSE_JFACE=[3.15.300,4.0.0[
 VER_GRECLIPSE=4.3.0
 VER_GROOVY=4.0.0
 # Use org.eclipse.jdt.core patched for Groovy-Eclipse

_ext/eclipse-jdt/build.gradle

@@ -10,7 +10,7 @@ ext {
 }
 
 dependencies {
-	implementation "com.diffplug.spotless:spotless-eclipse-base:${VER_SPOTLESS_ECLISPE_BASE}"
+	implementation "com.diffplug.spotless:spotless-eclipse-base:${VER_SPOTLESS_ECLIPSE_BASE}"
 	implementation("org.eclipse.jdt:org.eclipse.jdt.core:${VER_ECLIPSE_JDT_CORE}") {
 		exclude group: 'org.eclipse.platform', module: 'org.eclipse.ant.core'
 		exclude group: 'org.eclipse.platform', module: 'org.eclipse.core.expressions'

_ext/eclipse-jdt/gradle.properties

@@ -6,4 +6,4 @@ VER_JAVA=11
 
 # Compile
 VER_ECLIPSE_JDT_CORE=[3.13.0,4.0.0[
-VER_SPOTLESS_ECLISPE_BASE=[3.5.0,4.0.0[
+VER_SPOTLESS_ECLIPSE_BASE=[3.5.0,4.0.0[