Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ subprojects {
testCompileOnly("org.jetbrains:annotations:26.0.2")

// tests
testImplementation(platform("org.junit:junit-bom:5.14.2"))
testImplementation(platform("org.junit:junit-bom:6.0.2"))
testImplementation(group = "org.junit.jupiter", name = "junit-jupiter")
testRuntimeOnly(group = "org.junit.jupiter", name = "junit-jupiter-engine")
testRuntimeOnly(group = "org.junit.platform", name = "junit-platform-launcher")
Expand Down Expand Up @@ -105,6 +105,10 @@ subprojects {
finalizedBy(jacocoTestReport)
}

compileTestJava {
options.release = 17 // jdk 17 is baseline for junit v6
}

jacocoTestReport {
dependsOn(test)
reports.xml.required.set(true)
Expand Down
6 changes: 5 additions & 1 deletion core/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,16 @@ plugins {
dependencies {
api(project(":cache-api"))

testFixturesImplementation(platform("org.junit:junit-bom:5.14.2"))
testFixturesImplementation(platform("org.junit:junit-bom:6.0.2"))
testFixturesImplementation("org.junit.jupiter:junit-jupiter")
testFixturesRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
testFixturesImplementation("org.awaitility:awaitility:4.3.0")
}

tasks.compileTestFixturesJava {
options.release = 17 // jdk 17 is baseline for junit v6
}

publishing.publications.withType<MavenPublication> {
pom {
name.set("Xanthic - Core Module")
Expand Down
6 changes: 6 additions & 0 deletions kotlin/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,12 @@ tasks.withType<KotlinJvmCompile>().configureEach {
}
}

tasks.compileTestKotlin {
compilerOptions {
jvmTarget = JvmTarget.JVM_17 // jdk 17 is baseline for junit v6
}
}

tasks.kotlinSourcesJar {
// Workaround for https://youtrack.jetbrains.com/issue/KT-54207/ in order to restore reproducibility
enabled = false
Expand Down