also lint build scripts

bnorm · Apr 7, 2023 · 5804b15 · 5804b15
1 parent a8073b0
commit 5804b15
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 2 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
   id("org.jetbrains.dokka") version "1.8.10" apply false
   id("com.gradle.plugin-publish") version "1.1.0" apply false
   id("com.github.gmazzo.buildconfig") version "3.1.0" apply false
-  id("org.jmailen.kotlinter") version "3.14.0" apply false
+  id("org.jmailen.kotlinter") version "3.14.0"
 }
 
 allprojects {

diff --git a/kotlin-power-assert-gradle/build.gradle.kts b/kotlin-power-assert-gradle/build.gradle.kts
@@ -1,4 +1,6 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+import org.jmailen.gradle.kotlinter.tasks.FormatTask
+import org.jmailen.gradle.kotlinter.tasks.LintTask
 
 plugins {
   id("java-gradle-plugin")
@@ -55,3 +57,14 @@ publishing {
     }
   }
 }
+tasks.register<FormatTask>("formatBuildscripts") {
+  group = "verification"
+  source(layout.projectDirectory.asFileTree.matching { include("**.kts") })
+}
+tasks.register<LintTask>("lintBuildscripts") {
+  group = "verification"
+  source(layout.projectDirectory.asFileTree.matching { include("**.kts") })
+}
+
+tasks.named("lintKotlin") { dependsOn("lintBuildscripts") }
+tasks.named("formatKotlin") { dependsOn("formatBuildscripts") }
diff --git a/kotlin-power-assert-plugin/build.gradle.kts b/kotlin-power-assert-plugin/build.gradle.kts
@@ -1,4 +1,6 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+import org.jmailen.gradle.kotlinter.tasks.FormatTask
+import org.jmailen.gradle.kotlinter.tasks.LintTask
 
 plugins {
   kotlin("jvm")
@@ -24,7 +26,7 @@ dependencies {
 
 tasks.withType<KotlinCompile> {
   kotlinOptions.jvmTarget = "1.8"
-  kotlinOptions.freeCompilerArgs = listOf("-opt-in=org.jetbrains.kotlin.backend.common.extensions.FirIncompatiblePluginAPI","-opt-in=org.jetbrains.kotlin.compiler.plugin.ExperimentalCompilerApi")
+  kotlinOptions.freeCompilerArgs = listOf("-opt-in=org.jetbrains.kotlin.backend.common.extensions.FirIncompatiblePluginAPI", "-opt-in=org.jetbrains.kotlin.compiler.plugin.ExperimentalCompilerApi")
 }
 tasks.withType<JavaCompile> {
   sourceCompatibility = "1.8"
@@ -115,3 +117,14 @@ publishing {
     }
   }
 }
+tasks.register<FormatTask>("formatBuildscripts") {
+  group = "verification"
+  source(layout.projectDirectory.asFileTree.matching { include("**.kts") })
+}
+tasks.register<LintTask>("lintBuildscripts") {
+  group = "verification"
+  source(layout.projectDirectory.asFileTree.matching { include("**.kts") })
+}
+
+tasks.named("lintKotlin") { dependsOn("lintBuildscripts") }
+tasks.named("formatKotlin") { dependsOn("formatBuildscripts") }
diff --git a/...c/test/kotlin/com/bnorm/power/compiler.kt → ...c/test/kotlin/com/bnorm/power/Compiler.kt b/...c/test/kotlin/com/bnorm/power/compiler.kt → ...c/test/kotlin/com/bnorm/power/Compiler.kt