Bump Ktlint to 1.4.0 (#2314)

diffplug · Oct 25, 2024 · 4bb4efb · 4bb4efb
1 parent 7676b18
commit 4bb4efb
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 5 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -10,6 +10,8 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Added
+* Bump default `ktlint` version to latest `1.3.0` -> `1.4.0`. ([#2314](https://github.com/diffplug/spotless/pull/2314))
 
 ## [3.0.0.BETA4] - 2024-10-24
 ### Added

diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
@@ -36,7 +36,7 @@
 /** Wraps up <a href="https://github.com/pinterest/ktlint">ktlint</a> as a FormatterStep. */
 public class KtLintStep implements Serializable {
 	private static final long serialVersionUID = 1L;
-	private static final String DEFAULT_VERSION = "1.3.0";
+	private static final String DEFAULT_VERSION = "1.4.0";
 	private static final String NAME = "ktlint";
 	private static final String MAVEN_COORDINATE_0_DOT = "com.pinterest:ktlint:";
 	private static final String MAVEN_COORDINATE_1_DOT = "com.pinterest.ktlint:ktlint-cli:";

diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+### Added
+* Bump default `ktlint` version to latest `1.3.0` -> `1.4.0`. ([#2314](https://github.com/diffplug/spotless/pull/2314))
 
 ## [7.0.0.BETA4] - 2024-10-24
 ### Added

diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
@@ -460,7 +460,7 @@ spotless {
       )
       .customRuleSets(
         listOf(
-          "io.nlopez.compose.rules:ktlint:0.3.3"
+          "io.nlopez.compose.rules:ktlint:0.4.16"
         )
       )
   }

diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
@@ -178,7 +178,7 @@ void withCustomRuleSetApply() throws IOException {
 				"    kotlin {",
 				"        ktlint(\"1.0.1\")",
 				"        .customRuleSets(listOf(",
-				"            \"io.nlopez.compose.rules:ktlint:0.3.3\"",
+				"            \"io.nlopez.compose.rules:ktlint:0.4.16\"",
 				"        ))",
 				"        .editorConfigOverride(mapOf(",
 				"            \"ktlint_function_naming_ignore_when_annotated_with\" to \"Composable\"",

diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Added
+* Bump default `ktlint` version to latest `1.3.0` -> `1.4.0`. ([#2314](https://github.com/diffplug/spotless/pull/2314))
 
 ## [2.44.0.BETA4] - 2024-10-24
 ### Added

diff --git a/plugin-maven/README.md b/plugin-maven/README.md
@@ -430,7 +430,7 @@ Additionally, `editorConfigOverride` options will override what's supplied in `.
     <ktlint_code_style>intellij_idea</ktlint_code_style>
   </editorConfigOverride>
   <customRuleSets> <!-- optional -->
-    <value>io.nlopez.compose.rules:ktlint:0.3.3</value>
+    <value>io.nlopez.compose.rules:ktlint:0.4.16</value>
   </customRuleSets>
 </ktlint>
 ```

diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtlintTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtlintTest.java
@@ -80,7 +80,7 @@ void testSetEditorConfigCanOverrideEditorConfigFile() throws Exception {
 	void testWithCustomRuleSetApply() throws Exception {
 		writePomWithKotlinSteps("<ktlint>\n" +
 				"  <customRuleSets>\n" +
-				"    <value>io.nlopez.compose.rules:ktlint:0.3.3</value>\n" +
+				"    <value>io.nlopez.compose.rules:ktlint:0.4.16</value>\n" +
 				"  </customRuleSets>\n" +
 				"  <editorConfigOverride>\n" +
 				"    <ktlint_function_naming_ignore_when_annotated_with>Composable</ktlint_function_naming_ignore_when_annotated_with>\n" +
-Original file line number
+Diff line change
@@ Expand Up / @@ -460,7 +460,7 @@ spotless { @@
           )
           .customRuleSets(
             listOf(
-              "io.nlopez.compose.rules:ktlint:0.3.3"
+              "io.nlopez.compose.rules:ktlint:0.4.16"
             )
           )
       }
@@ Expand Down @@