Skip to content

Commit c83aef9

Browse files
committed
move ktlint version to an object in buildSrc
1 parent 52a239f commit c83aef9

File tree

6 files changed

+33
-13
lines changed

6 files changed

+33
-13
lines changed

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ apiValidation {
1414

1515
tasks.register("printKtlintVersion") {
1616
doLast {
17-
println(libs.versions.ktlint.get())
17+
println(VersionConstants.KTLINT_VERSION)
1818
}
1919
}
2020

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
object VersionConstants {
2+
const val KTLINT_VERSION = "1.1.0"
3+
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
21
import io.gitlab.arturbosch.detekt.Detekt
2+
import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
33
import org.jlleitschuh.gradle.ktlint.reporter.ReporterType
44

55
plugins {
@@ -42,7 +42,7 @@ kotlin {
4242
}
4343

4444
ktlint {
45-
version.set("1.1.0")
45+
version.set(VersionConstants.KTLINT_VERSION)
4646
reporters {
4747
reporter(ReporterType.HTML)
4848
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,4 +59,4 @@ mavenPublishing {
5959
url.set("https://github.com/OptimumCode/json-schema-validator")
6060
}
6161
}
62-
}
62+
}

gradle/libs.versions.toml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
kotlin = "2.2.21"
33
kotest = "6.0.4"
44
detekt = "1.23.8"
5-
ktlint = "1.1.0"
65
okio = "3.15.0"
76
serialization = "1.8.1"
87
benchmark = "0.4.14"
@@ -16,8 +15,6 @@ kotlin-allopen = { id = "org.jetbrains.kotlin.plugin.allopen", version.ref = "ko
1615
kotest-multiplatform = { id = "io.kotest", version.ref = "kotest" }
1716
google-ksp = { id = "com.google.devtools.ksp", version = "2.3.0" }
1817
kover = { id = "org.jetbrains.kotlinx.kover", version = "0.9.1" }
19-
detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" }
20-
ktlint = { id = "org.jlleitschuh.gradle.ktlint", version = "13.1.0" }
2118
kotlin-binaryCompatibility = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version = "0.18.1" }
2219

2320
[libraries]

test-suites/build.gradle.kts

Lines changed: 26 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,13 @@ tasks.withType<KotlinJsTest> {
7474
doFirst {
7575
// This is used to pass the right location for Node.js test
7676
environment("TEST_SUITES_DIR", "$projectDir/schema-test-suite/tests")
77-
environment("REMOTES_SCHEMAS_JSON", generateRemoteSchemas.flatMap { it.remotesFile }.get().asFile.absolutePath)
77+
environment(
78+
"REMOTES_SCHEMAS_JSON",
79+
generateRemoteSchemas
80+
.flatMap { it.remotesFile }
81+
.get()
82+
.asFile.absolutePath,
83+
)
7884
}
7985
}
8086

@@ -84,21 +90,35 @@ tasks.withType<KotlinNativeSimulatorTest> {
8490
environment("SIMCTL_CHILD_TEST_SUITES_DIR", "$projectDir/schema-test-suite/tests")
8591
environment(
8692
"SIMCTL_CHILD_REMOTES_SCHEMAS_JSON",
87-
generateRemoteSchemas.flatMap {
88-
it.remotesFile
89-
}.get().asFile.absolutePath,
93+
generateRemoteSchemas
94+
.flatMap {
95+
it.remotesFile
96+
}.get()
97+
.asFile.absolutePath,
9098
)
9199
}
92100
}
93101

94102
tasks.withType<KotlinNativeTest> {
95103
doFirst {
96-
environment("REMOTES_SCHEMAS_JSON", generateRemoteSchemas.flatMap { it.remotesFile }.get().asFile.absolutePath)
104+
environment(
105+
"REMOTES_SCHEMAS_JSON",
106+
generateRemoteSchemas
107+
.flatMap { it.remotesFile }
108+
.get()
109+
.asFile.absolutePath,
110+
)
97111
}
98112
}
99113

100114
tasks.withType<Test> {
101115
doFirst {
102-
environment("REMOTES_SCHEMAS_JSON", generateRemoteSchemas.flatMap { it.remotesFile }.get().asFile.absolutePath)
116+
environment(
117+
"REMOTES_SCHEMAS_JSON",
118+
generateRemoteSchemas
119+
.flatMap { it.remotesFile }
120+
.get()
121+
.asFile.absolutePath,
122+
)
103123
}
104124
}

0 commit comments

Comments
 (0)