Skip to content

Commit 14c4a8b

Browse files
nedtwiggnedtwigg
committed
Merge branch 'renovate/ver_scalafmt' into renovate/ver_cleanthat
2 parents aea5e41 + 25571ab commit 14c4a8b

File tree

9 files changed

+36
-18
lines changed

9 files changed

+36
-18
lines changed

‎CHANGES.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,11 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
1616
* Added formatter for Gherkin feature files ([#1649](https://github.com/diffplug/spotless/issues/1649)).
1717
### Changes
1818
* **POTENTIALLY BREAKING** Converted `googleJavaFormat` to a compile-only dependency and drop support for versions < `1.8`. ([#1630](https://github.com/diffplug/spotless/pull/1630))
19+
* Bump default `cleanthat` version to latest `2.6` -> `2.8`. ([#1589](https://github.com/diffplug/spotless/pull/1589)
20+
* Bump default `diktat` version `1.2.4.2` -> `1.2.5`. ([#1631](https://github.com/diffplug/spotless/pull/1631))
21+
* Bump default `flexmark` version `0.62.2` -> `0.64.0`. ([#1302](https://github.com/diffplug/spotless/pull/1302))
1922
* Bump default `googleJavaFormat` version `1.15.0` -> `1.16.0`. ([#1630](https://github.com/diffplug/spotless/pull/1630))
23+
* Bump default `scalafmt` version `3.7.1` -> `3.7.3`. ([#1584](https://github.com/diffplug/spotless/pull/1584))
2024

2125
## [2.37.0] - 2023-03-13
2226
### Added

‎lib/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,14 +103,14 @@ dependencies {
103103
compatKtLint0Dot48Dot0CompileAndTestOnly 'com.pinterest.ktlint:ktlint-ruleset-experimental:0.48.0'
104104
compatKtLint0Dot48Dot0CompileAndTestOnly 'com.pinterest.ktlint:ktlint-ruleset-standard:0.48.0'
105105

106-
String VER_SCALAFMT="3.7.1"
106+
String VER_SCALAFMT="3.7.3"
107107
scalafmtCompileOnly "org.scalameta:scalafmt-core_2.13:$VER_SCALAFMT"
108108

109-
String VER_DIKTAT = "1.2.4.2"
109+
String VER_DIKTAT = "1.2.5"
110110
diktatCompileOnly "org.cqfn.diktat:diktat-rules:$VER_DIKTAT"
111111

112112
// used for markdown formatting
113-
flexmarkCompileOnly 'com.vladsch.flexmark:flexmark-all:0.62.2'
113+
flexmarkCompileOnly 'com.vladsch.flexmark:flexmark-all:0.64.0'
114114

115115
gsonCompileOnly 'com.google.code.gson:gson:2.10.1'
116116

‎lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2021-2022 DiffPlug
2+
* Copyright 2021-2023 DiffPlug
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -32,7 +32,7 @@ private DiktatStep() {}
3232

3333
private static final String MIN_SUPPORTED_VERSION = "1.2.1";
3434

35-
private static final String DEFAULT_VERSION = "1.2.4.2";
35+
private static final String DEFAULT_VERSION = "1.2.5";
3636
static final String NAME = "diktat";
3737
static final String PACKAGE_DIKTAT = "org.cqfn.diktat";
3838
static final String MAVEN_COORDINATE = PACKAGE_DIKTAT + ":diktat-rules:";

‎lib/src/main/java/com/diffplug/spotless/markdown/FlexmarkStep.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2016-2021 DiffPlug
2+
* Copyright 2016-2023 DiffPlug
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -29,7 +29,7 @@ public class FlexmarkStep {
2929
// prevent direct instantiation
3030
private FlexmarkStep() {}
3131

32-
private static final String DEFAULT_VERSION = "0.62.2";
32+
private static final String DEFAULT_VERSION = "0.64.0";
3333
private static final String NAME = "flexmark-java";
3434
private static final String MAVEN_COORDINATE = "com.vladsch.flexmark:flexmark-all:";
3535

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public class ScalaFmtStep {
3434
// prevent direct instantiation
3535
private ScalaFmtStep() {}
3636

37-
static final String DEFAULT_VERSION = "3.7.1";
37+
static final String DEFAULT_VERSION = "3.7.3";
3838

3939
private static final String DEFAULT_SCALA_MAJOR_VERSION = "2.13";
4040
static final String NAME = "scalafmt";

‎plugin-gradle/CHANGES.md

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
55
## [Unreleased]
66
### Added
77
* `removeUnusedImport` can be configured to rely on `cleanthat-javaparser-unnecessaryimport`. Default remains `google-java-format`. ([#1589](https://github.com/diffplug/spotless/pull/1589))
8-
### Changes
9-
* Bump default `cleanthat` version to latest `2.6` -> `2.8`. ([#1589](https://github.com/diffplug/spotless/pull/1589)
8+
* Added formatter for Gherkin feature files ([#1649](https://github.com/diffplug/spotless/issues/1649)).
109
* Support configuration of mirrors for P2 repositories ([#1629](https://github.com/diffplug/spotless/issues/1629)):
1110
```
1211
spotless {
@@ -18,12 +17,15 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
1817
Mirrors are selected by prefix match, for example `https://download.eclipse.org/eclipse/updates/4.26/` will be redirected to `https://some.internal.mirror/eclipse/eclipse/updates/4.26/`.
1918
The same configuration exists for `greclipse` and `eclipseCdt`.
2019
* The `style` option in Palantir Java Format ([#1654](https://github.com/diffplug/spotless/pull/1654)).
21-
* Added support for Gherkin feature files ([#1649](https://github.com/diffplug/spotless/issues/1649)).
20+
### Fixed
21+
* Stop using deprecated conventions when used in Gradle >= `7.1`. ([#1618](https://github.com/diffplug/spotless/pull/1618))
2222
### Changes
2323
* **POTENTIALLY BREAKING** Drop support for `googleJavaFormat` versions < `1.8`. ([#1630](https://github.com/diffplug/spotless/pull/1630))
24+
* Bump default `cleanthat` version to latest `2.6` -> `2.8`. ([#1589](https://github.com/diffplug/spotless/pull/1589)
25+
* Bump default `diktat` version `1.2.4.2` -> `1.2.5`. ([#1631](https://github.com/diffplug/spotless/pull/1631))
26+
* Bump default `flexmark` version `0.62.2` -> `0.64.0`. ([#1302](https://github.com/diffplug/spotless/pull/1302))
2427
* Bump default `googleJavaFormat` version `1.15.0` -> `1.16.0`. ([#1630](https://github.com/diffplug/spotless/pull/1630))
25-
### Fixed
26-
* Stop using deprecated conventions when used in Gradle >= `7.1`. ([#1618](https://github.com/diffplug/spotless/pull/1618))
28+
* Bump default `scalafmt` version `3.7.1` -> `3.7.3`. ([#1584](https://github.com/diffplug/spotless/pull/1584))
2729

2830
## [6.17.0] - 2023-03-13
2931
### Added

‎plugin-maven/CHANGES.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,16 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
66
### Added
77
* `removeUnusedImport` can be configured to rely on `cleanthat-javaparser-unnecessaryimport`. Default remains `google-java-format`. ([#1589](https://github.com/diffplug/spotless/pull/1589))
88
* The `style` option in Palantir Java Format ([#1654](https://github.com/diffplug/spotless/pull/1654)).
9-
* Added support for Gherkin feature files ([#1649](https://github.com/diffplug/spotless/issues/1649)).
9+
* Added formatter for Gherkin feature files ([#1649](https://github.com/diffplug/spotless/issues/1649)).
1010
### Fixed
1111
* Fix non deterministic computation of cache fingerprint when using multiple formatters. ([#1643](https://github.com/diffplug/spotless/pull/1643) fixes [#1642](https://github.com/diffplug/spotless/pull/1642))
1212
### Changes
13-
* Bump default `cleanthat` version to latest `2.6` -> `2.8`. ([#1589](https://github.com/diffplug/spotless/pull/1589)
1413
* **POTENTIALLY BREAKING** Drop support for `googleJavaFormat` versions < `1.8`. ([#1630](https://github.com/diffplug/spotless/pull/1630))
14+
* Bump default `cleanthat` version to latest `2.6` -> `2.8`. ([#1589](https://github.com/diffplug/spotless/pull/1589)
15+
* Bump default `diktat` version `1.2.4.2` -> `1.2.5`. ([#1631](https://github.com/diffplug/spotless/pull/1631))
16+
* Bump default `flexmark` version `0.62.2` -> `0.64.0`. ([#1302](https://github.com/diffplug/spotless/pull/1302))
1517
* Bump default `googleJavaFormat` version `1.15.0` -> `1.16.0`. ([#1630](https://github.com/diffplug/spotless/pull/1630))
18+
* Bump default `scalafmt` version `3.7.1` -> `3.7.3`. ([#1584](https://github.com/diffplug/spotless/pull/1584))
1619

1720
## [2.35.0] - 2023-03-13
1821
### Added

‎testlib/src/main/resources/scala/scalafmt/scalafmt.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version = 3.7.1
1+
version = 3.7.3
22
runner.dialect = scala213
33
style = defaultWithAlign # For pretty alignment.
44
maxColumn = 20 # For my teensy narrow display

‎testlib/src/test/java/com/diffplug/spotless/markdown/FlexmarkStepTest.java

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2016-2021 DiffPlug
2+
* Copyright 2016-2023 DiffPlug
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -21,9 +21,18 @@
2121
import com.diffplug.spotless.TestProvisioner;
2222

2323
class FlexmarkStepTest {
24+
private static final String oldestSupported = "0.62.2";
2425

2526
@Test
26-
void behavior() throws Exception {
27+
void behaviorOldest() {
28+
StepHarness.forStep(FlexmarkStep.create(oldestSupported, TestProvisioner.mavenCentral()))
29+
.testResource(
30+
"markdown/flexmark/FlexmarkUnformatted.md",
31+
"markdown/flexmark/FlexmarkFormatted.md");
32+
}
33+
34+
@Test
35+
void behaviorLatest() {
2736
StepHarness.forStep(FlexmarkStep.create(TestProvisioner.mavenCentral()))
2837
.testResource(
2938
"markdown/flexmark/FlexmarkUnformatted.md",

0 commit comments

Comments
 (0)