Skip to content

Commit 4ba2f60

Browse files
committed
Bump Kotlin API and language version to 2.1
1 parent 0357283 commit 4ba2f60

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

gradle/plugins/common/src/main/kotlin/junitbuild.kotlin-library-conventions.gradle.kts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
2-
import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
2+
import org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_1
33
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
44

55
plugins {
@@ -16,7 +16,7 @@ val javaLibraryExtension = project.the<JavaLibraryExtension>()
1616
tasks.withType<KotlinCompile>().configureEach {
1717
compilerOptions {
1818
jvmTarget = javaLibraryExtension.mainJavaVersion.map { JvmTarget.fromTarget(it.toString()) }
19-
apiVersion = KotlinVersion.fromVersion("1.6")
19+
apiVersion = KOTLIN_2_1
2020
languageVersion = apiVersion
2121
allWarningsAsErrors.convention(true)
2222
javaParameters = true

junit-jupiter-api/junit-jupiter-api.gradle.kts

+4
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@ dependencies {
2323
}
2424

2525
tasks {
26+
compileKotlin {
27+
// https://github.com/junit-team/junit5/issues/4371
28+
compilerOptions.allWarningsAsErrors = false
29+
}
2630
jar {
2731
bundle {
2832
val version = project.version

platform-tooling-support-tests/projects/gradle-kotlin-extensions/build.gradle.kts

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ java {
2727
tasks.withType<KotlinCompile>().configureEach {
2828
kotlinOptions {
2929
jvmTarget = "17"
30-
apiVersion = "1.6"
31-
languageVersion = "1.6"
30+
apiVersion = "2.1"
31+
languageVersion = "2.1"
3232
}
3333
}
3434

0 commit comments

Comments
 (0)