From 2409243af4ae57b69fbb4720a216e34903f5d482 Mon Sep 17 00:00:00 2001 From: Goooler Date: Sat, 7 Nov 2026 09:23:13 +0800 Subject: [PATCH] Simplify Spotless configuratioin for rootProject --- .../spotless.spotless-conventions.gradle.kts | 27 +++++++++---------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/build-logic/src/main/kotlin/spotless.spotless-conventions.gradle.kts b/build-logic/src/main/kotlin/spotless.spotless-conventions.gradle.kts index 2b775d6048..c2f3c73f44 100644 --- a/build-logic/src/main/kotlin/spotless.spotless-conventions.gradle.kts +++ b/build-logic/src/main/kotlin/spotless.spotless-conventions.gradle.kts @@ -3,7 +3,18 @@ plugins { } spotless { - if (project != rootProject) { + if (project == rootProject) { + kotlin { + target("build-logic/src/**/*.kt", "*.kts", "build-logic/*.kts") + ktfmt(libs.ktfmt.get().version) + } + format("dotfiles") { + target(".gitignore", ".gitattributes", ".editorconfig") + leadingTabsToSpaces(2) + trimTrailingWhitespace() + endWithNewline() + } + } else { java { ratchetFrom("origin/main") bumpThisNumberIfACustomStepChanges(1) @@ -21,18 +32,4 @@ spotless { ) } } - kotlin { - target("build-logic/src/**/*.kt") - ktfmt(libs.ktfmt.get().version) - } - kotlinGradle { - target("*.gradle.kts", "build-logic/*.gradle.kts", "build-logic/src/**/*.gradle.kts") - ktfmt(libs.ktfmt.get().version) - } - format("dotfiles") { - target(".gitignore", ".gitattributes", ".editorconfig") - leadingTabsToSpaces(2) - trimTrailingWhitespace() - endWithNewline() - } }