Skip to content

Commit 4770b21

Browse files
authored
chore: migrate off of deprecated kotlinOptions API (#2003)
Necessary because when updating to Kotlin 2.2.0, the build starts failing.
1 parent 008aa34 commit 4770b21

2 files changed

Lines changed: 8 additions & 10 deletions

File tree

buildSrc/src/main/kotlin/buildsrc/convention/kotlin-jvm-server.gradle.kts

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package buildsrc.convention
22

3+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
34
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
45

56
plugins {
@@ -36,13 +37,11 @@ fun JavaToolchainSpec.requiredJdkVersion() {
3637
}
3738

3839
tasks.withType<KotlinCompile> {
39-
kotlinOptions {
40-
jvmTarget = "17"
40+
compilerOptions {
41+
jvmTarget.set(JvmTarget.JVM_17)
4142

42-
allWarningsAsErrors = true
43-
}
43+
allWarningsAsErrors.set(true)
4444

45-
compilerOptions {
4645
freeCompilerArgs.addAll(
4746
"-opt-in=kotlin.ExperimentalStdlibApi",
4847
"-opt-in=kotlin.time.ExperimentalTime",

buildSrc/src/main/kotlin/buildsrc/convention/kotlin-jvm.gradle.kts

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package buildsrc.convention
22

3+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
34
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
45

56
plugins {
@@ -36,14 +37,12 @@ fun JavaToolchainSpec.requiredJdkVersion() {
3637
}
3738

3839
tasks.withType<KotlinCompile> {
39-
kotlinOptions {
40+
compilerOptions {
4041
// It's available without extra setup on GitHub Actions runners.
41-
jvmTarget = "11"
42+
jvmTarget.set(JvmTarget.JVM_11)
4243

43-
allWarningsAsErrors = true
44-
}
44+
allWarningsAsErrors.set(true)
4545

46-
compilerOptions {
4746
freeCompilerArgs.addAll(
4847
"-opt-in=kotlin.ExperimentalStdlibApi",
4948
"-opt-in=kotlin.time.ExperimentalTime",

0 commit comments

Comments
 (0)