From 19932b633f49993f63c7af5fac9d2fd4f73860a7 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 16 Feb 2021 12:22:42 +0300 Subject: [PATCH] Prepare next development iteration after release 0.4.1 (#777) --- README.md | 12 ++++----- diktat-common/pom.xml | 2 +- .../gradle-plugin-marker/pom.xml | 2 +- diktat-gradle-plugin/pom.xml | 2 +- diktat-maven-plugin/pom.xml | 2 +- diktat-rules/pom.xml | 2 +- diktat-ruleset/pom.xml | 2 +- diktat-test-framework/pom.xml | 2 +- examples/gradle-groovy-dsl/build.gradle | 2 +- .../gradle-groovy-dsl/diktat-analysis.yml | 27 +++++++++++++++++-- examples/gradle-kotlin-dsl/build.gradle.kts | 2 +- .../gradle-kotlin-dsl/diktat-analysis.yml | 27 +++++++++++++++++-- examples/maven/diktat-analysis.yml | 27 +++++++++++++++++-- examples/maven/pom.xml | 2 +- info/buildSrc/gradle.properties | 2 +- pom.xml | 4 +-- 16 files changed, 94 insertions(+), 25 deletions(-) diff --git a/README.md b/README.md index 0cc29e5a45..cd2a86aeab 100644 --- a/README.md +++ b/README.md @@ -55,11 +55,11 @@ Main features of diktat are the following: # another option is "brew install ktlint" ``` -2. Load diKTat manually: [here](https://github.com/cqfn/diKTat/releases/download/v0.4.0/diktat.jar) +2. Load diKTat manually: [here](https://github.com/cqfn/diKTat/releases/download/v0.4.1/diktat.jar) **OR** use curl: ```bash - $ curl -sSLO https://github.com/cqfn/diKTat/releases/download/v0.4.0/diktat-0.4.0.jar + $ curl -sSLO https://github.com/cqfn/diKTat/releases/download/v0.4.1/diktat-0.4.1.jar ``` 3. Finally, run KTlint (with diKTat injected) to check your `*.kt` files in `dir/your/dir`: @@ -110,7 +110,7 @@ This plugin is available since version 0.1.5. You can see how the plugin is conf Add this plugin to your `build.gradle.kts`: ```kotlin plugins { - id("org.cqfn.diktat.diktat-gradle-plugin") version "0.4.0" + id("org.cqfn.diktat.diktat-gradle-plugin") version "0.4.1" } ``` @@ -121,7 +121,7 @@ buildscript { mavenCentral() } dependencies { - classpath("org.cqfn.diktat:diktat-gradle-plugin:0.4.0") + classpath("org.cqfn.diktat:diktat-gradle-plugin:0.4.1") } } @@ -194,7 +194,7 @@ spotless { ```kotlin spotless { kotlin { - diktat("0.4.0").configFile("full/path/to/diktat-analysis.yml") + diktat("0.4.1").configFile("full/path/to/diktat-analysis.yml") } } ``` @@ -225,7 +225,7 @@ Diktat can be run via spotless-maven-plugin since version 2.8.0 ```xml - 0.4.0 + 0.4.1 full/path/to/diktat-analysis.yml ``` diff --git a/diktat-common/pom.xml b/diktat-common/pom.xml index 9414be5f08..9b04e5ef93 100644 --- a/diktat-common/pom.xml +++ b/diktat-common/pom.xml @@ -9,7 +9,7 @@ org.cqfn.diktat diktat-parent - 0.4.1-SNAPSHOT + 0.4.2-SNAPSHOT diff --git a/diktat-gradle-plugin/gradle-plugin-marker/pom.xml b/diktat-gradle-plugin/gradle-plugin-marker/pom.xml index 15d3e32309..b9b5e582d0 100644 --- a/diktat-gradle-plugin/gradle-plugin-marker/pom.xml +++ b/diktat-gradle-plugin/gradle-plugin-marker/pom.xml @@ -4,7 +4,7 @@ diktat-gradle-plugin org.cqfn.diktat - 0.4.1-SNAPSHOT + 0.4.2-SNAPSHOT 4.0.0 diff --git a/diktat-gradle-plugin/pom.xml b/diktat-gradle-plugin/pom.xml index d49c4baff5..e9983588c9 100644 --- a/diktat-gradle-plugin/pom.xml +++ b/diktat-gradle-plugin/pom.xml @@ -5,7 +5,7 @@ diktat-parent org.cqfn.diktat - 0.4.1-SNAPSHOT + 0.4.2-SNAPSHOT 4.0.0 diff --git a/diktat-maven-plugin/pom.xml b/diktat-maven-plugin/pom.xml index e97937871a..0955003110 100644 --- a/diktat-maven-plugin/pom.xml +++ b/diktat-maven-plugin/pom.xml @@ -5,7 +5,7 @@ diktat-parent org.cqfn.diktat - 0.4.1-SNAPSHOT + 0.4.2-SNAPSHOT 4.0.0 diff --git a/diktat-rules/pom.xml b/diktat-rules/pom.xml index 92df63b1a1..2cbed95e35 100644 --- a/diktat-rules/pom.xml +++ b/diktat-rules/pom.xml @@ -9,7 +9,7 @@ org.cqfn.diktat diktat-parent - 0.4.1-SNAPSHOT + 0.4.2-SNAPSHOT diff --git a/diktat-ruleset/pom.xml b/diktat-ruleset/pom.xml index 8371dab3e9..31a217836e 100644 --- a/diktat-ruleset/pom.xml +++ b/diktat-ruleset/pom.xml @@ -8,7 +8,7 @@ org.cqfn.diktat diktat-parent - 0.4.1-SNAPSHOT + 0.4.2-SNAPSHOT diff --git a/diktat-test-framework/pom.xml b/diktat-test-framework/pom.xml index db08a1688c..a2d6ed6eee 100644 --- a/diktat-test-framework/pom.xml +++ b/diktat-test-framework/pom.xml @@ -9,7 +9,7 @@ org.cqfn.diktat diktat-parent - 0.4.1-SNAPSHOT + 0.4.2-SNAPSHOT diff --git a/examples/gradle-groovy-dsl/build.gradle b/examples/gradle-groovy-dsl/build.gradle index 21aac07a0b..c4320514b1 100644 --- a/examples/gradle-groovy-dsl/build.gradle +++ b/examples/gradle-groovy-dsl/build.gradle @@ -1,5 +1,5 @@ plugins { - id "org.cqfn.diktat.diktat-gradle-plugin" version "0.4.0" + id "org.cqfn.diktat.diktat-gradle-plugin" version "0.4.1" } repositories { diff --git a/examples/gradle-groovy-dsl/diktat-analysis.yml b/examples/gradle-groovy-dsl/diktat-analysis.yml index 674e425011..774694e8ab 100644 --- a/examples/gradle-groovy-dsl/diktat-analysis.yml +++ b/examples/gradle-groovy-dsl/diktat-analysis.yml @@ -5,7 +5,7 @@ domainName: your.name.here testDirs: test disabledChapters: "" - kotlinVersion: "1.4.21" + kotlinVersion: 1.4 # Checks that the Class/Enum/Interface name does not match Pascal case - name: CLASS_NAME_INCORRECT enabled: true @@ -181,6 +181,9 @@ # Checks that properties with comments are separated by a blank line - name: BLANK_LINE_BETWEEN_PROPERTIES enabled: true +# Checks top level order +- name: TOP_LEVEL_ORDER + enabled: true # Checks that non-empty code blocks with braces follow the K&R style (1TBS or OTBS style) - name: BRACES_BLOCK_STRUCTURE_ERROR enabled: true @@ -227,7 +230,27 @@ # If the number of parameters on one line is more than this threshold, all parameters will be placed on separate lines. maxParametersInOneLine: 2 # 3 by default. - # maxCallsInOneLine: 3 + maxCallsInOneLine: 3 +# Checks trailing comma +- name: TRAILING_COMMA + enabled: true + configuration: + # VALUE_ARGUMENT + valueArgument: false + # VALUE_PARAMETER + valueParameter: false + # REFERENCE_EXPRESSION + indices: false + # WHEN_CONDITION_WITH_EXPRESSION + whenConditions: false + # STRING_TEMPLATE + collectionLiteral: false + # TYPE_PROJECTION + typeArgument: false + # TYPE_PARAMETER + typeParameter: false + # DESTRUCTURING_DECLARATION_ENTRY + destructuringDeclaration: false # Checks that there are not too many consecutive spaces in line - name: TOO_MANY_CONSECUTIVE_SPACES enabled: true diff --git a/examples/gradle-kotlin-dsl/build.gradle.kts b/examples/gradle-kotlin-dsl/build.gradle.kts index cc06a19bdc..517653b8e5 100644 --- a/examples/gradle-kotlin-dsl/build.gradle.kts +++ b/examples/gradle-kotlin-dsl/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("org.cqfn.diktat.diktat-gradle-plugin") version "0.4.0" + id("org.cqfn.diktat.diktat-gradle-plugin") version "0.4.1" } repositories { diff --git a/examples/gradle-kotlin-dsl/diktat-analysis.yml b/examples/gradle-kotlin-dsl/diktat-analysis.yml index 674e425011..774694e8ab 100644 --- a/examples/gradle-kotlin-dsl/diktat-analysis.yml +++ b/examples/gradle-kotlin-dsl/diktat-analysis.yml @@ -5,7 +5,7 @@ domainName: your.name.here testDirs: test disabledChapters: "" - kotlinVersion: "1.4.21" + kotlinVersion: 1.4 # Checks that the Class/Enum/Interface name does not match Pascal case - name: CLASS_NAME_INCORRECT enabled: true @@ -181,6 +181,9 @@ # Checks that properties with comments are separated by a blank line - name: BLANK_LINE_BETWEEN_PROPERTIES enabled: true +# Checks top level order +- name: TOP_LEVEL_ORDER + enabled: true # Checks that non-empty code blocks with braces follow the K&R style (1TBS or OTBS style) - name: BRACES_BLOCK_STRUCTURE_ERROR enabled: true @@ -227,7 +230,27 @@ # If the number of parameters on one line is more than this threshold, all parameters will be placed on separate lines. maxParametersInOneLine: 2 # 3 by default. - # maxCallsInOneLine: 3 + maxCallsInOneLine: 3 +# Checks trailing comma +- name: TRAILING_COMMA + enabled: true + configuration: + # VALUE_ARGUMENT + valueArgument: false + # VALUE_PARAMETER + valueParameter: false + # REFERENCE_EXPRESSION + indices: false + # WHEN_CONDITION_WITH_EXPRESSION + whenConditions: false + # STRING_TEMPLATE + collectionLiteral: false + # TYPE_PROJECTION + typeArgument: false + # TYPE_PARAMETER + typeParameter: false + # DESTRUCTURING_DECLARATION_ENTRY + destructuringDeclaration: false # Checks that there are not too many consecutive spaces in line - name: TOO_MANY_CONSECUTIVE_SPACES enabled: true diff --git a/examples/maven/diktat-analysis.yml b/examples/maven/diktat-analysis.yml index 674e425011..774694e8ab 100644 --- a/examples/maven/diktat-analysis.yml +++ b/examples/maven/diktat-analysis.yml @@ -5,7 +5,7 @@ domainName: your.name.here testDirs: test disabledChapters: "" - kotlinVersion: "1.4.21" + kotlinVersion: 1.4 # Checks that the Class/Enum/Interface name does not match Pascal case - name: CLASS_NAME_INCORRECT enabled: true @@ -181,6 +181,9 @@ # Checks that properties with comments are separated by a blank line - name: BLANK_LINE_BETWEEN_PROPERTIES enabled: true +# Checks top level order +- name: TOP_LEVEL_ORDER + enabled: true # Checks that non-empty code blocks with braces follow the K&R style (1TBS or OTBS style) - name: BRACES_BLOCK_STRUCTURE_ERROR enabled: true @@ -227,7 +230,27 @@ # If the number of parameters on one line is more than this threshold, all parameters will be placed on separate lines. maxParametersInOneLine: 2 # 3 by default. - # maxCallsInOneLine: 3 + maxCallsInOneLine: 3 +# Checks trailing comma +- name: TRAILING_COMMA + enabled: true + configuration: + # VALUE_ARGUMENT + valueArgument: false + # VALUE_PARAMETER + valueParameter: false + # REFERENCE_EXPRESSION + indices: false + # WHEN_CONDITION_WITH_EXPRESSION + whenConditions: false + # STRING_TEMPLATE + collectionLiteral: false + # TYPE_PROJECTION + typeArgument: false + # TYPE_PARAMETER + typeParameter: false + # DESTRUCTURING_DECLARATION_ENTRY + destructuringDeclaration: false # Checks that there are not too many consecutive spaces in line - name: TOO_MANY_CONSECUTIVE_SPACES enabled: true diff --git a/examples/maven/pom.xml b/examples/maven/pom.xml index 0d11061f0a..89787a9af8 100644 --- a/examples/maven/pom.xml +++ b/examples/maven/pom.xml @@ -8,7 +8,7 @@ 1.0.0-SNAPSHOT - 0.4.0 + 0.4.1 diff --git a/info/buildSrc/gradle.properties b/info/buildSrc/gradle.properties index 1fc893775d..78f1d61359 100644 --- a/info/buildSrc/gradle.properties +++ b/info/buildSrc/gradle.properties @@ -1 +1 @@ -version=0.4.1-SNAPSHOT +version=0.4.2-SNAPSHOT diff --git a/pom.xml b/pom.xml index e053dfbbd4..d91794194c 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.cqfn.diktat diktat-parent - 0.4.1-SNAPSHOT + 0.4.2-SNAPSHOT pom diktat @@ -50,7 +50,7 @@ 30.0-jre 1.7.30 1.4 - 0.4.0 + 0.4.1 1.7.1 1.15.0 1.4.20