Skip to content

Commit d491901

Browse files
authored
Bump default formatter versions to latest available (#989)
2 parents 87f24b7 + 13165ce commit d491901

File tree

7 files changed

+21
-4
lines changed

7 files changed

+21
-4
lines changed

CHANGES.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,12 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
1414
* `DiffMessageFormatter` can now generate messages based on a folder of cleaned files, as an alternative to a `Formatter` ([#982](https://github.com/diffplug/spotless/pull/982)).
1515
### Fixed
1616
* Fix CI and various spotbugs nits ([#988](https://github.com/diffplug/spotless/pull/988)).
17+
### Changed
18+
* Bump default formatter versions ([#989](https://github.com/diffplug/spotless/pull/989))
19+
* google-java-format `1.11.0` -> `1.12.0`
20+
* ktlint `0.42.1` -> `0.43.0`
21+
* ktfmt `0.27` -> `0.29`
22+
* scalafmt `3.0.0` -> `3.0.8`
1723

1824
## [2.19.2] - 2021-10-26
1925
### Changed

lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public static FormatterStep create(String groupArtifact, String version, String
9393
State::createFormat);
9494
}
9595

96-
static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(8, "1.7").add(11, "1.11.0");
96+
static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(8, "1.7").add(11, "1.12.0");
9797

9898
public static String defaultGroupArtifact() {
9999
return MAVEN_COORDINATE;

lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public class KtLintStep {
3737
// prevent direct instantiation
3838
private KtLintStep() {}
3939

40-
private static final String DEFAULT_VERSION = "0.42.1";
40+
private static final String DEFAULT_VERSION = "0.43.0";
4141
static final String NAME = "ktlint";
4242
static final String PACKAGE_PRE_0_32 = "com.github.shyiko";
4343
static final String PACKAGE = "com.pinterest";

lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public class KtfmtStep {
3232
// prevent direct instantiation
3333
private KtfmtStep() {}
3434

35-
private static final String DEFAULT_VERSION = "0.27";
35+
private static final String DEFAULT_VERSION = "0.29";
3636
static final String NAME = "ktfmt";
3737
static final String PACKAGE = "com.facebook";
3838
static final String MAVEN_COORDINATE = PACKAGE + ":ktfmt:";

lib/src/main/java/com/diffplug/spotless/scala/ScalaFmtStep.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ private ScalaFmtStep() {}
4141

4242
private static final Pattern VERSION_PRE_2_0 = Pattern.compile("[10]\\.(\\d+)\\.\\d+");
4343
private static final Pattern VERSION_PRE_3_0 = Pattern.compile("2\\.(\\d+)\\.\\d+");
44-
private static final String DEFAULT_VERSION = "3.0.0";
44+
private static final String DEFAULT_VERSION = "3.0.8";
4545
static final String NAME = "scalafmt";
4646
static final String MAVEN_COORDINATE_PRE_2_0 = "com.geirsson:scalafmt-core_2.11:";
4747
static final String MAVEN_COORDINATE_PRE_3_0 = "org.scalameta:scalafmt-core_2.11:";

plugin-gradle/CHANGES.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,11 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
1616
* If you prefer the old behavior, we are open to adding that back as a new feature, see [#984 predeclared dependencies](https://github.com/diffplug/spotless/issues/984).
1717
* **BREAKING** `createIndepentApplyTask(String taskName)` now requires that `taskName` does not end with `Apply`
1818
* Bump minimum required Gradle from `6.1` to `6.1.1`.
19+
* Bump default formatter versions ([#989](https://github.com/diffplug/spotless/pull/989))
20+
* google-java-format `1.11.0` -> `1.12.0`
21+
* ktlint `0.42.1` -> `0.43.0`
22+
* ktfmt `0.27` -> `0.29`
23+
* scalafmt `3.0.0` -> `3.0.8`
1924
2025
### Removed
2126
* **BREAKING** `removeFormat` (which has been broken since `5.0`) has been removed. Use `clearSteps()` as a workaround ([#653](https://github.com/diffplug/spotless/issues/653)).

plugin-maven/CHANGES.md

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

55
## [Unreleased]
6+
### Changed
7+
* Bump default formatter versions ([#989](https://github.com/diffplug/spotless/pull/989))
8+
* google-java-format `1.11.0` -> `1.12.0`
9+
* ktlint `0.42.1` -> `0.43.0`
10+
* ktfmt `0.27` -> `0.29`
11+
* scalafmt `3.0.0` -> `3.0.8`
612

713
## [2.17.3] - 2021-10-26
814
### Changed

0 commit comments

Comments
 (0)