Skip to content

Commit 9d86f57

Browse files
authored
Use java 21 to build the library. Set compile target to 11 (#275)
1 parent 378ab73 commit 9d86f57

File tree

9 files changed

+28
-17
lines changed

9 files changed

+28
-17
lines changed

.java-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
11
1+
21

benchmark/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
plugins {
22
convention.kotlin
3+
convention.`multiplatform-jvm`
34
alias(libs.plugins.kotlin.benchmark)
45
alias(libs.plugins.kotlin.allopen)
56
}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,4 @@ plugins {
33
}
44

55
kotlin {
6-
jvmToolchain(11)
76
}
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
2+
3+
plugins {
4+
id("convention.kotlin")
5+
}
6+
7+
kotlin {
8+
jvm {
9+
testRuns["test"].executionTask.configure {
10+
useJUnitPlatform()
11+
}
12+
compilerOptions {
13+
jvmTarget.set(JvmTarget.JVM_11)
14+
freeCompilerArgs.add("-Xjdk-release=11")
15+
}
16+
}
17+
}

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,13 @@ import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
22

33
plugins {
44
id("convention.kotlin")
5+
id("convention.multiplatform-jvm")
56
}
67

78
kotlin {
89
explicitApi()
910

10-
jvm {
11-
testRuns["test"].executionTask.configure {
12-
useJUnitPlatform()
13-
}
14-
}
11+
jvm()
1512
js(IR) {
1613
browser()
1714
generateTypeScriptDefinitions()

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import org.jlleitschuh.gradle.ktlint.reporter.ReporterType
77

88
plugins {
99
convention.kotlin
10-
convention.`mutliplatform-lib`
11-
convention.`mutliplatform-tests`
10+
convention.`multiplatform-lib`
11+
convention.`multiplatform-tests`
1212
alias(libs.plugins.kotlin.serialization)
1313
alias(libs.plugins.kotest.multiplatform)
1414
alias(libs.plugins.kover)

json-schema-validator/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import org.jlleitschuh.gradle.ktlint.reporter.ReporterType
77

88
plugins {
99
convention.kotlin
10-
convention.`mutliplatform-lib`
11-
convention.`mutliplatform-tests`
10+
convention.`multiplatform-lib`
11+
convention.`multiplatform-tests`
1212
alias(libs.plugins.kotlin.serialization)
1313
alias(libs.plugins.kotest.multiplatform)
1414
alias(libs.plugins.kover)

test-suites/build.gradle.kts

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ import tasks.GenerateRemoteSchemas
77

88
plugins {
99
convention.kotlin
10-
convention.`mutliplatform-tests`
10+
convention.`multiplatform-jvm`
11+
convention.`multiplatform-tests`
1112
alias(libs.plugins.kotlin.serialization)
1213
alias(libs.plugins.kotest.multiplatform)
1314
alias(libs.plugins.kover)
@@ -18,11 +19,7 @@ plugins {
1819
kotlin {
1920
explicitApi()
2021

21-
jvm {
22-
testRuns["test"].executionTask.configure {
23-
useJUnitPlatform()
24-
}
25-
}
22+
jvm()
2623
js(IR) {
2724
nodejs()
2825
}

0 commit comments

Comments
 (0)