Skip to content

Commit 52a239f

Browse files
committed
move detekt and ktlint configuration into convention plugin
1 parent 5c995d5 commit 52a239f

File tree

6 files changed

+29
-75
lines changed

6 files changed

+29
-75
lines changed

buildSrc/build.gradle.kts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,6 @@ dependencies {
1010
implementation(libs.kotlin.gradle.plugin)
1111
implementation(libs.sigstore.gradle.plugin)
1212
implementation(libs.maven.publish.gradle.plugin)
13+
implementation(libs.detekt.gradle.plugin)
14+
implementation(libs.ktlint.gradle.plugin)
1315
}

buildSrc/src/main/kotlin/convention.multiplatform-lib.gradle.kts

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
2+
import io.gitlab.arturbosch.detekt.Detekt
3+
import org.jlleitschuh.gradle.ktlint.reporter.ReporterType
24

35
plugins {
46
id("convention.kotlin")
57
id("convention.multiplatform-jvm")
8+
id("io.gitlab.arturbosch.detekt")
9+
id("org.jlleitschuh.gradle.ktlint")
610
}
711

812
kotlin {
@@ -35,4 +39,25 @@ kotlin {
3539
linuxArm64()
3640

3741
mingwX64()
42+
}
43+
44+
ktlint {
45+
version.set("1.1.0")
46+
reporters {
47+
reporter(ReporterType.HTML)
48+
}
49+
filter {
50+
exclude("**/kotest/**/kotest.kt")
51+
}
52+
}
53+
54+
val detektAllTask by tasks.register("detektAll")
55+
56+
tasks.named("check").configure {
57+
dependsOn(detektAllTask)
58+
}
59+
60+
tasks.withType<Detekt> {
61+
detektAllTask.dependsOn(this)
62+
exclude("**/kotest/**/kotest.kt")
3863
}

gradle/libs.versions.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ karacteristics = { group = "io.github.optimumcode", name = "karacteristics", ver
4444
kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
4545
sigstore-gradle-plugin = { module = "dev.sigstore:sigstore-gradle-sign-plugin", version = "1.3.0"}
4646
maven-publish-gradle-plugin = { module = "com.vanniktech.maven.publish:com.vanniktech.maven.publish.gradle.plugin", version = "0.34.0"}
47+
detekt-gradle-plugin = { module = "io.gitlab.arturbosch.detekt:detekt-gradle-plugin", version.ref = "detekt" }
48+
ktlint-gradle-plugin = { module = "org.jlleitschuh.gradle.ktlint:org.jlleitschuh.gradle.ktlint.gradle.plugin", version = "13.1.0" }
4749

4850
[bundles]
4951
openapi = ["openapi-validator", "openapi-interfaces", "openapi-jackson"]

json-schema-validator-objects/build.gradle.kts

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
@file:OptIn(ExperimentalWasmDsl::class)
22

3-
import io.gitlab.arturbosch.detekt.Detekt
43
import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
54
import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
6-
import org.jlleitschuh.gradle.ktlint.reporter.ReporterType
75

86
plugins {
97
convention.kotlin
@@ -13,8 +11,6 @@ plugins {
1311
alias(libs.plugins.google.ksp)
1412
alias(libs.plugins.kotest.multiplatform)
1513
alias(libs.plugins.kover)
16-
alias(libs.plugins.detekt)
17-
alias(libs.plugins.ktlint)
1814
convention.publication
1915
}
2016

@@ -61,25 +57,4 @@ kotlin {
6157
}
6258
}
6359
}
64-
}
65-
66-
ktlint {
67-
version.set(libs.versions.ktlint)
68-
reporters {
69-
reporter(ReporterType.HTML)
70-
}
71-
filter {
72-
exclude("**/kotest/**/kotest.kt")
73-
}
74-
}
75-
76-
val detektAllTask by tasks.register("detektAll")
77-
78-
tasks.named("check").configure {
79-
dependsOn(detektAllTask)
80-
}
81-
82-
tasks.withType<Detekt> {
83-
detektAllTask.dependsOn(this)
84-
exclude("**/kotest/**/kotest.kt")
8560
}

json-schema-validator/build.gradle.kts

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
@file:OptIn(ExperimentalWasmDsl::class)
22

3-
import io.gitlab.arturbosch.detekt.Detekt
43
import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
54
import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
6-
import org.jlleitschuh.gradle.ktlint.reporter.ReporterType
75

86
plugins {
97
convention.kotlin
@@ -13,8 +11,6 @@ plugins {
1311
alias(libs.plugins.google.ksp)
1412
alias(libs.plugins.kotest.multiplatform)
1513
alias(libs.plugins.kover)
16-
alias(libs.plugins.detekt)
17-
alias(libs.plugins.ktlint)
1814
convention.publication
1915
}
2016

@@ -54,25 +50,4 @@ kotlin {
5450
}
5551
}
5652
}
57-
}
58-
59-
ktlint {
60-
version.set(libs.versions.ktlint)
61-
reporters {
62-
reporter(ReporterType.HTML)
63-
}
64-
filter {
65-
exclude("**/kotest/**/kotest.kt")
66-
}
67-
}
68-
69-
val detektAllTask by tasks.register("detektAll")
70-
71-
tasks.named("check").configure {
72-
dependsOn(detektAllTask)
73-
}
74-
75-
tasks.withType<Detekt> {
76-
detektAllTask.dependsOn(this)
77-
exclude("**/kotest/**/kotest.kt")
7853
}

test-suites/build.gradle.kts

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
import io.gitlab.arturbosch.detekt.Detekt
21
import org.jetbrains.kotlin.gradle.targets.js.testing.KotlinJsTest
32
import org.jetbrains.kotlin.gradle.targets.native.tasks.KotlinNativeSimulatorTest
43
import org.jetbrains.kotlin.gradle.targets.native.tasks.KotlinNativeTest
5-
import org.jlleitschuh.gradle.ktlint.reporter.ReporterType
64
import tasks.GenerateRemoteSchemas
75

86
plugins {
@@ -13,8 +11,6 @@ plugins {
1311
alias(libs.plugins.google.ksp)
1412
alias(libs.plugins.kotest.multiplatform)
1513
alias(libs.plugins.kover)
16-
alias(libs.plugins.detekt)
17-
alias(libs.plugins.ktlint)
1814
}
1915

2016
kotlin {
@@ -105,25 +101,4 @@ tasks.withType<Test> {
105101
doFirst {
106102
environment("REMOTES_SCHEMAS_JSON", generateRemoteSchemas.flatMap { it.remotesFile }.get().asFile.absolutePath)
107103
}
108-
}
109-
110-
ktlint {
111-
version.set(libs.versions.ktlint)
112-
reporters {
113-
reporter(ReporterType.HTML)
114-
}
115-
filter {
116-
exclude("**/kotest/**/kotest.kt")
117-
}
118-
}
119-
120-
val detektAllTask by tasks.register("detektAll")
121-
122-
tasks.named("check").configure {
123-
dependsOn(detektAllTask)
124-
}
125-
126-
tasks.withType<Detekt> {
127-
detektAllTask.dependsOn(this)
128-
exclude("**/kotest/**/kotest.kt")
129104
}

0 commit comments

Comments
 (0)