From dce602cb228357ad4f84976276f86bb437565b16 Mon Sep 17 00:00:00 2001 From: GitHub Date: Mon, 14 Sep 2020 07:44:36 +0000 Subject: [PATCH 1/2] Prepare next development iteration after release 0.1.0 --- README.md | 8 ++++---- build.gradle.kts | 2 +- diktat-common/pom.xml | 2 +- diktat-rules/pom.xml | 2 +- diktat-ruleset/pom.xml | 2 +- diktat-test-framework/pom.xml | 2 +- pom.xml | 4 ++-- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index c0073042f4..84e6be51ee 100644 --- a/README.md +++ b/README.md @@ -31,11 +31,11 @@ The full list of available supported rules and inspections is [here](info/availa # another option is "brew install ktlint" ``` -2. Load diKTat manually: [here](https://github.com/cqfn/diKTat/releases/download/v0.0.4/diktat.jar) +2. Load diKTat manually: [here](https://github.com/cqfn/diKTat/releases/download/v0.1.0/diktat.jar) **OR** use curl: ```bash - $ curl -sSLO https://github.com/cqfn/diKTat/releases/download/v0.0.4/diktat.jar + $ curl -sSLO https://github.com/cqfn/diKTat/releases/download/v0.1.0/diktat.jar ``` 3. Finally, run KTlint (with diKTat injected) to check your `*.kt` files in `dir/your/dir`: @@ -95,7 +95,7 @@ Add this plugin to your pom.xml: org.cqfn.diktat diktat-rules - 0.0.4 + 0.1.0 org.slf4j @@ -134,7 +134,7 @@ dependencies { } // diktat ruleset - ktlint("org.cqfn.diktat:diktat-rules:0.0.4") { + ktlint("org.cqfn.diktat:diktat-rules:0.1.0") { exclude("org.slf4j", "slf4j-log4j12") } } diff --git a/build.gradle.kts b/build.gradle.kts index 1a4238b73e..0c81860af2 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -11,7 +11,7 @@ dependencies { } // diktat ruleset - ktlint("org.cqfn.diktat:diktat-rules:0.0.4") { + ktlint("org.cqfn.diktat:diktat-rules:0.1.0") { exclude("org.slf4j", "slf4j-log4j12") } } diff --git a/diktat-common/pom.xml b/diktat-common/pom.xml index d3190bda7a..9289f9f1a9 100644 --- a/diktat-common/pom.xml +++ b/diktat-common/pom.xml @@ -9,7 +9,7 @@ org.cqfn.diktat diktat-parent - 0.0.5-SNAPSHOT + 0.1.1-SNAPSHOT diff --git a/diktat-rules/pom.xml b/diktat-rules/pom.xml index ae6d3874dc..2f917bd56f 100644 --- a/diktat-rules/pom.xml +++ b/diktat-rules/pom.xml @@ -9,7 +9,7 @@ org.cqfn.diktat diktat-parent - 0.0.5-SNAPSHOT + 0.1.1-SNAPSHOT diff --git a/diktat-ruleset/pom.xml b/diktat-ruleset/pom.xml index adcc737d39..babc6227b8 100644 --- a/diktat-ruleset/pom.xml +++ b/diktat-ruleset/pom.xml @@ -8,7 +8,7 @@ org.cqfn.diktat diktat-parent - 0.0.5-SNAPSHOT + 0.1.1-SNAPSHOT diff --git a/diktat-test-framework/pom.xml b/diktat-test-framework/pom.xml index 730dc2f816..446c29d7fc 100644 --- a/diktat-test-framework/pom.xml +++ b/diktat-test-framework/pom.xml @@ -9,7 +9,7 @@ org.cqfn.diktat diktat-parent - 0.0.5-SNAPSHOT + 0.1.1-SNAPSHOT diff --git a/pom.xml b/pom.xml index 91d3073fce..fe93f084f5 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.cqfn.diktat diktat-parent - 0.0.5-SNAPSHOT + 0.1.1-SNAPSHOT pom diktat @@ -49,7 +49,7 @@ 2.11.2 1.7.30 1.4 - 0.0.4 + 0.1.0 1.6.0 1.4.0 From e6faea4ee9151dd45bd82ebce2c0c59873729dcc Mon Sep 17 00:00:00 2001 From: Peter Trifanov Date: Mon, 14 Sep 2020 11:36:05 +0300 Subject: [PATCH 2/2] Update diktat.yml --- .github/workflows/diktat.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/diktat.yml b/.github/workflows/diktat.yml index 157499de67..ef430e5244 100644 --- a/.github/workflows/diktat.yml +++ b/.github/workflows/diktat.yml @@ -1,11 +1,10 @@ name: Run diKTat from release version on: -# fixme: temporary disable this job until the first release lands in maven central -# push: -# branches: [ master ] -# pull_request: -# branches: [ master ] + push: + branches: [ master ] + pull_request: + branches: [ master ] jobs: diktat_check: