From 137f894a70503b8252ca0bfbcb144c4c9b7f9ccb Mon Sep 17 00:00:00 2001 From: Goooler Date: Tue, 28 Nov 2023 12:21:02 +0800 Subject: [PATCH 1/3] Convert withCustomRuleSetApply build script to kts --- .../gradle/spotless/KotlinExtensionTest.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) 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 bd1175b992..9eccc3bcf5 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 @@ -143,21 +143,21 @@ void testSetEditorConfigCanOverrideEditorConfigFile() throws IOException { @Test void withCustomRuleSetApply() throws IOException { - setFile("build.gradle").toLines( + setFile("build.gradle.kts").toLines( "plugins {", - " id 'org.jetbrains.kotlin.jvm' version '1.6.21'", - " id 'com.diffplug.spotless'", + " id(\"org.jetbrains.kotlin.jvm\") version \"1.6.21\"", + " id(\"com.diffplug.spotless\")", "}", "repositories { mavenCentral() }", "spotless {", " kotlin {", " ktlint(\"1.0.1\")", - " .customRuleSets([", + " .customRuleSets(listOf(", " \"io.nlopez.compose.rules:ktlint:0.3.3\"", - " ])", - " .editorConfigOverride([", - " ktlint_function_naming_ignore_when_annotated_with: \"Composable\",", - " ])", + " ))", + " .editorConfigOverride(mapOf(", + " ktlint_function_naming_ignore_when_annotated_with to \"Composable\",", + " ))", " }", "}"); setFile("src/main/kotlin/Main.kt").toResource("kotlin/ktlint/listScreen.dirty"); From 638a2f8e0032292193ee2cfe60393858829d006d Mon Sep 17 00:00:00 2001 From: Goooler Date: Tue, 28 Nov 2023 12:42:28 +0800 Subject: [PATCH 2/3] Fix --- .../java/com/diffplug/gradle/spotless/KotlinExtensionTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 9eccc3bcf5..969c63f420 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 @@ -156,7 +156,7 @@ void withCustomRuleSetApply() throws IOException { " \"io.nlopez.compose.rules:ktlint:0.3.3\"", " ))", " .editorConfigOverride(mapOf(", - " ktlint_function_naming_ignore_when_annotated_with to \"Composable\",", + " \"ktlint_function_naming_ignore_when_annotated_with\" to \"Composable\",", " ))", " }", "}"); From a4c3035f4273a29723b805fbf4bcee944d15ea1d Mon Sep 17 00:00:00 2001 From: Goooler Date: Tue, 28 Nov 2023 12:51:55 +0800 Subject: [PATCH 3/3] Fix syntax --- .../java/com/diffplug/gradle/spotless/KotlinExtensionTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 969c63f420..d8d5b63e01 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 @@ -156,7 +156,7 @@ void withCustomRuleSetApply() throws IOException { " \"io.nlopez.compose.rules:ktlint:0.3.3\"", " ))", " .editorConfigOverride(mapOf(", - " \"ktlint_function_naming_ignore_when_annotated_with\" to \"Composable\",", + " \"ktlint_function_naming_ignore_when_annotated_with\" to \"Composable\"", " ))", " }", "}");