File tree Expand file tree Collapse file tree 8 files changed +34
-18
lines changed Expand file tree Collapse file tree 8 files changed +34
-18
lines changed Original file line number Diff line number Diff line change 1
1
import com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask
2
2
import com.github.gmazzo.buildconfig.BuildConfigExtension
3
+ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
3
4
import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension
4
5
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
5
6
import org.jetbrains.kotlinx.dataframe.AnyFrame
@@ -133,8 +134,8 @@ kotlin.jvmToolchain(11)
133
134
134
135
allprojects {
135
136
tasks.withType<KotlinCompile > {
136
- kotlinOptions {
137
- jvmTarget = " 1.8 "
137
+ compilerOptions {
138
+ jvmTarget = JvmTarget . JVM_1_8
138
139
}
139
140
}
140
141
Original file line number Diff line number Diff line change @@ -367,7 +367,8 @@ tasks.withType<JavaCompile> {
367
367
368
368
tasks.withType<KotlinCompile > {
369
369
compilerOptions {
370
- freeCompilerArgs.addAll(" -Xinline-classes" , " -Xopt-in=kotlin.RequiresOptIn" )
370
+ optIn.addAll(" kotlin.RequiresOptIn" )
371
+ freeCompilerArgs.addAll(" -Xinline-classes" )
371
372
}
372
373
}
373
374
Original file line number Diff line number Diff line change
1
+ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
1
2
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
2
3
import org.jetbrains.kotlinx.dataframe.api.JsonPath
3
4
@@ -22,7 +23,7 @@ dependencies {
22
23
}
23
24
24
25
tasks.withType<KotlinCompile > {
25
- kotlinOptions .jvmTarget = " 1.8 "
26
+ compilerOptions .jvmTarget = JvmTarget . JVM_1_8
26
27
}
27
28
28
29
dataframes {
Original file line number Diff line number Diff line change
1
+ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
1
2
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
2
3
3
4
plugins {
@@ -23,5 +24,5 @@ dependencies {
23
24
}
24
25
25
26
tasks.withType<KotlinCompile > {
26
- kotlinOptions .jvmTarget = " 1.8 "
27
+ compilerOptions .jvmTarget = JvmTarget . JVM_1_8
27
28
}
Original file line number Diff line number Diff line change
1
+ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
2
+
1
3
plugins {
2
4
application
3
5
kotlin(" jvm" )
@@ -35,7 +37,7 @@ dataframes {
35
37
}
36
38
37
39
tasks.withType< org.jetbrains.kotlin.gradle.tasks.KotlinCompile > {
38
- kotlinOptions .jvmTarget = " 11 "
40
+ compilerOptions .jvmTarget = JvmTarget . JVM_11
39
41
}
40
42
41
43
tasks.withType<JavaCompile > {
Original file line number Diff line number Diff line change
1
+ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
1
2
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
2
3
3
4
plugins {
@@ -24,6 +25,6 @@ dependencies {
24
25
}
25
26
26
27
tasks.withType<KotlinCompile > {
27
- kotlinOptions .jvmTarget = " 1.8 "
28
+ compilerOptions .jvmTarget = JvmTarget . JVM_1_8
28
29
}
29
30
Original file line number Diff line number Diff line change
1
+ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
2
+
1
3
plugins {
2
4
`kotlin- dsl`
3
5
`java- gradle- plugin`
@@ -86,7 +88,7 @@ gradlePlugin {
86
88
}
87
89
88
90
tasks.withType< org.jetbrains.kotlin.gradle.tasks.KotlinCompile > {
89
- kotlinOptions .jvmTarget = " 1.8 "
91
+ compilerOptions .jvmTarget = JvmTarget . JVM_1_8
90
92
}
91
93
92
94
tasks.withType<JavaCompile >().all {
Original file line number Diff line number Diff line change
1
+ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
2
+ import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
3
+
1
4
plugins {
2
5
id(" java" )
3
6
kotlin(" jvm" )
@@ -67,10 +70,14 @@ tasks.test {
67
70
}
68
71
69
72
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
+ )
74
81
}
75
82
}
76
83
@@ -80,16 +87,16 @@ tasks.withType<JavaCompile> {
80
87
}
81
88
82
89
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
86
93
}
87
94
}
88
95
89
96
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
93
100
}
94
101
}
95
102
You can’t perform that action at this time.
0 commit comments