Merge branch 'main' into fix/jgit-system-config

Author: nedtwigg

CHANGES.md

@@ -15,6 +15,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump JGit from `6.10.1` to `7.3.0` ([#2257](https://github.com/diffplug/spotless/pull/2257))
   * Adds support for worktrees (fixes [#1765](https://github.com/diffplug/spotless/issues/1765))
 * Bump default `google-java-format` version to latest `1.24.0` -> `1.28.0`. ([#2345](https://github.com/diffplug/spotless/pull/2345))
+* Bump default `ktlint` version to latest `1.5.0` -> `1.7.1`. ([#2555](https://github.com/diffplug/spotless/pull/2555))
 
 ## [3.3.1] - 2025-07-21
 ### Fixed

lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2024 DiffPlug
+ * Copyright 2016-2025 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,14 +36,13 @@
 /** 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.5.0";
+	private static final String DEFAULT_VERSION = "1.7.1";
 	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:";
 
 	private final JarState.Promised jarState;
-	@Nullable
-	private final FileSignature.Promised config;
+	@Nullable private final FileSignature.Promised config;
 	private final Map<String, Object> editorConfigOverride;
 	private final String version;
 
@@ -95,8 +94,7 @@ private static final class State implements Serializable {
 		private final JarState jarState;
 		private final TreeMap<String, Object> editorConfigOverride;
 		private final String version;
-		@Nullable
-		private final FileSignature editorConfigPath;
+		@Nullable private final FileSignature editorConfigPath;
 
 		State(String version,
 				JarState jarState,

plugin-gradle/CHANGES.md

@@ -8,6 +8,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump JGit from `6.10.1` to `7.3.0` ([#2257](https://github.com/diffplug/spotless/pull/2257))
   * Adds support for worktrees (fixes [#1765](https://github.com/diffplug/spotless/issues/1765))
 * Bump default `google-java-format` version to latest `1.24.0` -> `1.28.0`. ([#2345](https://github.com/diffplug/spotless/pull/2345))
+* Bump default `ktlint` version to latest `1.5.0` -> `1.7.1`. ([#2555](https://github.com/diffplug/spotless/pull/2555))
 ### Fixed
 * Respect system gitconfig when performing git operations ([#2404](https://github.com/diffplug/spotless/issues/2404))
 

plugin-gradle/README.md

@@ -548,7 +548,7 @@ spotless {
       )
       .customRuleSets(
         listOf(
-          "io.nlopez.compose.rules:ktlint:0.4.16"
+          "io.nlopez.compose.rules:ktlint:0.4.25"
         )
       )
   }

plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2024 DiffPlug
+ * Copyright 2016-2025 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -178,7 +178,7 @@ void withCustomRuleSetApply() throws IOException {
 				"    kotlin {",
 				"        ktlint(\"1.0.1\")",
 				"        .customRuleSets(listOf(",
-				"            \"io.nlopez.compose.rules:ktlint:0.4.16\"",
+				"            \"io.nlopez.compose.rules:ktlint:0.4.25\"",
 				"        ))",
 				"        .editorConfigOverride(mapOf(",
 				"            \"ktlint_function_naming_ignore_when_annotated_with\" to \"Composable\"",

plugin-maven/CHANGES.md

@@ -8,6 +8,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump JGit from `6.10.1` to `7.3.0` ([#2257](https://github.com/diffplug/spotless/pull/2257))
   * Adds support for worktrees (fixes [#1765](https://github.com/diffplug/spotless/issues/1765))
 * Bump default `google-java-format` version to latest `1.24.0` -> `1.28.0`. ([#2345](https://github.com/diffplug/spotless/pull/2345))
+* Bump default `ktlint` version to latest `1.5.0` -> `1.7.1`. ([#2555](https://github.com/diffplug/spotless/pull/2555))
 
 ## [2.46.1] - 2025-07-21
 ### Fixed

plugin-maven/README.md

@@ -499,7 +499,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.4.16</value>
+    <value>io.nlopez.compose.rules:ktlint:0.4.25</value>
   </customRuleSets>
 </ktlint>
 ```

plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtlintTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2024 DiffPlug
+ * Copyright 2016-2025 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -80,7 +80,7 @@ void testSetEditorConfigCanOverrideEditorConfigFile() throws Exception {
 	void testWithCustomRuleSetApply() throws Exception {
 		writePomWithKotlinSteps("<ktlint>\n" +
 				"  <customRuleSets>\n" +
-				"    <value>io.nlopez.compose.rules:ktlint:0.4.16</value>\n" +
+				"    <value>io.nlopez.compose.rules:ktlint:0.4.25</value>\n" +
 				"  </customRuleSets>\n" +
 				"  <editorConfigOverride>\n" +
 				"    <ktlint_function_naming_ignore_when_annotated_with>Composable</ktlint_function_naming_ignore_when_annotated_with>\n" +