diff --git a/CHANGES.md b/CHANGES.md index cc7c44dc33..74b3a7c873 100644 --- 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 index 991d082257..6e8f9e3452 100644 --- 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 ktlint 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 index 4c3956ff6b..a95e8d20fb 100644 --- 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 index 8761c47c5c..90d7d6ef56 100644 --- 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 index ff39cea174..a32ef06acd 100644 --- 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 index 81ed57bc71..43a089e1e9 100644 --- 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 index 856015de7c..a4787f0c45 100644 --- a/plugin-maven/README.md +++ b/plugin-maven/README.md @@ -430,7 +430,7 @@ Additionally, `editorConfigOverride` options will override what's supplied in `. intellij_idea - io.nlopez.compose.rules:ktlint:0.3.3 + io.nlopez.compose.rules:ktlint:0.4.16 ``` 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 index 0f02f331aa..0c67143146 100644 --- 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("\n" + " \n" + - " io.nlopez.compose.rules:ktlint:0.3.3\n" + + " io.nlopez.compose.rules:ktlint:0.4.16\n" + " \n" + " \n" + " Composable\n" +