Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into feature/magic-number
Browse files Browse the repository at this point in the history
  • Loading branch information
kentr0w committed Mar 22, 2021
2 parents deb05c3 + 8a7a2df commit b119860
Show file tree
Hide file tree
Showing 163 changed files with 2,809 additions and 562 deletions.
7 changes: 7 additions & 0 deletions .github/workflows/build_and_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -118,3 +118,10 @@ jobs:
run: |
mvn -B clean install
shell: cmd

- name: Upload gradle reports
if: ${{ failure() }}
uses: actions/upload-artifact@v2
with:
name: gradle-test-report-${{ matrix.os }}
path: 'diktat-gradle-plugin/build/reports/'
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.2/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.2/diktat-0.4.2.jar
```

3. Finally, run KTlint (with diKTat injected) to check your `*.kt` files in `dir/your/dir`:
Expand Down Expand Up @@ -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.2"
}
```

Expand All @@ -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.2")
}
}
Expand Down Expand Up @@ -194,7 +194,7 @@ spotless {
```kotlin
spotless {
kotlin {
diktat("0.4.0").configFile("full/path/to/diktat-analysis.yml")
diktat("0.4.2").configFile("full/path/to/diktat-analysis.yml")
}
}
```
Expand Down Expand Up @@ -225,7 +225,7 @@ Diktat can be run via spotless-maven-plugin since version 2.8.0

```xml
<diktat>
<version>0.4.0</version> <!-- optional -->
<version>0.4.2</version> <!-- optional -->
<configFile>full/path/to/diktat-analysis.yml</configFile> <!-- optional, configuration file path -->
</diktat>
```
Expand Down
Loading

0 comments on commit b119860

Please sign in to comment.