Skip to content

Commit 9ead399

Browse files
nedtwiggnedtwigg
committed
Merge branch 'main' into renovate/win-5.x
2 parents 050009f + 80dae16 commit 9ead399

File tree

60 files changed

+728
-260
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+728
-260
lines changed

‎CHANGES.md

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,30 @@ This document is intended for Spotless developers.
1010
We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
1111

1212
## [Unreleased]
13+
### Changes
14+
* Bump the dev version of Gradle from `7.5.1` to `7.6` ([#1409](https://github.com/diffplug/spotless/pull/1409))
15+
* We also removed the no-longer-required dependency `org.codehaus.groovy:groovy-xml`
16+
17+
## [2.31.1] - 2023-01-02
18+
### Fixed
19+
* Improve memory usage when using git ratchet ([#1426](https://github.com/diffplug/spotless/pull/1426))
20+
* Support `ktlint` 0.48+ ([#1432](https://github.com/diffplug/spotless/pull/1432)) fixes ([#1430](https://github.com/diffplug/spotless/issues/1430))
21+
### Changes
22+
* Bump default `ktlint` version to latest `0.47.1` -> `0.48.0` ([#1432](https://github.com/diffplug/spotless/pull/1432))
23+
* Bump default `ktfmt` version to latest `0.41` -> `0.42` ([#1421](https://github.com/diffplug/spotless/pull/1421))
24+
25+
## [2.31.0] - 2022-11-24
26+
### Added
27+
* `importOrder` now support groups of imports without blank lines ([#1401](https://github.com/diffplug/spotless/pull/1401))
28+
### Fixed
29+
* Don't treat `@Value` as a type annotation [#1367](https://github.com/diffplug/spotless/pull/1367)
30+
* Support `ktlint_disabled_rules` in `ktlint` 0.47.x [#1378](https://github.com/diffplug/spotless/pull/1378)
31+
* Share git repositories across projects when using ratchet ([#1426](https://github.com/diffplug/spotless/pull/1426))
32+
### Changes
33+
* Bump default `ktfmt` version to latest `0.40` -> `0.41` ([#1340](https://github.com/diffplug/spotless/pull/1340))
34+
* Bump default `scalafmt` version to latest `3.5.9` -> `3.6.1` ([#1373](https://github.com/diffplug/spotless/pull/1373))
35+
* Bump default `diktat` version to latest `1.2.3` -> `1.2.4.2` ([#1393](https://github.com/diffplug/spotless/pull/1393))
36+
* Bump default `palantir-java-format` version to latest `2.10` -> `2.28` ([#1393](https://github.com/diffplug/spotless/pull/1393))
1337

1438
## [2.30.0] - 2022-09-14
1539
### Added

‎CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ For the folders below in monospace text, they are published on maven central at
3636
| `lib-extra` | Contains the optional parts of Spotless which require external dependencies. `LineEnding.GIT_ATTRIBUTES` won't work unless `lib-extra` is available. |
3737
| `plugin-gradle` | Integrates spotless and all of its formatters into Gradle. |
3838
| `plugin-maven` | Integrates spotless and all of its formatters into Maven. |
39-
| _ext | Folder for generating glue jars (specifically packaging Eclipse jars from p2 for consumption using maven).
39+
| `_ext` | Folder for generating glue jars (specifically packaging Eclipse jars from p2 for consumption using maven).
4040

4141
## How to add a new FormatterStep
4242

@@ -119,7 +119,7 @@ There are many great formatters (prettier, clang-format, black, etc.) which live
119119

120120
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).
121121

122-
## How to enable the _ext projects
122+
## How to enable the `_ext` projects
123123

124124
The `_ext` projects are disabled per default, since:
125125

‎README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ lib('markdown.FreshMarkStep') +'{{yes}} | {{no}}
7171
lib('markdown.FlexmarkStep') +'{{no}} | {{yes}} | {{no}} | {{no}} |',
7272
lib('npm.PrettierFormatterStep') +'{{yes}} | {{yes}} | {{no}} | {{no}} |',
7373
lib('npm.TsFmtFormatterStep') +'{{yes}} | {{yes}} | {{no}} | {{no}} |',
74-
lib('pom.SortPomStepStep') +'{{no}} | {{yes}} | {{no}} | {{no}} |',
74+
lib('pom.SortPomStep') +'{{no}} | {{yes}} | {{no}} | {{no}} |',
7575
lib('python.BlackStep') +'{{yes}} | {{no}} | {{no}} | {{no}} |',
7676
lib('scala.ScalaFmtStep') +'{{yes}} | {{yes}} | {{yes}} | {{no}} |',
7777
lib('sql.DBeaverSQLFormatterStep') +'{{yes}} | {{yes}} | {{yes}} | {{no}} |',
@@ -115,7 +115,7 @@ extra('wtp.EclipseWtpFormatterStep') +'{{yes}} | {{yes}}
115115
| [`markdown.FlexmarkStep`](lib/src/main/java/com/diffplug/spotless/markdown/FlexmarkStep.java) | :white_large_square: | :+1: | :white_large_square: | :white_large_square: |
116116
| [`npm.PrettierFormatterStep`](lib/src/main/java/com/diffplug/spotless/npm/PrettierFormatterStep.java) | :+1: | :+1: | :white_large_square: | :white_large_square: |
117117
| [`npm.TsFmtFormatterStep`](lib/src/main/java/com/diffplug/spotless/npm/TsFmtFormatterStep.java) | :+1: | :+1: | :white_large_square: | :white_large_square: |
118-
| [`pom.SortPomStepStep`](lib/src/main/java/com/diffplug/spotless/pom/SortPomStepStep.java) | :white_large_square: | :+1: | :white_large_square: | :white_large_square: |
118+
| [`pom.SortPomStep`](lib/src/main/java/com/diffplug/spotless/pom/SortPomStep.java) | :white_large_square: | :+1: | :white_large_square: | :white_large_square: |
119119
| [`python.BlackStep`](lib/src/main/java/com/diffplug/spotless/python/BlackStep.java) | :+1: | :white_large_square: | :white_large_square: | :white_large_square: |
120120
| [`scala.ScalaFmtStep`](lib/src/main/java/com/diffplug/spotless/scala/ScalaFmtStep.java) | :+1: | :+1: | :+1: | :white_large_square: |
121121
| [`sql.DBeaverSQLFormatterStep`](lib/src/main/java/com/diffplug/spotless/sql/DBeaverSQLFormatterStep.java) | :+1: | :+1: | :+1: | :white_large_square: |

‎_ext/eclipse-cdt/CHANGES.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `9.9.0`).
44

55
## [Unreleased]
6+
### Fixed
7+
* Fix typo in gradle variable names ([#1425](https://github.com/diffplug/spotless/pull/1425))
68

79
## [10.5.0] - 2021-12-13
810
### Added

‎_ext/eclipse-cdt/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@ apply from: rootProject.file('gradle/java-publish.gradle')
1717

1818

1919
dependencies {
20-
implementation "com.diffplug.spotless:spotless-eclipse-base:${VER_SPOTLESS_ECLISPE_BASE}"
20+
implementation "com.diffplug.spotless:spotless-eclipse-base:${VER_SPOTLESS_ECLIPSE_BASE}"
2121
// Provides text partitioners for formatters
22-
implementation ("org.eclipse.platform:org.eclipse.jface.text:${VER_ECLISPE_JFACE}") {
22+
implementation ("org.eclipse.platform:org.eclipse.jface.text:${VER_ECLIPSE_JFACE}") {
2323
exclude group: 'org.eclipse.platform', module: 'org.eclipse.swt'
2424
}
2525
// Required to by CCorePlugin calling CDTLogWriter
2626
implementation "com.ibm.icu:icu4j:${VER_IBM_ICU}"
2727
// Required to by CCorePlugin calling PositionTrackerManager
28-
implementation "org.eclipse.platform:org.eclipse.core.filebuffers:${VER_ECLISPE_EFS}"
28+
implementation "org.eclipse.platform:org.eclipse.core.filebuffers:${VER_ECLIPSE_EFS}"
2929

3030
testImplementation("org.slf4j:slf4j-simple:${VER_SLF4J}")
3131
}

‎_ext/eclipse-cdt/gradle.properties

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ VER_JAVA=11
66

77
# Compile dependencies
88
VER_ECLIPSE_CDT=10.5
9-
VER_SPOTLESS_ECLISPE_BASE=[3.5.0,4.0.0[
10-
VER_ECLISPE_JFACE=[3.18.0,4.0.0[
11-
VER_ECLISPE_EFS=[3.7.0,4.0.0[
9+
VER_SPOTLESS_ECLIPSE_BASE=[3.5.0,4.0.0[
10+
VER_ECLIPSE_JFACE=[3.18.0,4.0.0[
11+
VER_ECLIPSE_EFS=[3.7.0,4.0.0[
1212
VER_IBM_ICU=[67.1,68[

‎_ext/eclipse-groovy/CHANGES.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.5.0`).
44

55
## [Unreleased]
6+
### Fixed
7+
* Fix typo in gradle variable names ([#1425](https://github.com/diffplug/spotless/pull/1425))
68

79
## [4.3.0] - 2021-10-13
810
### Added

‎_ext/eclipse-groovy/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ apply from: rootProject.file('_ext/gradle/p2-fat-jar-setup.gradle')
3939
apply from: rootProject.file('gradle/java-publish.gradle')
4040

4141
dependencies {
42-
implementation "com.diffplug.spotless:spotless-eclipse-base:${VER_SPOTLESS_ECLISPE_BASE}"
42+
implementation "com.diffplug.spotless:spotless-eclipse-base:${VER_SPOTLESS_ECLIPSE_BASE}"
4343
// Provides text partitioners for formatters
44-
implementation ("org.eclipse.platform:org.eclipse.jface.text:${VER_ECLISPE_JFACE}") {
44+
implementation ("org.eclipse.platform:org.eclipse.jface.text:${VER_ECLIPSE_JFACE}") {
4545
exclude group: 'org.eclipse.platform', module: 'org.eclipse.swt'
4646
}
4747
testImplementation("org.slf4j:slf4j-simple:${VER_SLF4J}")

‎_ext/eclipse-groovy/gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ VER_JAVA=11
66

77
# Compile
88
VER_ECLIPSE=4.21
9-
VER_SPOTLESS_ECLISPE_BASE=[3.4.2,4.0.0[
10-
VER_ECLISPE_JFACE=[3.15.300,4.0.0[
9+
VER_SPOTLESS_ECLIPSE_BASE=[3.4.2,4.0.0[
10+
VER_ECLIPSE_JFACE=[3.15.300,4.0.0[
1111
VER_GRECLIPSE=4.3.0
1212
VER_GROOVY=4.0.0
1313
# Use org.eclipse.jdt.core patched for Groovy-Eclipse

‎_ext/eclipse-jdt/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ext {
1010
}
1111

1212
dependencies {
13-
implementation "com.diffplug.spotless:spotless-eclipse-base:${VER_SPOTLESS_ECLISPE_BASE}"
13+
implementation "com.diffplug.spotless:spotless-eclipse-base:${VER_SPOTLESS_ECLIPSE_BASE}"
1414
implementation("org.eclipse.jdt:org.eclipse.jdt.core:${VER_ECLIPSE_JDT_CORE}") {
1515
exclude group: 'org.eclipse.platform', module: 'org.eclipse.ant.core'
1616
exclude group: 'org.eclipse.platform', module: 'org.eclipse.core.expressions'

0 commit comments

Comments
 (0)