Compat old ktlint users

Author: Goooler

CHANGES.md

@@ -11,7 +11,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 ### Added
-* **POTENTIALLY BREAKING** Support Ktlint 1.0.0 ([#1808](https://github.com/diffplug/spotless/pull/1808)).
+* Support Ktlint 1.0.0 ([#1808](https://github.com/diffplug/spotless/pull/1808)).
 
 ## [2.41.0] - 2023-08-29
 ### Added

lib/src/compatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0Adapter.java

@@ -132,6 +132,11 @@ private static EditorConfigOverride createEditorConfigOverride(final List<Rule>
 				.distinct()
 				.collect(Collectors.toMap(EditorConfigProperty::getName, property -> property));
 
+		// The default style had been changed from intellij_idea to ktlint_official in version 1.0.0
+		if (!editorConfigOverrideMap.containsKey("ktlint_code_style")) {
+			editorConfigOverrideMap.put("ktlint_code_style", "intellij_idea");
+		}
+
 		// Create config properties based on provided property names and values
 		@SuppressWarnings("unchecked")
 		Pair<EditorConfigProperty<?>, ?>[] properties = editorConfigOverrideMap.entrySet().stream()

lib/src/testCompatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0AdapterTest.java

@@ -54,7 +54,6 @@ public void testEditorConfigCanDisable(@TempDir Path path) throws IOException {
 
 		Map<String, Object> editorConfigOverrideMap = new HashMap<>();
 		editorConfigOverrideMap.put("indent_style", "tab");
-		editorConfigOverrideMap.put("ktlint_code_style", "intellij_idea");
 		editorConfigOverrideMap.put("ktlint_standard_no-semi", "disabled");
 
 		String formatted = KtLintCompat1Dot0Dot0Adapter.format(text, filePath, false, null, userData, editorConfigOverrideMap);

plugin-gradle/CHANGES.md

@@ -4,8 +4,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 ### Added
-* **POTENTIALLY BREAKING** Support Ktlint 1.0.0 ([#1808](https://github.com/diffplug/spotless/pull/1808)).
-  The default code style had been changed to `ktlint_official`, if you are upgrading from the old versions, may need to override the style in `editorConfigOverride`.
+* Support Ktlint 1.0.0 ([#1808](https://github.com/diffplug/spotless/pull/1808)).
 
 ## [6.21.0] - 2023-08-29
 ### Added

plugin-gradle/README.md

@@ -405,7 +405,6 @@ spotless {
       .editorConfigOverride(
         mapOf(
           "indent_size" to 2,
-          "ktlint_code_style" to "intellij_idea",
         )
       )
   }

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

@@ -73,7 +73,6 @@ void withExperimentalEditorConfigOverride() throws IOException {
 				"spotless {",
 				"    kotlin {",
 				"        ktlint().editorConfigOverride([",
-				"            ktlint_code_style: \"intellij_idea\",",
 				"            ktlint_experimental: \"enabled\",",
 				"            ij_kotlin_allow_trailing_comma: true,",
 				"            ij_kotlin_allow_trailing_comma_on_call_site: true",

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

@@ -52,7 +52,6 @@ void withExperimentalEditorConfigOverride() throws IOException {
 				"spotless {",
 				"    kotlinGradle {",
 				"        ktlint().editorConfigOverride([",
-				"            ktlint_code_style: \"intellij_idea\",",
 				"            ktlint_experimental: \"enabled\",",
 				"            ij_kotlin_allow_trailing_comma: true,",
 				"            ij_kotlin_allow_trailing_comma_on_call_site: true",

plugin-maven/CHANGES.md

@@ -4,8 +4,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 ### Added
-* **POTENTIALLY BREAKING** Support Ktlint 1.0.0 ([#1808](https://github.com/diffplug/spotless/pull/1808)).
-The default code style had been changed to `ktlint_official`, if you are upgrading from the old versions, may need to override the style in `editorConfigOverride`.
+* Support Ktlint 1.0.0 ([#1808](https://github.com/diffplug/spotless/pull/1808)).
 
 ## [2.39.0] - 2023-08-29
 ### Added

plugin-maven/README.md

@@ -413,7 +413,6 @@ Additionally, `editorConfigOverride` options will override what's supplied in `.
   <editorConfigOverride> <!-- optional -->
     <ij_kotlin_allow_trailing_comma>true</ij_kotlin_allow_trailing_comma>
     <ij_kotlin_allow_trailing_comma_on_call_site>true</ij_kotlin_allow_trailing_comma_on_call_site>
-    <ktlint_code_style>intellij_idea</ktlint_code_style>
   </editorConfigOverride>
 </ktlint>
 ```

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

@@ -36,7 +36,6 @@ void testKtlintEditorConfigOverride() throws Exception {
 				"  <editorConfigOverride>\n" +
 				"    <ij_kotlin_allow_trailing_comma>true</ij_kotlin_allow_trailing_comma>\n" +
 				"    <ij_kotlin_allow_trailing_comma_on_call_site>true</ij_kotlin_allow_trailing_comma_on_call_site>\n" +
-				"    <ktlint_code_style>intellij_idea</ktlint_code_style>\n" +
 				"  </editorConfigOverride>\n" +
 				"</ktlint>");