Switch to org.jlleitschuh.gradle.ktlint plugin

tbroyer · May 21, 2020 · c4da62c · c4da62c
1 parent ff99d5a
commit c4da62c
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 23 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -4,6 +4,7 @@ import nl.javadude.gradle.plugins.license.LicenseExtension
 plugins {
     base
     id("com.github.sherter.google-java-format") version "0.8"
+    id("org.jlleitschuh.gradle.ktlint") version "9.2.1"
 
     id("com.github.hierynomus.license") version "0.15.0" apply false
     // Used by "local.java-library"
@@ -36,29 +37,12 @@ subprojects {
     }
 }
 
-val ktlint by configurations.creating
+allprojects {
+    apply(plugin = "org.jlleitschuh.gradle.ktlint")
 
-dependencies {
-    ktlint("com.pinterest:ktlint:0.36.0")
-}
-
-tasks {
-    val verifyKtlint by registering(JavaExec::class) {
-        description = "Check Kotlin code style."
-        classpath = ktlint
-        main = "com.pinterest.ktlint.Main"
-        args("**/*.gradle.kts", "**/*.kt", "!**/build/**")
-    }
-
-    check {
-        dependsOn(verifyKtlint)
-    }
-
-    register("ktlint", JavaExec::class) {
-        description = "Fix Kotlin code style violations."
-        classpath = ktlint
-        main = "com.pinterest.ktlint.Main"
-        args("-F", "**/*.gradle.kts", "**/*.kt", "!**/build/**")
+    ktlint {
+        version.set("0.36.0")
+        enableExperimentalRules.set(true)
     }
 }
 

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -1,5 +1,6 @@
 plugins {
     `kotlin-dsl`
+    id("org.jlleitschuh.gradle.ktlint") version "9.2.1"
 }
 
 repositories {
@@ -9,3 +10,18 @@ repositories {
 kotlinDslPluginOptions {
     experimentalWarning.set(false)
 }
+
+ktlint {
+    version.set("0.36.0")
+    enableExperimentalRules.set(true)
+    filter {
+        exclude {
+            it.file in fileTree(buildDir)
+        }
+    }
+}
+
+dependencies {
+    // Workaround for https://github.com/JLLeitschuh/ktlint-gradle/issues/239
+    runtimeOnly(embeddedKotlin("gradle-plugin"))
+}
diff --git a/...net/ltgt/gradle/incap/integTest/IncrementalAnnotationProcessorProcessorIntegrationTest.kt b/...net/ltgt/gradle/incap/integTest/IncrementalAnnotationProcessorProcessorIntegrationTest.kt
@@ -98,7 +98,8 @@ class IncrementalAnnotationProcessorProcessorIntegrationTest {
         ).run {
             parentFile.mkdirs()
             writeText(
-                """package ${packageNames.joinToString(separator = ".")};
+                """
+                package ${packageNames.joinToString(separator = ".")};
                 import static net.ltgt.gradle.incap.IncrementalAnnotationProcessorType.*;
 
                 import java.util.Set;