Skip to content

Commit 3022df7

Browse files
committed
Bump diktat down to latest published version, 1.2.0
1 parent e3e0beb commit 3022df7

File tree

5 files changed

+11
-11
lines changed

5 files changed

+11
-11
lines changed

CHANGES.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
1313
### Added
1414
* Support for `MAC_CLASSIC` (`\r`) line ending ([#1243](https://github.com/diffplug/spotless/pull/1243) fixes [#1196](https://github.com/diffplug/spotless/issues/1196))
1515
### Changed
16-
* Minimum required `diktat` version bumped to `1.2.1` ([#1246](https://github.com/diffplug/spotless/pull/1246))
17-
* Default bumped from `1.1.0` -> `1.2.1`
16+
* Minimum required `diktat` version bumped to `1.2.0` ([#1246](https://github.com/diffplug/spotless/pull/1246))
17+
* Default bumped from `1.1.0` -> `1.2.0`
1818

1919
## [2.26.2] - 2022-06-11
2020
### Fixed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ public class DiktatStep {
3030
// prevent direct instantiation
3131
private DiktatStep() {}
3232

33-
private static final String MIN_SUPPORTED_VERSION = "1.2.1";
33+
private static final String MIN_SUPPORTED_VERSION = "1.2.0";
3434

35-
private static final String DEFAULT_VERSION = "1.2.1";
35+
private static final String DEFAULT_VERSION = "1.2.0";
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:";

plugin-gradle/CHANGES.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
66
### Added
77
* Support for `MAC_CLASSIC` (`\r`) line ending ([#1243](https://github.com/diffplug/spotless/pull/1243) fixes [#1196](https://github.com/diffplug/spotless/issues/1196))
88
### Changed
9-
* Minimum required `diktat` version bumped to `1.2.1` ([#1246](https://github.com/diffplug/spotless/pull/1246))
10-
* Default bumped from `1.1.0` -> `1.2.1`
9+
* Minimum required `diktat` version bumped to `1.2.0` ([#1246](https://github.com/diffplug/spotless/pull/1246))
10+
* Default bumped from `1.1.0` -> `1.2.0`
1111

1212
## [6.7.2] - 2022-06-11
1313
### Fixed

plugin-maven/CHANGES.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
66
### Added
77
* Support for `MAC_CLASSIC` (`\r`) line ending ([#1243](https://github.com/diffplug/spotless/pull/1243) fixes [#1196](https://github.com/diffplug/spotless/issues/1196))
88
### Changed
9-
* Minimum required `diktat` version bumped to `1.2.1` ([#1246](https://github.com/diffplug/spotless/pull/1246))
10-
* Default bumped from `1.1.0` -> `1.2.1`
9+
* Minimum required `diktat` version bumped to `1.2.0` ([#1246](https://github.com/diffplug/spotless/pull/1246))
10+
* Default bumped from `1.1.0` -> `1.2.0`
1111

1212
## [2.22.8] - 2022-06-11
1313
### Fixed

testlib/src/test/java/com/diffplug/spotless/kotlin/DiktatStepTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ void behaviorConf() throws Exception {
5454
File conf = setFile(configPath).toResource("kotlin/diktat/diktat-analysis.yml");
5555
FileSignature config = signAsList(conf);
5656

57-
FormatterStep step = DiktatStep.create("1.2.1", TestProvisioner.mavenCentral(), config);
57+
FormatterStep step = DiktatStep.create("1.2.0", TestProvisioner.mavenCentral(), config);
5858
StepHarness.forStep(step)
5959
.testResourceException("kotlin/diktat/Unsolvable.kt", assertion -> {
6060
assertion.isInstanceOf(AssertionError.class);
@@ -73,9 +73,9 @@ void behaviorConf() throws Exception {
7373
@Test
7474
void notSupportedVersion() {
7575
final IllegalStateException notSupportedException = Assertions.assertThrows(IllegalStateException.class,
76-
() -> DiktatStep.create("1.2.0", TestProvisioner.mavenCentral()));
76+
() -> DiktatStep.create("1.1.0", TestProvisioner.mavenCentral()));
7777
Assertions.assertTrue(
78-
notSupportedException.getMessage().contains("Diktat supported for version 1.2.1 and later"));
78+
notSupportedException.getMessage().contains("Minimum required Diktat version is 1.2.0, you tried 1.1.0 which is too old"));
7979

8080
Assertions.assertDoesNotThrow(() -> DiktatStep.create("1.2.1", TestProvisioner.mavenCentral()));
8181
Assertions.assertDoesNotThrow(() -> DiktatStep.create("2.0.0", TestProvisioner.mavenCentral()));

0 commit comments

Comments
 (0)