Skip to content

Commit f05e29e

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

File tree

3 files changed

+25
-9
lines changed

3 files changed

+25
-9
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

core/api/core.api

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4742,10 +4742,6 @@ public final class org/jetbrains/kotlinx/dataframe/columns/ColumnPath : java/uti
47424742
public fun add (Ljava/lang/String;)Z
47434743
public fun addAll (ILjava/util/Collection;)Z
47444744
public fun addAll (Ljava/util/Collection;)Z
4745-
public synthetic fun addFirst (Ljava/lang/Object;)V
4746-
public fun addFirst (Ljava/lang/String;)V
4747-
public synthetic fun addLast (Ljava/lang/Object;)V
4748-
public fun addLast (Ljava/lang/String;)V
47494745
public fun clear ()V
47504746
public final fun component1 ()Ljava/util/List;
47514747
public final fun contains (Ljava/lang/Object;)Z
@@ -4789,10 +4785,6 @@ public final class org/jetbrains/kotlinx/dataframe/columns/ColumnPath : java/uti
47894785
public fun remove (I)Ljava/lang/String;
47904786
public fun remove (Ljava/lang/Object;)Z
47914787
public fun removeAll (Ljava/util/Collection;)Z
4792-
public synthetic fun removeFirst ()Ljava/lang/Object;
4793-
public fun removeFirst ()Ljava/lang/String;
4794-
public synthetic fun removeLast ()Ljava/lang/Object;
4795-
public fun removeLast ()Ljava/lang/String;
47964788
public synthetic fun rename (Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnAccessor;
47974789
public fun rename (Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;
47984790
public synthetic fun rename (Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/columns/ColumnReference;

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)