Skip to content

Commit 5be47cb

Browse files
committed
migrated deprecated kotlinOptions to compilerOptions
1 parent 231ed08 commit 5be47cb

File tree

8 files changed

+34
-18
lines changed

8 files changed

+34
-18
lines changed

build.gradle.kts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask
22
import com.github.gmazzo.buildconfig.BuildConfigExtension
3+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
34
import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension
45
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
56
import org.jetbrains.kotlinx.dataframe.AnyFrame
@@ -133,8 +134,8 @@ kotlin.jvmToolchain(11)
133134

134135
allprojects {
135136
tasks.withType<KotlinCompile> {
136-
kotlinOptions {
137-
jvmTarget = "1.8"
137+
compilerOptions {
138+
jvmTarget = JvmTarget.JVM_1_8
138139
}
139140
}
140141

core/build.gradle.kts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,8 @@ tasks.withType<JavaCompile> {
367367

368368
tasks.withType<KotlinCompile> {
369369
compilerOptions {
370-
freeCompilerArgs.addAll("-Xinline-classes", "-Xopt-in=kotlin.RequiresOptIn")
370+
optIn.addAll("kotlin.RequiresOptIn")
371+
freeCompilerArgs.addAll("-Xinline-classes")
371372
}
372373
}
373374

examples/idea-examples/json/build.gradle.kts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
12
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
23
import org.jetbrains.kotlinx.dataframe.api.JsonPath
34

@@ -22,7 +23,7 @@ dependencies {
2223
}
2324

2425
tasks.withType<KotlinCompile> {
25-
kotlinOptions.jvmTarget = "1.8"
26+
compilerOptions.jvmTarget = JvmTarget.JVM_1_8
2627
}
2728

2829
dataframes {

examples/idea-examples/movies/build.gradle.kts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
12
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
23

34
plugins {
@@ -23,5 +24,5 @@ dependencies {
2324
}
2425

2526
tasks.withType<KotlinCompile> {
26-
kotlinOptions.jvmTarget = "1.8"
27+
compilerOptions.jvmTarget = JvmTarget.JVM_1_8
2728
}

examples/idea-examples/titanic/build.gradle.kts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
2+
13
plugins {
24
application
35
kotlin("jvm")
@@ -35,7 +37,7 @@ dataframes {
3537
}
3638

3739
tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
38-
kotlinOptions.jvmTarget = "11"
40+
compilerOptions.jvmTarget = JvmTarget.JVM_11
3941
}
4042

4143
tasks.withType<JavaCompile> {

examples/idea-examples/youtube/build.gradle.kts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
12
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
23

34
plugins {
@@ -24,6 +25,6 @@ dependencies {
2425
}
2526

2627
tasks.withType<KotlinCompile> {
27-
kotlinOptions.jvmTarget = "1.8"
28+
compilerOptions.jvmTarget = JvmTarget.JVM_1_8
2829
}
2930

plugins/dataframe-gradle-plugin/build.gradle.kts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
2+
13
plugins {
24
`kotlin-dsl`
35
`java-gradle-plugin`
@@ -86,7 +88,7 @@ gradlePlugin {
8688
}
8789

8890
tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
89-
kotlinOptions.jvmTarget = "1.8"
91+
compilerOptions.jvmTarget = JvmTarget.JVM_1_8
9092
}
9193

9294
tasks.withType<JavaCompile>().all {

plugins/kotlin-dataframe/build.gradle.kts

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
2+
import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
3+
14
plugins {
25
id("java")
36
kotlin("jvm")
@@ -67,10 +70,14 @@ tasks.test {
6770
}
6871

6972
tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
70-
kotlinOptions {
71-
freeCompilerArgs += listOf("-Xfriend-paths=${project(":core").projectDir}")
72-
freeCompilerArgs += "-opt-in=org.jetbrains.kotlin.compiler.plugin.ExperimentalCompilerApi"
73-
freeCompilerArgs += "-Xcontext-receivers"
73+
compilerOptions {
74+
freeCompilerArgs.addAll(
75+
"-Xfriend-paths=${project(":core").projectDir}",
76+
"-Xcontext-receivers",
77+
)
78+
optIn.addAll(
79+
"org.jetbrains.kotlin.compiler.plugin.ExperimentalCompilerApi",
80+
)
7481
}
7582
}
7683

@@ -80,16 +87,16 @@ tasks.withType<JavaCompile> {
8087
}
8188

8289
tasks.compileKotlin {
83-
kotlinOptions {
84-
languageVersion = "2.0"
85-
jvmTarget = "1.8"
90+
compilerOptions {
91+
languageVersion = KotlinVersion.KOTLIN_2_0
92+
jvmTarget = JvmTarget.JVM_1_8
8693
}
8794
}
8895

8996
tasks.compileTestKotlin {
90-
kotlinOptions {
91-
languageVersion = "2.0"
92-
jvmTarget = "1.8"
97+
compilerOptions {
98+
languageVersion = KotlinVersion.KOTLIN_2_0
99+
jvmTarget = JvmTarget.JVM_1_8
93100
}
94101
}
95102

0 commit comments

Comments
 (0)