Skip to content

Commit 2fd1172

Browse files
committed
set jdk-release version as well
1 parent 9e53e51 commit 2fd1172

File tree

2 files changed

+25
-1
lines changed

2 files changed

+25
-1
lines changed

build.gradle.kts

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,18 +133,25 @@ tasks.named<DependencyUpdatesTask>("dependencyUpdates").configure {
133133
}
134134
}
135135

136-
kotlin.jvmToolchain(21)
136+
kotlin {
137+
jvmToolchain(21)
138+
compilerOptions {
139+
jvmTarget = JvmTarget.JVM_11
140+
}
141+
}
137142

138143
allprojects {
139144
tasks.withType<KotlinCompile> {
140145
compilerOptions {
141146
jvmTarget = JvmTarget.JVM_11
147+
freeCompilerArgs.add("-Xjdk-release=11")
142148
}
143149
}
144150

145151
tasks.withType<JavaCompile> {
146152
sourceCompatibility = JavaVersion.VERSION_11.toString()
147153
targetCompatibility = JavaVersion.VERSION_11.toString()
154+
options.release.set(11)
148155
}
149156

150157
// Attempts to configure ktlint for each sub-project that uses the plugin

plugins/keywords-generator/build.gradle.kts

Lines changed: 17 additions & 0 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.tasks.KotlinCompile
3+
14
plugins {
25
`java-gradle-plugin`
36
`kotlin-dsl`
@@ -22,6 +25,20 @@ dependencies {
2225
implementation("com.squareup:kotlinpoet:$kotlinPoetVersion")
2326
}
2427

28+
kotlin {
29+
jvmToolchain(21)
30+
compilerOptions {
31+
jvmTarget = JvmTarget.JVM_11
32+
freeCompilerArgs.add("-Xjdk-release=11")
33+
}
34+
}
35+
36+
tasks.withType<JavaCompile> {
37+
sourceCompatibility = JavaVersion.VERSION_11.toString()
38+
targetCompatibility = JavaVersion.VERSION_11.toString()
39+
options.release.set(11)
40+
}
41+
2542
gradlePlugin {
2643
plugins {
2744
create("dependencies") {

0 commit comments

Comments
 (0)