From 43f4a27c788067a1982a388cae09c9091e16d894 Mon Sep 17 00:00:00 2001 From: GitHub Date: Thu, 13 May 2021 08:24:45 +0000 Subject: [PATCH] Prepare next development iteration after release 0.5.3 --- README.md | 12 ++++++------ diktat-common/pom.xml | 2 +- diktat-gradle-plugin/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 +- examples/gradle-groovy-dsl/diktat-analysis.yml | 2 ++ examples/gradle-kotlin-dsl/build.gradle.kts | 2 +- examples/gradle-kotlin-dsl/diktat-analysis.yml | 2 ++ examples/maven/diktat-analysis.yml | 4 ++-- examples/maven/pom.xml | 2 +- info/buildSrc/gradle.properties | 2 +- pom.xml | 4 ++-- 16 files changed, 25 insertions(+), 21 deletions(-) diff --git a/README.md b/README.md index dafdee4b57..7acd804867 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.5.2/diktat-0.5.2.jar) +2. Load diKTat manually: [here](https://github.com/cqfn/diKTat/releases/download/v0.5.3/diktat-0.5.3.jar) **OR** use curl: ```bash - $ curl -sSLO https://github.com/cqfn/diKTat/releases/download/v0.5.2/diktat-0.5.2.jar + $ curl -sSLO https://github.com/cqfn/diKTat/releases/download/v0.5.3/diktat-0.5.3.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.5.2" + id("org.cqfn.diktat.diktat-gradle-plugin") version "0.5.3" } ``` @@ -121,7 +121,7 @@ buildscript { mavenCentral() } dependencies { - classpath("org.cqfn.diktat:diktat-gradle-plugin:0.5.2") + classpath("org.cqfn.diktat:diktat-gradle-plugin:0.5.3") } } @@ -194,7 +194,7 @@ spotless { ```kotlin spotless { kotlin { - diktat("0.5.2").configFile("full/path/to/diktat-analysis.yml") + diktat("0.5.3").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.5.2 + 0.5.3 full/path/to/diktat-analysis.yml ``` diff --git a/diktat-common/pom.xml b/diktat-common/pom.xml index 08c327317a..a3cc5f5839 100644 --- a/diktat-common/pom.xml +++ b/diktat-common/pom.xml @@ -9,7 +9,7 @@ org.cqfn.diktat diktat-parent - 0.5.3-SNAPSHOT + 0.5.4-SNAPSHOT diff --git a/diktat-gradle-plugin/gradle-plugin-marker/pom.xml b/diktat-gradle-plugin/gradle-plugin-marker/pom.xml index e1cc2ecd2c..1cb6c40e12 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.5.3-SNAPSHOT + 0.5.4-SNAPSHOT 4.0.0 diff --git a/diktat-gradle-plugin/pom.xml b/diktat-gradle-plugin/pom.xml index 9d176b3710..b970e8ecf9 100644 --- a/diktat-gradle-plugin/pom.xml +++ b/diktat-gradle-plugin/pom.xml @@ -5,7 +5,7 @@ diktat-parent org.cqfn.diktat - 0.5.3-SNAPSHOT + 0.5.4-SNAPSHOT 4.0.0 diff --git a/diktat-maven-plugin/pom.xml b/diktat-maven-plugin/pom.xml index 4de52781fa..f95d087271 100644 --- a/diktat-maven-plugin/pom.xml +++ b/diktat-maven-plugin/pom.xml @@ -5,7 +5,7 @@ diktat-parent org.cqfn.diktat - 0.5.3-SNAPSHOT + 0.5.4-SNAPSHOT 4.0.0 diff --git a/diktat-rules/pom.xml b/diktat-rules/pom.xml index 63b9cc095f..9a452e1fa7 100644 --- a/diktat-rules/pom.xml +++ b/diktat-rules/pom.xml @@ -9,7 +9,7 @@ org.cqfn.diktat diktat-parent - 0.5.3-SNAPSHOT + 0.5.4-SNAPSHOT diff --git a/diktat-ruleset/pom.xml b/diktat-ruleset/pom.xml index f222d9f5a3..240bbd9d17 100644 --- a/diktat-ruleset/pom.xml +++ b/diktat-ruleset/pom.xml @@ -8,7 +8,7 @@ org.cqfn.diktat diktat-parent - 0.5.3-SNAPSHOT + 0.5.4-SNAPSHOT diff --git a/diktat-test-framework/pom.xml b/diktat-test-framework/pom.xml index 2a05469336..d7627cb18e 100644 --- a/diktat-test-framework/pom.xml +++ b/diktat-test-framework/pom.xml @@ -9,7 +9,7 @@ org.cqfn.diktat diktat-parent - 0.5.3-SNAPSHOT + 0.5.4-SNAPSHOT diff --git a/examples/gradle-groovy-dsl/build.gradle b/examples/gradle-groovy-dsl/build.gradle index 4d20f968d5..f383d7f798 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.5.2" + id "org.cqfn.diktat.diktat-gradle-plugin" version "0.5.3" } repositories { diff --git a/examples/gradle-groovy-dsl/diktat-analysis.yml b/examples/gradle-groovy-dsl/diktat-analysis.yml index 3f953a53ed..b6a1f62d55 100644 --- a/examples/gradle-groovy-dsl/diktat-analysis.yml +++ b/examples/gradle-groovy-dsl/diktat-analysis.yml @@ -300,6 +300,8 @@ - name: MAGIC_NUMBER enabled: true configuration: + # Ignore numbers from test + ignoreTest: "true" # Ignore numbers ignoreNumbers: "-1, 1, 0, 2" # Is ignore override hashCode function diff --git a/examples/gradle-kotlin-dsl/build.gradle.kts b/examples/gradle-kotlin-dsl/build.gradle.kts index d7f193c14c..2a6b7c83a6 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.5.2" + id("org.cqfn.diktat.diktat-gradle-plugin") version "0.5.3" } repositories { diff --git a/examples/gradle-kotlin-dsl/diktat-analysis.yml b/examples/gradle-kotlin-dsl/diktat-analysis.yml index 3f953a53ed..b6a1f62d55 100644 --- a/examples/gradle-kotlin-dsl/diktat-analysis.yml +++ b/examples/gradle-kotlin-dsl/diktat-analysis.yml @@ -300,6 +300,8 @@ - name: MAGIC_NUMBER enabled: true configuration: + # Ignore numbers from test + ignoreTest: "true" # Ignore numbers ignoreNumbers: "-1, 1, 0, 2" # Is ignore override hashCode function diff --git a/examples/maven/diktat-analysis.yml b/examples/maven/diktat-analysis.yml index f11ea46c37..b6a1f62d55 100644 --- a/examples/maven/diktat-analysis.yml +++ b/examples/maven/diktat-analysis.yml @@ -300,6 +300,8 @@ - name: MAGIC_NUMBER enabled: true configuration: + # Ignore numbers from test + ignoreTest: "true" # Ignore numbers ignoreNumbers: "-1, 1, 0, 2" # Is ignore override hashCode function @@ -308,8 +310,6 @@ ignorePropertyDeclaration: "false" # Is ignore local variable ignoreLocalVariableDeclaration: "false" - # Is ignore value parameter - ignoreValueParameter: "true" # Is ignore constant ignoreConstantDeclaration: "true" # Is ignore property in companion object diff --git a/examples/maven/pom.xml b/examples/maven/pom.xml index aca6c04ac6..81249a67db 100644 --- a/examples/maven/pom.xml +++ b/examples/maven/pom.xml @@ -8,7 +8,7 @@ 1.0.0-SNAPSHOT - 0.5.2 + 0.5.3 diff --git a/info/buildSrc/gradle.properties b/info/buildSrc/gradle.properties index 662178744a..2005e9c1f0 100644 --- a/info/buildSrc/gradle.properties +++ b/info/buildSrc/gradle.properties @@ -1 +1 @@ -version=0.5.3-SNAPSHOT +version=0.5.4-SNAPSHOT diff --git a/pom.xml b/pom.xml index 257da57d54..6b5cf32af5 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.cqfn.diktat diktat-parent - 0.5.3-SNAPSHOT + 0.5.4-SNAPSHOT pom diktat @@ -50,7 +50,7 @@ 30.1.1-jre 1.7.30 1.4 - 0.5.2 + 0.5.3 1.8.0 1.16.0 1.4.32