Skip to content

Commit fb4277d

Browse files
committed
Merge branch 'main-ktlint-0.48.0' into renovate/ver_ktfmt
2 parents 99272b2 + b44d70d commit fb4277d

File tree

28 files changed

+276
-75
lines changed

28 files changed

+276
-75
lines changed

CHANGES.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,19 @@ 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+
### Fixed
14+
* Improve memory usage when using git ratchet ([#1426](https://github.com/diffplug/spotless/pull/1426))
15+
* Support `ktlint` 0.48+ ([#1432](https://github.com/diffplug/spotless/pull/1432)) fixes ([#1430](https://github.com/diffplug/spotless/issues/1430))
16+
### Changes
17+
* Bump default `ktlint` version to latest `0.47.1` -> `0.48.0` ([#1432](https://github.com/diffplug/spotless/pull/1432))
1318

1419
## [2.31.0] - 2022-11-24
1520
### Added
1621
* `importOrder` now support groups of imports without blank lines ([#1401](https://github.com/diffplug/spotless/pull/1401))
1722
### Fixed
1823
* Don't treat `@Value` as a type annotation [#1367](https://github.com/diffplug/spotless/pull/1367)
1924
* Support `ktlint_disabled_rules` in `ktlint` 0.47.x [#1378](https://github.com/diffplug/spotless/pull/1378)
25+
* Share git repositories across projects when using ratchet ([#1426](https://github.com/diffplug/spotless/pull/1426))
2026
### Changes
2127
* Bump default `ktfmt` version to latest `0.40` -> `0.41` ([#1340](https://github.com/diffplug/spotless/pull/1340))
2228
* Bump default `scalafmt` version to latest `3.5.9` -> `3.6.1` ([#1373](https://github.com/diffplug/spotless/pull/1373))

_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'

_ext/eclipse-jdt/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ VER_JAVA=11
66

77
# Compile
88
VER_ECLIPSE_JDT_CORE=[3.13.0,4.0.0[
9-
VER_SPOTLESS_ECLISPE_BASE=[3.5.0,4.0.0[
9+
VER_SPOTLESS_ECLIPSE_BASE=[3.5.0,4.0.0[

_ext/eclipse-wtp/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.15.1`).
44

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

79
## [3.23.0] - 2021-09-22
810
### Added

0 commit comments

Comments
 (0)