Skip to content

Commit d5771ba

Browse files
OptimumCodeOptimumCode
committed
Extract common logic into conventional plugins
1 parent 34ba3ba commit d5771ba

File tree

11 files changed

+139
-220
lines changed

11 files changed

+139
-220
lines changed

‎benchmark/build.gradle.kts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
alias(libs.plugins.kotlin.mutliplatform)
2+
convention.kotlin
33
alias(libs.plugins.kotlin.benchmark)
44
alias(libs.plugins.kotlin.allopen)
55
}
@@ -9,7 +9,6 @@ allOpen {
99
}
1010

1111
kotlin {
12-
jvmToolchain(11)
1312
jvm()
1413
macosX64()
1514
macosArm64()

‎build.gradle.kts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
plugins {
2-
alias(libs.plugins.kotlin.mutliplatform) apply false
32
alias(libs.plugins.kotlin.binaryCompatibility)
43
alias(libs.plugins.nexus.publish)
54
convention.properties

‎buildSrc/build.gradle.kts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,8 @@ plugins {
44

55
repositories {
66
gradlePluginPortal()
7+
}
8+
9+
dependencies {
10+
implementation(libs.kotlin.gradle.plugin)
711
}

‎buildSrc/settings.gradle.kts‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,9 @@
1-
rootProject.name = "buildSrc"
1+
rootProject.name = "buildSrc"
2+
3+
dependencyResolutionManagement {
4+
versionCatalogs {
5+
create("libs") {
6+
from(files("../gradle/libs.versions.toml"))
7+
}
8+
}
9+
}

‎buildSrc/src/main/kotlin/convention.kotlin.gradle.kts‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
plugins {
2+
kotlin("multiplatform")
3+
}
4+
5+
kotlin {
6+
jvmToolchain(11)
7+
}

‎buildSrc/src/main/kotlin/convention.mutliplatform-lib.gradle.kts‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
2+
3+
plugins {
4+
id("convention.kotlin")
5+
}
6+
7+
kotlin {
8+
explicitApi()
9+
10+
jvm {
11+
testRuns["test"].executionTask.configure {
12+
useJUnitPlatform()
13+
}
14+
}
15+
js(IR) {
16+
browser()
17+
generateTypeScriptDefinitions()
18+
nodejs()
19+
}
20+
21+
@OptIn(ExperimentalWasmDsl::class)
22+
wasmJs {
23+
// The wasmJsBrowserTest prints all executed tests as one unformatted string
24+
// Have not found a way to suppress printing all this into console
25+
browser()
26+
nodejs()
27+
}
28+
29+
applyDefaultHierarchyTemplate()
30+
31+
macosX64()
32+
macosArm64()
33+
iosX64()
34+
iosArm64()
35+
iosSimulatorArm64()
36+
37+
linuxX64()
38+
linuxArm64()
39+
40+
mingwX64()
41+
}

‎buildSrc/src/main/kotlin/convention.mutliplatform-tests.gradle.kts‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
import org.jetbrains.kotlin.gradle.plugin.KotlinTargetWithTests
2+
3+
plugins {
4+
id("convention.kotlin")
5+
}
6+
7+
val macOsAllTest by tasks.register("macOsAllTest") {
8+
group = "verification"
9+
description = "runs all tests for MacOS and IOS targets"
10+
}
11+
12+
val windowsAllTest by tasks.register("windowsAllTest") {
13+
group = "verification"
14+
description = "runs all tests for Windows targets"
15+
}
16+
val linuxAllTest by tasks.register("linuxAllTest") {
17+
group = "verification"
18+
description = "runs all tests for Linux targets"
19+
}
20+
21+
kotlin.targets.configureEach {
22+
if (this !is KotlinTargetWithTests<*, *>) {
23+
return@configureEach
24+
}
25+
when {
26+
name.startsWith("ios") || name.startsWith("macos") -> {
27+
macOsAllTest.dependsOn(tasks.named("${name}Test"))
28+
}
29+
name.startsWith("mingw") -> {
30+
windowsAllTest.dependsOn(tasks.named("${name}Test"))
31+
}
32+
else -> {
33+
linuxAllTest.dependsOn(tasks.named("${name}Test"))
34+
}
35+
}
36+
}

‎gradle/libs.versions.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ networknt-validator = { group = "com.networknt", name = "json-schema-validator",
4242
kotlin-codepoints = { group = "de.cketti.unicode", name = "kotlin-codepoints", version = "0.9.0" }
4343
normalize = { group = "com.doist.x", name = "normalize", version = "1.1.1" }
4444
karacteristics = { group = "io.github.optimumcode", name = "karacteristics", version = "0.0.4" }
45+
kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
4546

4647
[bundles]
4748
openapi = ["openapi-validator", "openapi-interfaces", "openapi-jackson"]

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

Lines changed: 10 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
import io.gitlab.arturbosch.detekt.Detekt
44
import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
55
import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
6-
import org.jetbrains.kotlin.gradle.plugin.KotlinTarget
7-
import org.jetbrains.kotlin.gradle.plugin.KotlinTargetWithTests
86
import org.jlleitschuh.gradle.ktlint.reporter.ReporterType
97

108
plugins {
11-
alias(libs.plugins.kotlin.mutliplatform)
9+
convention.kotlin
10+
convention.`mutliplatform-lib`
11+
convention.`mutliplatform-tests`
1212
alias(libs.plugins.kotlin.serialization)
1313
alias(libs.plugins.kotest.multiplatform)
1414
alias(libs.plugins.kover)
@@ -18,51 +18,10 @@ plugins {
1818
}
1919

2020
kotlin {
21-
explicitApi()
22-
2321
@OptIn(ExperimentalKotlinGradlePluginApi::class)
2422
compilerOptions {
2523
freeCompilerArgs.add("-opt-in=io.github.optimumcode.json.schema.ExperimentalApi")
2624
}
27-
jvmToolchain(11)
28-
jvm {
29-
testRuns["test"].executionTask.configure {
30-
useJUnitPlatform()
31-
}
32-
}
33-
js(IR) {
34-
browser()
35-
generateTypeScriptDefinitions()
36-
nodejs()
37-
}
38-
wasmJs {
39-
// The wasmJsBrowserTest prints all executed tests as one unformatted string
40-
// Have not found a way to suppress printing all this into console
41-
browser()
42-
nodejs()
43-
}
44-
45-
applyDefaultHierarchyTemplate()
46-
47-
val macOsTargets =
48-
listOf<KotlinTarget>(
49-
macosX64(),
50-
macosArm64(),
51-
iosX64(),
52-
iosArm64(),
53-
iosSimulatorArm64(),
54-
)
55-
56-
val linuxTargets =
57-
listOf<KotlinTarget>(
58-
linuxX64(),
59-
linuxArm64(),
60-
)
61-
62-
val windowsTargets =
63-
listOf<KotlinTarget>(
64-
mingwX64(),
65-
)
6625

6726
sourceSets {
6827
commonMain {
@@ -101,34 +60,6 @@ kotlin {
10160
}
10261
}
10362
}
104-
105-
afterEvaluate {
106-
fun Task.dependsOnTargetTests(targets: List<KotlinTarget>) {
107-
targets.forEach {
108-
if (it is KotlinTargetWithTests<*, *>) {
109-
dependsOn(tasks.getByName("${it.name}Test"))
110-
}
111-
}
112-
}
113-
tasks.register("macOsAllTest") {
114-
group = "verification"
115-
description = "runs all tests for MacOS and IOS targets"
116-
dependsOnTargetTests(macOsTargets)
117-
}
118-
tasks.register("windowsAllTest") {
119-
group = "verification"
120-
description = "runs all tests for Windows targets"
121-
dependsOnTargetTests(windowsTargets)
122-
}
123-
tasks.register("linuxAllTest") {
124-
group = "verification"
125-
description = "runs all tests for Linux targets"
126-
dependsOnTargetTests(linuxTargets)
127-
dependsOn(tasks.getByName("jvmTest"))
128-
dependsOn(tasks.getByName("jsTest"))
129-
dependsOn(tasks.getByName("wasmJsTest"))
130-
}
131-
}
13263
}
13364

13465
ktlint {
@@ -138,12 +69,12 @@ ktlint {
13869
}
13970
}
14071

141-
afterEvaluate {
142-
val detektAllTask by tasks.register("detektAll") {
143-
dependsOn(tasks.withType<Detekt>())
144-
}
72+
val detektAllTask by tasks.register("detektAll")
14573

146-
tasks.named("check").configure {
147-
dependsOn(detektAllTask)
148-
}
74+
tasks.named("check").configure {
75+
dependsOn(detektAllTask)
76+
}
77+
78+
tasks.withType<Detekt> {
79+
detektAllTask.dependsOn(this)
14980
}

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

Lines changed: 10 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
import io.gitlab.arturbosch.detekt.Detekt
44
import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
55
import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
6-
import org.jetbrains.kotlin.gradle.plugin.KotlinTarget
7-
import org.jetbrains.kotlin.gradle.plugin.KotlinTargetWithTests
86
import org.jlleitschuh.gradle.ktlint.reporter.ReporterType
97

108
plugins {
11-
alias(libs.plugins.kotlin.mutliplatform)
9+
convention.kotlin
10+
convention.`mutliplatform-lib`
11+
convention.`mutliplatform-tests`
1212
alias(libs.plugins.kotlin.serialization)
1313
alias(libs.plugins.kotest.multiplatform)
1414
alias(libs.plugins.kover)
@@ -18,51 +18,10 @@ plugins {
1818
}
1919

2020
kotlin {
21-
explicitApi()
22-
2321
@OptIn(ExperimentalKotlinGradlePluginApi::class)
2422
compilerOptions {
2523
freeCompilerArgs.add("-opt-in=io.github.optimumcode.json.schema.ExperimentalApi")
2624
}
27-
jvmToolchain(11)
28-
jvm {
29-
testRuns["test"].executionTask.configure {
30-
useJUnitPlatform()
31-
}
32-
}
33-
js(IR) {
34-
browser()
35-
generateTypeScriptDefinitions()
36-
nodejs()
37-
}
38-
wasmJs {
39-
// The wasmJsBrowserTest prints all executed tests as one unformatted string
40-
// Have not found a way to suppress printing all this into console
41-
browser()
42-
nodejs()
43-
}
44-
45-
applyDefaultHierarchyTemplate()
46-
47-
val macOsTargets =
48-
listOf<KotlinTarget>(
49-
macosX64(),
50-
macosArm64(),
51-
iosX64(),
52-
iosArm64(),
53-
iosSimulatorArm64(),
54-
)
55-
56-
val linuxTargets =
57-
listOf<KotlinTarget>(
58-
linuxX64(),
59-
linuxArm64(),
60-
)
61-
62-
val windowsTargets =
63-
listOf<KotlinTarget>(
64-
mingwX64(),
65-
)
6625

6726
sourceSets {
6827
val commonMain by getting {
@@ -115,34 +74,6 @@ kotlin {
11574
}
11675
}
11776
}
118-
119-
afterEvaluate {
120-
fun Task.dependsOnTargetTests(targets: List<KotlinTarget>) {
121-
targets.forEach {
122-
if (it is KotlinTargetWithTests<*, *>) {
123-
dependsOn(tasks.getByName("${it.name}Test"))
124-
}
125-
}
126-
}
127-
tasks.register("macOsAllTest") {
128-
group = "verification"
129-
description = "runs all tests for MacOS and IOS targets"
130-
dependsOnTargetTests(macOsTargets)
131-
}
132-
tasks.register("windowsAllTest") {
133-
group = "verification"
134-
description = "runs all tests for Windows targets"
135-
dependsOnTargetTests(windowsTargets)
136-
}
137-
tasks.register("linuxAllTest") {
138-
group = "verification"
139-
description = "runs all tests for Linux targets"
140-
dependsOnTargetTests(linuxTargets)
141-
dependsOn(tasks.getByName("jvmTest"))
142-
dependsOn(tasks.getByName("jsTest"))
143-
dependsOn(tasks.getByName("wasmJsTest"))
144-
}
145-
}
14677
}
14778

14879
ktlint {
@@ -152,12 +83,12 @@ ktlint {
15283
}
15384
}
15485

155-
afterEvaluate {
156-
val detektAllTask by tasks.register("detektAll") {
157-
dependsOn(tasks.withType<Detekt>())
158-
}
86+
val detektAllTask by tasks.register("detektAll")
15987

160-
tasks.named("check").configure {
161-
dependsOn(detektAllTask)
162-
}
88+
tasks.named("check").configure {
89+
dependsOn(detektAllTask)
90+
}
91+
92+
tasks.withType<Detekt> {
93+
detektAllTask.dependsOn(this)
16394
}

0 commit comments

Comments
 (0)