Upgrade to ktlint 1.4.1 (#411)

- Also upgrade gradle version - Update min Kotlin version
jeremymailen · Nov 18, 2024 · 2613518 · 2613518
1 parent 1b0661e
commit 2613518
Show file tree

Hide file tree

Showing 11 changed files with 33 additions and 27 deletions.
diff --git a/.github/workflows/default.yml b/.github/workflows/default.yml
@@ -24,7 +24,7 @@ jobs:
           java-version: 21
 
       - name: Gradle wrapper validation
-        uses: gradle/wrapper-validation-action@859c33240bd026ce8d5f711f5adcc65c2f8eafc1 # https://github.com/gradle/wrapper-validation-action/issues/66
+        uses: gradle/wrapper-validation-action@v3
 
       - name: ./gradlew assemble
         uses: gradle/gradle-build-action@v3

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -19,7 +19,7 @@ jobs:
           java-version: 21
 
       - name: Gradle wrapper validation
-        uses: gradle/wrapper-validation-action@v1
+        uses: gradle/wrapper-validation-action@v3
 
       - name: ./gradlew publishPlugins
         uses: gradle/gradle-build-action@v3

diff --git a/README.md b/README.md
@@ -20,7 +20,7 @@ Available on the Gradle Plugins Portal: https://plugins.gradle.org/plugin/org.jm
 
 ```kotlin
 plugins {
-    id("org.jmailen.kotlinter") version "4.4.1"
+    id("org.jmailen.kotlinter") version "4.5.0"
 }
 ```
 
@@ -31,7 +31,7 @@ plugins {
 
 ```groovy
 plugins {
-    id "org.jmailen.kotlinter" version "4.4.1"
+    id "org.jmailen.kotlinter" version "4.5.0"
 }
 ```
 
@@ -45,7 +45,7 @@ Root `build.gradle.kts`
 
 ```kotlin
 plugins {
-    id("org.jmailen.kotlinter") version "4.4.1" apply false
+    id("org.jmailen.kotlinter") version "4.5.0" apply false
 }
 ```
 
@@ -65,7 +65,7 @@ Root `build.gradle`
 
 ```groovy
 plugins {
-    id 'org.jmailen.kotlinter' version "4.4.1" apply false
+    id 'org.jmailen.kotlinter' version "4.5.0" apply false
 }
 ```
 
@@ -83,8 +83,9 @@ plugins {
 
 | kotlinter version | min kotlin version | max kotlin version | min gradle version |
 |-------------------|--------------------|--------------------|--------------------|
-| 4.2.0+            | 1.9.20             | -                  | 8.4                |
-| 4.0.0+            | 1.9.0              | -                  | 7.6                |
+| 4.5.0+            | 2.0.0              | -                  | 8.4                |
+| 4.2.0+            | 1.9.20             | 1.9.25             | 8.4                |
+| 4.0.0+            | 1.9.0              | 1.9.25             | 7.6                |
 | 3.14.0+           | 1.8.0              | 1.8.22             | 7.6                |
 | 3.11.0+           | 1.7.0              | 1.7.22             | 7.0                |
 | 3.10.0+           | 1.6.20             | 1.6.21             | 7.0                |
@@ -319,7 +320,7 @@ Alternatively, if you have a custom build convention plugin that utilizes kotlin
 ```kotlin
 dependencies {
     implementation(platform("com.pinterest.ktlint:ktlint-bom:1.2.1"))
-    implementation("org.jmailen.gradle:kotlinter-gradle:4.4.1")
+    implementation("org.jmailen.gradle:kotlinter-gradle:4.5.0")
 }
 
 ```

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -20,7 +20,7 @@ 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 = "4.4.1"
+version = "4.5.0"
 group = "org.jmailen.gradle"
 description = projectDescription
 
@@ -96,7 +96,7 @@ tasks {
     }
 
     wrapper {
-        gradleVersion = "8.9"
+        gradleVersion = "8.11"
     }
 }
 

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
 kotlin = "2.0.21"
-ktlint = "1.3.1"
+ktlint = "1.4.1"
 android-tools = "7.3.1"
 junit = "5.11.3"
 mockito = "4.1.0"

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/gradlew b/gradlew
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

diff --git a/gradlew.bat b/gradlew.bat
@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
@@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 

diff --git a/test-project-android/build.gradle.kts b/test-project-android/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    kotlin("android") version "1.9.20"
+    kotlin("android") version "2.0.21"
     id("com.android.library")
     id("org.jmailen.kotlinter")
 }

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