Skip to content

Use java 21 to build the library. Set compile target to 11 #275

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 4, 2025
Merged

Use java 21 to build the library. Set compile target to 11 #275

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .java-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
11
21
1 change: 1 addition & 0 deletions benchmark/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
plugins {
convention.kotlin
convention.`multiplatform-jvm`
alias(libs.plugins.kotlin.benchmark)
alias(libs.plugins.kotlin.allopen)
}
Expand Down
1 change: 0 additions & 1 deletion buildSrc/src/main/kotlin/convention.kotlin.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,4 @@ plugins {
}

kotlin {
jvmToolchain(11)
}
17 changes: 17 additions & 0 deletions buildSrc/src/main/kotlin/convention.multiplatform-jvm.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
id("convention.kotlin")
}

kotlin {
jvm {
testRuns["test"].executionTask.configure {
useJUnitPlatform()
}
compilerOptions {
jvmTarget.set(JvmTarget.JVM_11)
freeCompilerArgs.add("-Xjdk-release=11")
}
}
}
7 changes: 2 additions & 5 deletions ...n/convention.mutliplatform-lib.gradle.kts → ...n/convention.multiplatform-lib.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,13 @@ import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl

plugins {
id("convention.kotlin")
id("convention.multiplatform-jvm")
}

kotlin {
explicitApi()

jvm {
testRuns["test"].executionTask.configure {
useJUnitPlatform()
}
}
jvm()
js(IR) {
browser()
generateTypeScriptDefinitions()
Expand Down
0 ...convention.mutliplatform-tests.gradle.kts → ...convention.multiplatform-tests.gradle.kts
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions json-schema-validator-objects/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import org.jlleitschuh.gradle.ktlint.reporter.ReporterType

plugins {
convention.kotlin
convention.`mutliplatform-lib`
convention.`mutliplatform-tests`
convention.`multiplatform-lib`
convention.`multiplatform-tests`
alias(libs.plugins.kotlin.serialization)
alias(libs.plugins.kotest.multiplatform)
alias(libs.plugins.kover)
Expand Down
4 changes: 2 additions & 2 deletions json-schema-validator/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import org.jlleitschuh.gradle.ktlint.reporter.ReporterType

plugins {
convention.kotlin
convention.`mutliplatform-lib`
convention.`mutliplatform-tests`
convention.`multiplatform-lib`
convention.`multiplatform-tests`
alias(libs.plugins.kotlin.serialization)
alias(libs.plugins.kotest.multiplatform)
alias(libs.plugins.kover)
Expand Down
9 changes: 3 additions & 6 deletions test-suites/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ import tasks.GenerateRemoteSchemas

plugins {
convention.kotlin
convention.`mutliplatform-tests`
convention.`multiplatform-jvm`
convention.`multiplatform-tests`
alias(libs.plugins.kotlin.serialization)
alias(libs.plugins.kotest.multiplatform)
alias(libs.plugins.kover)
Expand All @@ -18,11 +19,7 @@ plugins {
kotlin {
explicitApi()

jvm {
testRuns["test"].executionTask.configure {
useJUnitPlatform()
}
}
jvm()
js(IR) {
nodejs()
}
Expand Down
Loading