Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updated diktat version to 1.2.1 #1251

Merged
merged 5 commits into from
Jun 30, 2022
Merged

Updated diktat version to 1.2.1 #1251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
502a8f0
Updated diktat version to 1.2.1
orchestr7 Jun 30, 2022
2b93b1b
Updated all version of diktat (including tests)
orchestr7 Jun 30, 2022
33911fb
Merge branch 'main' into main
orchestr7 Jun 30, 2022
5ae8360
Merge branch 'main' into main-akuleshov7
nedtwigg Jun 30, 2022
9dde3da
Update changes and a test.
nedtwigg Jun 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
* Bump default `ktlint` version to latest `0.45.2` -> `0.46.1` ([#1239](https://github.com/diffplug/spotless/issues/1239))
* Minimum supported version also bumped to `0.46.0` (we have abandoned strong backward compatibility for `ktlint`, from here on out Spotless will only support the most-recent breaking change).
* Bump default `diktat` version to latest `1.1.0` -> `1.2.1` ([#1246](https://github.com/diffplug/spotless/pull/1246))
* Minimum supported version also bumped to `1.2.0` (diktat is based on ktlint and has the same backward compatibility issues).
* Minimum supported version also bumped to `1.2.1` (diktat is based on ktlint and has the same backward compatibility issues).
* Bump default `ktfmt` version to latest `0.37` -> `0.39` ([#1240](https://github.com/diffplug/spotless/pull/1240))

## [2.26.2] - 2022-06-11
Expand Down
2 changes: 1 addition & 1 deletion lib/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ dependencies {
ktlintCompileOnly "com.pinterest.ktlint:ktlint-ruleset-experimental:$VER_KTLINT"
ktlintCompileOnly "com.pinterest.ktlint:ktlint-ruleset-standard:$VER_KTLINT"

String VER_DIKTAT = "1.2.0"
String VER_DIKTAT = "1.2.1"
diktatCompileOnly "org.cqfn.diktat:diktat-rules:$VER_DIKTAT"

// used for markdown formatting
Expand Down
4 changes: 2 additions & 2 deletions lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ public class DiktatStep {
// prevent direct instantiation
private DiktatStep() {}

private static final String MIN_SUPPORTED_VERSION = "1.2.0";
private static final String MIN_SUPPORTED_VERSION = "1.2.1";

private static final String DEFAULT_VERSION = "1.2.0";
private static final String DEFAULT_VERSION = "1.2.1";
static final String NAME = "diktat";
static final String PACKAGE_DIKTAT = "org.cqfn.diktat";
static final String MAVEN_COORDINATE = PACKAGE_DIKTAT + ":diktat-rules:";
Expand Down
2 changes: 1 addition & 1 deletion plugin-gradle/CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
* Bump default `ktlint` version to latest `0.45.2` -> `0.46.1` ([#1239](https://github.com/diffplug/spotless/issues/1239))
* Minimum supported version also bumped to `0.46.0` (we have abandoned strong backward compatibility for `ktlint`, from here on out Spotless will only support the most-recent breaking change).
* Bump default `diktat` version to latest `1.1.0` -> `1.2.1` ([#1246](https://github.com/diffplug/spotless/pull/1246))
* Minimum supported version also bumped to `1.2.0` (diktat is based on ktlint and has the same backward compatibility issues).
* Minimum supported version also bumped to `1.2.1` (diktat is based on ktlint and has the same backward compatibility issues).
* Bump default `ktfmt` version to latest `0.37` -> `0.39` ([#1240](https://github.com/diffplug/spotless/pull/1240))

## [6.7.2] - 2022-06-11
Expand Down
2 changes: 1 addition & 1 deletion plugin-maven/CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
* Bump default `ktlint` version to latest `0.45.2` -> `0.46.1` ([#1239](https://github.com/diffplug/spotless/issues/1239))
* Minimum supported version also bumped to `0.46.0` (we have abandoned strong backward compatibility for `ktlint`, from here on out Spotless will only support the most-recent breaking change).
* Bump default `diktat` version to latest `1.1.0` -> `1.2.1` ([#1246](https://github.com/diffplug/spotless/pull/1246))
* Minimum supported version also bumped to `1.2.0` (diktat is based on ktlint and has the same backward compatibility issues).
* Minimum supported version also bumped to `1.2.1` (diktat is based on ktlint and has the same backward compatibility issues).
* Bump default `ktfmt` version to latest `0.37` -> `0.39` ([#1240](https://github.com/diffplug/spotless/pull/1240))

## [2.22.8] - 2022-06-11
Expand Down
4 changes: 2 additions & 2 deletions plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/DiktatTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ void testDiktatWithVersion() throws Exception {

writePomWithKotlinSteps(
"<diktat>",
" <version>1.2.0</version>",
" <version>1.2.1</version>",
"</diktat>");

String path = "src/main/kotlin/Main.kt";
Expand All @@ -56,7 +56,7 @@ void testDiktatConfig() throws Exception {
File conf = setFile(configPath).toResource("kotlin/diktat/diktat-analysis.yml");
writePomWithKotlinSteps(
"<diktat>",
" <version>1.2.0</version>",
" <version>1.2.1</version>",
" <configFile>" + conf.getAbsolutePath() + "</configFile>",
"</diktat>");

Expand Down
4 changes: 2 additions & 2 deletions testlib/src/test/java/com/diffplug/spotless/kotlin/DiktatStepTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ void behaviorConf() throws Exception {
File conf = setFile(configPath).toResource("kotlin/diktat/diktat-analysis.yml");
FileSignature config = signAsList(conf);

FormatterStep step = DiktatStep.create("1.2.0", TestProvisioner.mavenCentral(), config);
FormatterStep step = DiktatStep.create("1.2.1", TestProvisioner.mavenCentral(), config);
StepHarness.forStep(step)
.testResourceException("kotlin/diktat/Unsolvable.kt", assertion -> {
assertion.isInstanceOf(AssertionError.class);
Expand All @@ -75,7 +75,7 @@ void notSupportedVersion() {
final IllegalStateException notSupportedException = Assertions.assertThrows(IllegalStateException.class,
() -> DiktatStep.create("1.1.0", TestProvisioner.mavenCentral()));
Assertions.assertTrue(
notSupportedException.getMessage().contains("Minimum required Diktat version is 1.2.0, you tried 1.1.0 which is too old"));
notSupportedException.getMessage().contains("Minimum required Diktat version is 1.2.1, you tried 1.1.0 which is too old"));

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