Update to ktlint 0.43.0 (#226)

* Update to ktlint 0.43.0 Also pushing the build java version forward * update test-project kotlin version * Move gradle req to 7, although really only Java 16+ requires this * try different version string
jeremymailen · Nov 8, 2021 · b79ed5e · b79ed5e
1 parent 3221d7a
commit b79ed5e
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 15 deletions.
diff --git a/.github/workflows/default.yml b/.github/workflows/default.yml
@@ -21,7 +21,7 @@ jobs:
         uses: actions/setup-java@v2
         with:
           distribution: 'adopt'
-          java-version: 16
+          java-version: 17
 
       - name: Gradle wrapper validation
         uses: gradle/wrapper-validation-action@v1
@@ -49,8 +49,8 @@ jobs:
       fail-fast: false
       matrix:
         os: [ ubuntu-latest, windows-latest ]
-        gradle: [ 6.8.3, current, rc ]
-        java: [ 8, 11, 15 ]
+        gradle: [ 7.0.1, current, rc ]
+        java: [ 8, 11, 16 ]
     name: '[${{ matrix.os }}] Gradle: ${{ matrix.gradle }}, Java: ${{ matrix.java }}'
     steps:
       - uses: actions/checkout@v2

diff --git a/README.md b/README.md
@@ -19,7 +19,7 @@ Available on the Gradle Plugins Portal: https://plugins.gradle.org/plugin/org.jm
 
 ```kotlin
 plugins {
-    id("org.jmailen.kotlinter") version "3.6.0"
+    id("org.jmailen.kotlinter") version "3.7.0"
 }
 ```
 
@@ -30,7 +30,7 @@ plugins {
 
 ```groovy
 plugins {
-    id "org.jmailen.kotlinter" version "3.6.0"
+    id "org.jmailen.kotlinter" version "3.7.0"
 }
 ```
 
@@ -50,7 +50,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath("org.jmailen.gradle:kotlinter-gradle:3.6.0")
+        classpath("org.jmailen.gradle:kotlinter-gradle:3.7.0")
     }
 }
 ```
@@ -75,7 +75,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath "org.jmailen.gradle:kotlinter-gradle:3.6.0"
+        classpath "org.jmailen.gradle:kotlinter-gradle:3.7.0"
     }
 }
 ```
@@ -90,8 +90,9 @@ apply plugin: "org.jmailen.kotlinter"
 
 ### Compatibility
 
-| kotlinter versions | min kotlin version | max kotlin version | min gradle version |
+| kotlinter version  | min kotlin version | max kotlin version | min gradle version |
 |--------------------|--------------------|--------------------|--------------------|
+| 3.7.0+             | 1.5.31             | -                  | 7.0                |
 | 3.5.0+             | 1.5.0              | -                  | 6.8                |
 | 3.0.0+             | 1.4.0              | 1.4.30             | 6.8                |
 | 2.0.0+             | 1.3.0              | 1.3.30             | -                  |

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,11 +1,11 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    kotlin("jvm") version "1.5.20"
+    kotlin("jvm") version "1.5.31"
     id("com.gradle.plugin-publish") version "0.15.0"
     `java-gradle-plugin`
     `maven-publish`
-    id("org.jmailen.kotlinter") version "3.5.1"
+    id("org.jmailen.kotlinter") version "3.6.0"
     idea
 }
 
@@ -19,16 +19,16 @@ val githubUrl = "https://github.com/jeremymailen/kotlinter-gradle"
 val webUrl = "https://github.com/jeremymailen/kotlinter-gradle"
 val projectDescription = "Lint and formatting for Kotlin using ktlint with configuration-free setup on JVM and Android projects"
 
-version = "3.6.0"
+version = "3.7.0"
 group = "org.jmailen.gradle"
 description = projectDescription
 
 object Versions {
     const val androidTools = "4.2.2"
-    const val jetbrainsAnnotations = "20.1.0"
+    const val jetbrainsAnnotations = "22.0.0"
     const val junit = "4.13.2"
-    const val ktlint = "0.42.1"
-    const val mockitoKotlin = "3.1.0"
+    const val ktlint = "0.43.0"
+    const val mockitoKotlin = "4.0.0"
 }
 
 dependencies {

diff --git a/test-project/build.gradle.kts b/test-project/build.gradle.kts
@@ -1,4 +1,4 @@
 plugins {
-    kotlin("jvm") version "1.5.0"
+    kotlin("jvm") version "1.5.31"
     id("org.jmailen.kotlinter")
 }