From 5804b1527bc36fdb2d26ce54e0350a3962aea4ef Mon Sep 17 00:00:00 2001 From: Christoph Sturm Date: Fri, 7 Apr 2023 11:22:38 +0200 Subject: [PATCH] also lint build scripts --- build.gradle.kts | 2 +- kotlin-power-assert-gradle/build.gradle.kts | 13 +++++++++++++ kotlin-power-assert-plugin/build.gradle.kts | 15 ++++++++++++++- .../com/bnorm/power/{compiler.kt => Compiler.kt} | 0 4 files changed, 28 insertions(+), 2 deletions(-) rename kotlin-power-assert-plugin/src/test/kotlin/com/bnorm/power/{compiler.kt => Compiler.kt} (100%) diff --git a/build.gradle.kts b/build.gradle.kts index d441309..4023438 100644 --- 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 index 74952cd..d2b7219 100644 --- 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("formatBuildscripts") { + group = "verification" + source(layout.projectDirectory.asFileTree.matching { include("**.kts") }) +} +tasks.register("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 index 0e477dc..1e0ae65 100644 --- 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 { 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 { sourceCompatibility = "1.8" @@ -115,3 +117,14 @@ publishing { } } } +tasks.register("formatBuildscripts") { + group = "verification" + source(layout.projectDirectory.asFileTree.matching { include("**.kts") }) +} +tasks.register("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/src/test/kotlin/com/bnorm/power/compiler.kt b/kotlin-power-assert-plugin/src/test/kotlin/com/bnorm/power/Compiler.kt similarity index 100% rename from kotlin-power-assert-plugin/src/test/kotlin/com/bnorm/power/compiler.kt rename to kotlin-power-assert-plugin/src/test/kotlin/com/bnorm/power/Compiler.kt