From 4311ff570bb102b0177b0428bc8f7fcb56369478 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 9 Mar 2021 17:58:23 +0300 Subject: [PATCH] Prepare next development iteration after release 0.4.2 (#794) --- 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 | 4 ++++ examples/gradle-kotlin-dsl/build.gradle.kts | 2 +- examples/gradle-kotlin-dsl/diktat-analysis.yml | 4 ++++ examples/maven/diktat-analysis.yml | 4 ++++ examples/maven/pom.xml | 2 +- info/buildSrc/gradle.properties | 2 +- pom.xml | 4 ++-- 16 files changed, 31 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index cd2a86aeab..6cdd05fe59 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.1/diktat.jar) +2. Load diKTat manually: [here](https://github.com/cqfn/diKTat/releases/download/v0.4.2/diktat.jar) **OR** use curl: ```bash - $ curl -sSLO https://github.com/cqfn/diKTat/releases/download/v0.4.1/diktat-0.4.1.jar + $ curl -sSLO https://github.com/cqfn/diKTat/releases/download/v0.4.2/diktat-0.4.2.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.1" + id("org.cqfn.diktat.diktat-gradle-plugin") version "0.4.2" } ``` @@ -121,7 +121,7 @@ buildscript { mavenCentral() } dependencies { - classpath("org.cqfn.diktat:diktat-gradle-plugin:0.4.1") + classpath("org.cqfn.diktat:diktat-gradle-plugin:0.4.2") } } @@ -194,7 +194,7 @@ spotless { ```kotlin spotless { kotlin { - diktat("0.4.1").configFile("full/path/to/diktat-analysis.yml") + diktat("0.4.2").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.1 + 0.4.2 full/path/to/diktat-analysis.yml ``` diff --git a/diktat-common/pom.xml b/diktat-common/pom.xml index 2e8c4a2ec2..faa40164b7 100644 --- a/diktat-common/pom.xml +++ b/diktat-common/pom.xml @@ -9,7 +9,7 @@ org.cqfn.diktat diktat-parent - 0.4.2-SNAPSHOT + 0.4.3-SNAPSHOT diff --git a/diktat-gradle-plugin/gradle-plugin-marker/pom.xml b/diktat-gradle-plugin/gradle-plugin-marker/pom.xml index b9b5e582d0..b0d110d91d 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.2-SNAPSHOT + 0.4.3-SNAPSHOT 4.0.0 diff --git a/diktat-gradle-plugin/pom.xml b/diktat-gradle-plugin/pom.xml index e9983588c9..1ea559437c 100644 --- a/diktat-gradle-plugin/pom.xml +++ b/diktat-gradle-plugin/pom.xml @@ -5,7 +5,7 @@ diktat-parent org.cqfn.diktat - 0.4.2-SNAPSHOT + 0.4.3-SNAPSHOT 4.0.0 diff --git a/diktat-maven-plugin/pom.xml b/diktat-maven-plugin/pom.xml index 0955003110..b6082a3ae7 100644 --- a/diktat-maven-plugin/pom.xml +++ b/diktat-maven-plugin/pom.xml @@ -5,7 +5,7 @@ diktat-parent org.cqfn.diktat - 0.4.2-SNAPSHOT + 0.4.3-SNAPSHOT 4.0.0 diff --git a/diktat-rules/pom.xml b/diktat-rules/pom.xml index 2cbed95e35..bb753aa0e7 100644 --- a/diktat-rules/pom.xml +++ b/diktat-rules/pom.xml @@ -9,7 +9,7 @@ org.cqfn.diktat diktat-parent - 0.4.2-SNAPSHOT + 0.4.3-SNAPSHOT diff --git a/diktat-ruleset/pom.xml b/diktat-ruleset/pom.xml index 31a217836e..9753f6a91d 100644 --- a/diktat-ruleset/pom.xml +++ b/diktat-ruleset/pom.xml @@ -8,7 +8,7 @@ org.cqfn.diktat diktat-parent - 0.4.2-SNAPSHOT + 0.4.3-SNAPSHOT diff --git a/diktat-test-framework/pom.xml b/diktat-test-framework/pom.xml index a2d6ed6eee..7a70bc561f 100644 --- a/diktat-test-framework/pom.xml +++ b/diktat-test-framework/pom.xml @@ -9,7 +9,7 @@ org.cqfn.diktat diktat-parent - 0.4.2-SNAPSHOT + 0.4.3-SNAPSHOT diff --git a/examples/gradle-groovy-dsl/build.gradle b/examples/gradle-groovy-dsl/build.gradle index c4320514b1..cee0ef24fd 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.1" + id "org.cqfn.diktat.diktat-gradle-plugin" version "0.4.2" } repositories { diff --git a/examples/gradle-groovy-dsl/diktat-analysis.yml b/examples/gradle-groovy-dsl/diktat-analysis.yml index 774694e8ab..ad1ed749f5 100644 --- a/examples/gradle-groovy-dsl/diktat-analysis.yml +++ b/examples/gradle-groovy-dsl/diktat-analysis.yml @@ -6,6 +6,7 @@ testDirs: test disabledChapters: "" kotlinVersion: 1.4 + srcDirectories: "main" # Checks that the Class/Enum/Interface name does not match Pascal case - name: CLASS_NAME_INCORRECT enabled: true @@ -463,4 +464,7 @@ enabled: true # If file contains class, then it can't contain extension functions for the same class - name: EXTENSION_FUNCTION_WITH_CLASS + enabled: true +# Check if kts script contains other functions except run code +- name: RUN_IN_SCRIPT enabled: true \ No newline at end of file diff --git a/examples/gradle-kotlin-dsl/build.gradle.kts b/examples/gradle-kotlin-dsl/build.gradle.kts index 517653b8e5..84145a14c0 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.1" + id("org.cqfn.diktat.diktat-gradle-plugin") version "0.4.2" } repositories { diff --git a/examples/gradle-kotlin-dsl/diktat-analysis.yml b/examples/gradle-kotlin-dsl/diktat-analysis.yml index 774694e8ab..ad1ed749f5 100644 --- a/examples/gradle-kotlin-dsl/diktat-analysis.yml +++ b/examples/gradle-kotlin-dsl/diktat-analysis.yml @@ -6,6 +6,7 @@ testDirs: test disabledChapters: "" kotlinVersion: 1.4 + srcDirectories: "main" # Checks that the Class/Enum/Interface name does not match Pascal case - name: CLASS_NAME_INCORRECT enabled: true @@ -463,4 +464,7 @@ enabled: true # If file contains class, then it can't contain extension functions for the same class - name: EXTENSION_FUNCTION_WITH_CLASS + enabled: true +# Check if kts script contains other functions except run code +- name: RUN_IN_SCRIPT enabled: true \ No newline at end of file diff --git a/examples/maven/diktat-analysis.yml b/examples/maven/diktat-analysis.yml index 774694e8ab..ad1ed749f5 100644 --- a/examples/maven/diktat-analysis.yml +++ b/examples/maven/diktat-analysis.yml @@ -6,6 +6,7 @@ testDirs: test disabledChapters: "" kotlinVersion: 1.4 + srcDirectories: "main" # Checks that the Class/Enum/Interface name does not match Pascal case - name: CLASS_NAME_INCORRECT enabled: true @@ -463,4 +464,7 @@ enabled: true # If file contains class, then it can't contain extension functions for the same class - name: EXTENSION_FUNCTION_WITH_CLASS + enabled: true +# Check if kts script contains other functions except run code +- name: RUN_IN_SCRIPT enabled: true \ No newline at end of file diff --git a/examples/maven/pom.xml b/examples/maven/pom.xml index 89787a9af8..ffaa28dc55 100644 --- a/examples/maven/pom.xml +++ b/examples/maven/pom.xml @@ -8,7 +8,7 @@ 1.0.0-SNAPSHOT - 0.4.1 + 0.4.2 diff --git a/info/buildSrc/gradle.properties b/info/buildSrc/gradle.properties index 78f1d61359..0ef5b9495e 100644 --- a/info/buildSrc/gradle.properties +++ b/info/buildSrc/gradle.properties @@ -1 +1 @@ -version=0.4.2-SNAPSHOT +version=0.4.3-SNAPSHOT diff --git a/pom.xml b/pom.xml index fdaf614d44..34df8ed120 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.cqfn.diktat diktat-parent - 0.4.2-SNAPSHOT + 0.4.3-SNAPSHOT pom diktat @@ -50,7 +50,7 @@ 30.0-jre 1.7.30 1.4 - 0.4.1 + 0.4.2 1.7.1 1.15.0 1.4.20