Move applying Ktlint to each subproject.

Signed-off-by: Kenneth J. Shackleton <[email protected]>
bloomberg · Feb 4, 2024 · 8a77ed6 · 8a77ed6
1 parent 6962d8c
commit 8a77ed6
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 8 deletions.
diff --git a/AndroidCLI/build.gradle.kts b/AndroidCLI/build.gradle.kts
@@ -18,6 +18,7 @@ plugins {
     id("com.android.application")
     id("kotlin-android")
     id("io.gitlab.arturbosch.detekt")
+    id("org.jlleitschuh.gradle.ktlint")
 }
 
 repositories {

diff --git a/AndroidLibBenchmark/build.gradle.kts b/AndroidLibBenchmark/build.gradle.kts
@@ -19,6 +19,7 @@ plugins {
     id("kotlin-android")
     id("androidx.benchmark") version Versions.ANDROID_BENCHMARK.version
     id("io.gitlab.arturbosch.detekt")
+    id("org.jlleitschuh.gradle.ktlint")
 }
 
 repositories {

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -201,14 +201,13 @@ subprojects {
 }
 
 allprojects {
-    apply {
-        plugin("org.jlleitschuh.gradle.ktlint")
-    }
-    configure<KtlintExtension> {
-        version.set(Versions.KTLINT.version)
-        disabledRules.set(setOf("import-ordering", "indent", "wrapping"))
-        reporters {
-            reporter(ReporterType.HTML)
+    plugins.withId("org.jlleitschuh.gradle.ktlint") {
+        configure<KtlintExtension> {
+            version.set(Versions.KTLINT.version)
+            disabledRules.set(setOf("import-ordering", "indent", "wrapping"))
+            reporters {
+                reporter(ReporterType.HTML)
+            }
         }
     }
     tasks.withType<GenerateReportsTask>().configureEach {

diff --git a/selekt-android-lint/build.gradle.kts b/selekt-android-lint/build.gradle.kts
@@ -24,6 +24,7 @@ plugins {
     `maven-publish`
     signing
     id("io.gitlab.arturbosch.detekt")
+    id("org.jlleitschuh.gradle.ktlint")
 }
 
 java {

diff --git a/selekt-android/build.gradle.kts b/selekt-android/build.gradle.kts
@@ -24,6 +24,7 @@ plugins {
     signing
     id("org.jetbrains.kotlinx.kover")
     id("io.gitlab.arturbosch.detekt")
+    id("org.jlleitschuh.gradle.ktlint")
 }
 
 repositories {

diff --git a/selekt-api/build.gradle.kts b/selekt-api/build.gradle.kts
@@ -27,6 +27,7 @@ plugins {
     signing
     id("org.jetbrains.kotlinx.kover")
     id("io.gitlab.arturbosch.detekt")
+    id("org.jlleitschuh.gradle.ktlint")
 }
 
 java {

diff --git a/selekt-java/build.gradle.kts b/selekt-java/build.gradle.kts
@@ -32,6 +32,7 @@ plugins {
     signing
     id("bb-jmh")
     id("io.gitlab.arturbosch.detekt")
+    id("org.jlleitschuh.gradle.ktlint")
 }
 
 disableKotlinCompilerAssertions()

diff --git a/selekt-sqlite3-classes/build.gradle.kts b/selekt-sqlite3-classes/build.gradle.kts
@@ -23,6 +23,7 @@ plugins {
     `maven-publish`
     signing
     id("io.gitlab.arturbosch.detekt")
+    id("org.jlleitschuh.gradle.ktlint")
 }
 
 disableKotlinCompilerAssertions()
-Original file line number
+Diff line change
@@ Expand Up / @@ -24,6 +24,7 @@ plugins { @@
         `maven-publish`
         signing
         id("io.gitlab.arturbosch.detekt")
+        id("org.jlleitschuh.gradle.ktlint")
     }
     java {
@@ Expand Down @@