File tree Expand file tree Collapse file tree 2 files changed +15
-6
lines changed
Expand file tree Collapse file tree 2 files changed +15
-6
lines changed Original file line number Diff line number Diff line change 11import org.gradle.kotlin.dsl.support.expectedKotlinDslPluginsVersion
22import org.jetbrains.kotlin.gradle.dsl.JvmTarget
3+ import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
34import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
45
56/*
@@ -62,8 +63,13 @@ fun Project.applyKotlinProjectConventions() {
6263 tasks.withType<JavaCompile >().configureEach {
6364 options.release.set(11 )
6465 }
65- tasks.withType<KotlinJvmCompile >().configureEach {
66+ kotlin {
67+ @Suppress(" DEPRECATION" )
68+ val targetKotlinVersion = KotlinVersion .KOTLIN_1_4
69+
6670 compilerOptions {
71+ apiVersion.set(targetKotlinVersion)
72+ languageVersion.set(targetKotlinVersion)
6773 jvmTarget = JvmTarget .JVM_11
6874 freeCompilerArgs.add(" -Xjdk-release=11" )
6975 }
Original file line number Diff line number Diff line change 1717
1818import org.jetbrains.kotlin.gradle.dsl.JvmTarget
1919import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
20- import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
2120
2221plugins {
2322 id(" build.java-conventions" )
2423 id(" com.github.autostyle" )
2524 kotlin(" jvm" )
2625}
2726
28- tasks.withType<KotlinJvmCompile >().configureEach {
27+ kotlin {
28+ @Suppress(" DEPRECATION" )
29+ val targetKotlinVersion = KotlinVersion .KOTLIN_1_4
30+
31+ coreLibrariesVersion = " 1.4.32"
2932 compilerOptions {
30- freeCompilerArgs.add(" -Xjdk-release=8" )
31- @Suppress(" DEPRECATION" )
32- apiVersion.set(KotlinVersion .KOTLIN_1_4 )
3333 jvmTarget = JvmTarget .JVM_1_8
34+ freeCompilerArgs.add(" -Xjdk-release=8" )
35+ apiVersion.set(targetKotlinVersion)
36+ languageVersion.set(targetKotlinVersion)
3437 }
3538}
3639
You can’t perform that action at this time.
0 commit comments