Merge pull request #1101 from Kotlin/java-8

koperagen · web-flow · commit 76dd7591d0f7 · 2025-03-17T12:13:44.000+02:00
Reverted back to the "good" jdk 8 wherever possible
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -90,9 +90,6 @@ so do familiarize yourself with the following guidelines.
   * Note, any version above 21 should work in theory, but JDK 21 is the only version we test with,
   so it is the recommended version.
 
-* JDK == 11 referred to by the `JDK_11_0` environment variable or `gradle.properties`/`local.properties`.
-  * This is used for testing our compiler plugins.
-
 * We recommend using [IntelliJ IDEA](https://www.jetbrains.com/idea/download/) as the IDE. This
 has the best support for Kotlin, compiler plugins, Gradle, and [Kotlin Notebook](https://kotlinlang.org/docs/kotlin-notebook-overview.html) of course.
 
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -136,22 +136,46 @@ tasks.named<DependencyUpdatesTask>("dependencyUpdates").configure {
 kotlin {
     jvmToolchain(21)
     compilerOptions {
-        jvmTarget = JvmTarget.JVM_11
+        jvmTarget = JvmTarget.JVM_1_8
     }
 }
 
+// DataFrame targets Java 8 for maximum compatibility.
+// This is, however, not always possible thanks to external dependencies.
+// In those cases, we default to Java 11.
+val modulesUsingJava11 = with(projects) {
+    setOf(
+        dataframeJupyter,
+        dataframeGeo,
+        examples.ideaExamples.titanic,
+    )
+}.map { it.path }
+
 allprojects {
-    tasks.withType<KotlinCompile> {
-        compilerOptions {
-            jvmTarget = JvmTarget.JVM_11
-            freeCompilerArgs.add("-Xjdk-release=11")
+    if (path in modulesUsingJava11) {
+        tasks.withType<KotlinCompile> {
+            compilerOptions {
+                jvmTarget = JvmTarget.JVM_11
+                freeCompilerArgs.add("-Xjdk-release=11")
+            }
+        }
+        tasks.withType<JavaCompile> {
+            sourceCompatibility = JavaVersion.VERSION_11.toString()
+            targetCompatibility = JavaVersion.VERSION_11.toString()
+            options.release.set(11)
+        }
+    } else {
+        tasks.withType<KotlinCompile> {
+            compilerOptions {
+                jvmTarget = JvmTarget.JVM_1_8
+                freeCompilerArgs.add("-Xjdk-release=8")
+            }
+        }
+        tasks.withType<JavaCompile> {
+            sourceCompatibility = JavaVersion.VERSION_1_8.toString()
+            targetCompatibility = JavaVersion.VERSION_1_8.toString()
+            options.release.set(8)
         }
-    }
-
-    tasks.withType<JavaCompile> {
-        sourceCompatibility = JavaVersion.VERSION_11.toString()
-        targetCompatibility = JavaVersion.VERSION_11.toString()
-        options.release.set(11)
     }
 
     // Attempts to configure ktlint for each sub-project that uses the plugin
diff --git a/dataframe-geo/README.md b/dataframe-geo/README.md
@@ -4,3 +4,5 @@ This module, published as `dataframe-geo`, contains all logic and tests for Data
 with geographical data.
 
 Experimental.
+
+This module targets java 11 because of the restriction from `org.jetbrains.kotlin.jupyter`.
diff --git a/dataframe-jupyter/README.md b/dataframe-jupyter/README.md
@@ -13,3 +13,4 @@ This module is a friend module of [`:core`](../core) to be able to access intern
 See [Get started with Kotlin DataFrame on Jupyter Notebook](https://kotlin.github.io/dataframe/gettingstartedjupyternotebook.html),
 and [Usage with Kotlin Notebook Plugin](https://kotlin.github.io/dataframe/usage-with-kotlin-notebook-plugin.html).
 
+This module targets java 11 because of the restriction from `org.jetbrains.kotlin.jupyter`.
diff --git a/dataframe-openapi-generator/build.gradle.kts b/dataframe-openapi-generator/build.gradle.kts
@@ -1,11 +1,12 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     with(libs.plugins) {
         alias(kotlin.jvm)
         alias(publisher)
         alias(serialization)
         alias(kover)
         alias(ktlint)
-        alias(jupyter.api)
         alias(binary.compatibility.validator)
     }
 }
@@ -39,6 +40,7 @@ dependencies {
     testImplementation(libs.kotestAssertions) {
         exclude("org.jetbrains.kotlin", "kotlin-stdlib-jdk8")
     }
+    testImplementation(libs.kotlin.jupyter.test.kit)
 }
 
 kotlinPublications {
@@ -53,3 +55,16 @@ kotlinPublications {
 kotlin {
     explicitApi()
 }
+
+// uses jupyter for testing, so requires java 11 for that
+tasks.compileTestKotlin {
+    compilerOptions {
+        jvmTarget = JvmTarget.JVM_11
+        freeCompilerArgs.add("-Xjdk-release=11")
+    }
+}
+tasks.compileTestJava {
+    sourceCompatibility = JavaVersion.VERSION_11.toString()
+    targetCompatibility = JavaVersion.VERSION_11.toString()
+    options.release.set(11)
+}
diff --git a/dataframe-openapi-generator/src/main/kotlin/org/jetbrains/kotlinx/dataframe/io/OpenApi.kt b/dataframe-openapi-generator/src/main/kotlin/org/jetbrains/kotlinx/dataframe/io/OpenApi.kt
@@ -1,8 +1,8 @@
 package org.jetbrains.kotlinx.dataframe.io
 
 import org.jetbrains.kotlinx.dataframe.annotations.DataSchema
+import org.jetbrains.kotlinx.dataframe.codeGen.Code
 import org.jetbrains.kotlinx.dataframe.codeGen.DefaultReadDfMethod
-import org.jetbrains.kotlinx.jupyter.api.Code
 import java.io.File
 import java.io.InputStream
 
diff --git a/dataframe-openapi-generator/src/main/kotlin/org/jetbrains/kotlinx/dataframe/io/readOpenapi.kt b/dataframe-openapi-generator/src/main/kotlin/org/jetbrains/kotlinx/dataframe/io/readOpenapi.kt
@@ -12,6 +12,7 @@ import org.jetbrains.kotlinx.dataframe.DataFrame
 import org.jetbrains.kotlinx.dataframe.DataRow
 import org.jetbrains.kotlinx.dataframe.annotations.DataSchema
 import org.jetbrains.kotlinx.dataframe.api.JsonPath
+import org.jetbrains.kotlinx.dataframe.codeGen.Code
 import org.jetbrains.kotlinx.dataframe.codeGen.CodeGenerator
 import org.jetbrains.kotlinx.dataframe.codeGen.FieldType
 import org.jetbrains.kotlinx.dataframe.codeGen.GeneratedField
@@ -23,7 +24,6 @@ import org.jetbrains.kotlinx.dataframe.codeGen.isNullable
 import org.jetbrains.kotlinx.dataframe.codeGen.name
 import org.jetbrains.kotlinx.dataframe.codeGen.toNotNullable
 import org.jetbrains.kotlinx.dataframe.codeGen.toNullable
-import org.jetbrains.kotlinx.jupyter.api.Code
 import kotlin.reflect.typeOf
 
 /** Parse and read OpenApi specification to [DataSchema] interfaces. */
diff --git a/dataframe-openapi-generator/src/test/kotlin/OpenApiTests.kt b/dataframe-openapi-generator/src/test/kotlin/OpenApiTests.kt
@@ -6,9 +6,9 @@ import org.intellij.lang.annotations.Language
 import org.jetbrains.kotlinx.dataframe.AnyFrame
 import org.jetbrains.kotlinx.dataframe.api.isNotEmpty
 import org.jetbrains.kotlinx.dataframe.api.schema
+import org.jetbrains.kotlinx.dataframe.codeGen.Code
 import org.jetbrains.kotlinx.dataframe.codeGen.ValidFieldName
 import org.jetbrains.kotlinx.dataframe.io.OpenApi
-import org.jetbrains.kotlinx.jupyter.api.Code
 import org.jetbrains.kotlinx.jupyter.testkit.JupyterReplTestCase
 import org.junit.Test
 import java.io.File
diff --git a/examples/idea-examples/json/build.gradle.kts b/examples/idea-examples/json/build.gradle.kts
@@ -23,7 +23,7 @@ dependencies {
 }
 
 tasks.withType<KotlinCompile> {
-    compilerOptions.jvmTarget = JvmTarget.JVM_11
+    compilerOptions.jvmTarget = JvmTarget.JVM_1_8
 }
 
 dataframes {
diff --git a/examples/idea-examples/movies/build.gradle.kts b/examples/idea-examples/movies/build.gradle.kts
@@ -24,5 +24,5 @@ dependencies {
 }
 
 tasks.withType<KotlinCompile> {
-    compilerOptions.jvmTarget = JvmTarget.JVM_11
+    compilerOptions.jvmTarget = JvmTarget.JVM_1_8
 }
diff --git a/examples/idea-examples/titanic/build.gradle.kts b/examples/idea-examples/titanic/build.gradle.kts
@@ -20,6 +20,8 @@ application.mainClass = "org.jetbrains.kotlinx.dataframe.examples.titanic.ml.Tit
 dependencies {
     // implementation("org.jetbrains.kotlinx:dataframe:X.Y.Z")
     implementation(project(":"))
+
+    // note: needs to target java 11 for these dependencies
     implementation("org.jetbrains.kotlinx:kotlin-deeplearning-api:0.5.2")
     implementation("org.jetbrains.kotlinx:kotlin-deeplearning-impl:0.5.2")
     implementation("org.jetbrains.kotlinx:kotlin-deeplearning-tensorflow:0.5.2")
diff --git a/examples/idea-examples/youtube/build.gradle.kts b/examples/idea-examples/youtube/build.gradle.kts
@@ -25,6 +25,6 @@ dependencies {
 }
 
 tasks.withType<KotlinCompile> {
-    compilerOptions.jvmTarget = JvmTarget.JVM_11
+    compilerOptions.jvmTarget = JvmTarget.JVM_1_8
 }
 
diff --git a/plugins/dataframe-gradle-plugin/build.gradle.kts b/plugins/dataframe-gradle-plugin/build.gradle.kts
@@ -1,5 +1,3 @@
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-
 plugins {
     `kotlin-dsl`
     `java-gradle-plugin`
@@ -90,15 +88,6 @@ gradlePlugin {
     }
 }
 
-tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
-    compilerOptions.jvmTarget = JvmTarget.JVM_11
-}
-
-tasks.withType<JavaCompile>().all {
-    sourceCompatibility = JavaVersion.VERSION_11.toString()
-    targetCompatibility = JavaVersion.VERSION_11.toString()
-}
-
 sourceSets {
     val main by getting
     val test by getting
diff --git a/plugins/dataframe-gradle-plugin/src/main/kotlin/org/jetbrains/dataframe/gradle/ConvenienceSchemaGeneratorPlugin.kt b/plugins/dataframe-gradle-plugin/src/main/kotlin/org/jetbrains/dataframe/gradle/ConvenienceSchemaGeneratorPlugin.kt
@@ -42,7 +42,7 @@ class ConvenienceSchemaGeneratorPlugin : Plugin<Project> {
         // regardless whether we add KSP or the user adds it, when it's added,
         // configure it to depend on symbol-processor-all
         target.plugins.whenPluginAdded {
-            if ("com.google.devtools.ksp" in this.javaClass.packageName) {
+            if (this::class.qualifiedName?.contains("com.google.devtools.ksp") == true) {
                 val isMultiplatform by lazy {
                     when {
                         target.plugins.hasPlugin("org.jetbrains.kotlin.jvm") -> false
diff --git a/plugins/expressions-converter/build.gradle.kts b/plugins/expressions-converter/build.gradle.kts
@@ -38,11 +38,6 @@ dependencies {
 
 tasks.test {
     useJUnitPlatform()
-    // gets the path to JDK 11 either from gradle.properties or from the system property, defaulting to java.home
-    environment(
-        "JDK_11_0",
-        project.properties["JDK_11_0"] ?: System.getProperty("JDK_11_0", System.getProperty("java.home")),
-    )
     doFirst {
         setLibraryProperty("org.jetbrains.kotlin.test.kotlin-stdlib", "kotlin-stdlib")
         setLibraryProperty("org.jetbrains.kotlin.test.kotlin-reflect", "kotlin-reflect")
diff --git a/plugins/expressions-converter/tests/org/jetbrains/kotlinx/dataframe/AbstractExplainerBlackBoxCodegenTest.kt b/plugins/expressions-converter/tests/org/jetbrains/kotlinx/dataframe/AbstractExplainerBlackBoxCodegenTest.kt
@@ -35,13 +35,13 @@ open class AbstractExplainerBlackBoxCodegenTest : BaseTestRunner() {
     override fun TestConfigurationBuilder.configuration() {
         globalDefaults {
             frontend = FrontendKinds.ClassicAndFIR
-            targetPlatform = JvmPlatforms.jvm11
+            targetPlatform = JvmPlatforms.jvm8
             dependencyKind = DependencyKind.Binary
             targetBackend = TargetBackend.JVM_IR
         }
         defaultDirectives {
-            JvmEnvironmentConfigurationDirectives.JDK_KIND with TestJdkKind.FULL_JDK_11
-            JvmEnvironmentConfigurationDirectives.JVM_TARGET with JvmTarget.JVM_11
+            JvmEnvironmentConfigurationDirectives.JDK_KIND with TestJdkKind.FULL_JDK
+            JvmEnvironmentConfigurationDirectives.JVM_TARGET with JvmTarget.JVM_1_8
             +JvmEnvironmentConfigurationDirectives.WITH_REFLECT
         }
         facadeStep(::ClassicFrontendFacade)
diff --git a/plugins/keywords-generator/build.gradle.kts b/plugins/keywords-generator/build.gradle.kts
@@ -28,15 +28,15 @@ dependencies {
 kotlin {
     jvmToolchain(21)
     compilerOptions {
-        jvmTarget = JvmTarget.JVM_11
-        freeCompilerArgs.add("-Xjdk-release=11")
+        jvmTarget = JvmTarget.JVM_1_8
+        freeCompilerArgs.add("-Xjdk-release=8")
     }
 }
 
 tasks.withType<JavaCompile> {
-    sourceCompatibility = JavaVersion.VERSION_11.toString()
-    targetCompatibility = JavaVersion.VERSION_11.toString()
-    options.release.set(11)
+    sourceCompatibility = JavaVersion.VERSION_1_8.toString()
+    targetCompatibility = JavaVersion.VERSION_1_8.toString()
+    options.release.set(8)
 }
 
 gradlePlugin {
diff --git a/plugins/kotlin-dataframe/build.gradle.kts b/plugins/kotlin-dataframe/build.gradle.kts
@@ -58,12 +58,6 @@ tasks.test {
     useJUnitPlatform()
     jvmArgs("-Xmx2G")
     environment("TEST_RESOURCES", project.layout.projectDirectory)
-
-    // gets the path to JDK 11 either from gradle.properties or from the system property, defaulting to java.home
-    environment(
-        "JDK_11_0",
-        project.properties["JDK_11_0"] ?: System.getProperty("JDK_11_0", System.getProperty("java.home")),
-    )
     doFirst {
         setLibraryProperty("org.jetbrains.kotlin.test.kotlin-stdlib", "kotlin-stdlib")
         setLibraryProperty("org.jetbrains.kotlin.test.kotlin-reflect", "kotlin-reflect")
@@ -86,21 +80,21 @@ tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach
 }
 
 tasks.withType<JavaCompile> {
-    sourceCompatibility = JavaVersion.VERSION_11.toString()
-    targetCompatibility = JavaVersion.VERSION_11.toString()
+    sourceCompatibility = JavaVersion.VERSION_1_8.toString()
+    targetCompatibility = JavaVersion.VERSION_1_8.toString()
 }
 
 tasks.compileKotlin {
     compilerOptions {
         languageVersion = KotlinVersion.KOTLIN_2_0
-        jvmTarget = JvmTarget.JVM_11
+        jvmTarget = JvmTarget.JVM_1_8
     }
 }
 
 tasks.compileTestKotlin {
     compilerOptions {
         languageVersion = KotlinVersion.KOTLIN_2_0
-        jvmTarget = JvmTarget.JVM_11
+        jvmTarget = JvmTarget.JVM_1_8
     }
 }
 
diff --git a/plugins/kotlin-dataframe/gradle.properties b/plugins/kotlin-dataframe/gradle.properties
@@ -1,6 +1,2 @@
 kotlin.code.style=official
 kotlinVersion=2.0.20
-
-# Optionally, you can set this property to point to your JDK 11 installation.
-# This version is used to run the box/diagnostics tests.
-# JDK_11_0=/path/to/jdk_11
diff --git a/plugins/kotlin-dataframe/tests-gen/org/jetbrains/kotlin/fir/dataframe/DataFrameBlackBoxCodegenTestGenerated.java b/plugins/kotlin-dataframe/tests-gen/org/jetbrains/kotlin/fir/dataframe/DataFrameBlackBoxCodegenTestGenerated.java
diff --git a/plugins/kotlin-dataframe/tests/org/jetbrains/kotlin/fir/dataframe/AbstractDataFrameBlackBoxCodegenTest.kt b/plugins/kotlin-dataframe/tests/org/jetbrains/kotlin/fir/dataframe/AbstractDataFrameBlackBoxCodegenTest.kt
diff --git a/plugins/kotlin-dataframe/tests/org/jetbrains/kotlin/fir/dataframe/AbstractDataFrameDiagnosticTest.kt b/plugins/kotlin-dataframe/tests/org/jetbrains/kotlin/fir/dataframe/AbstractDataFrameDiagnosticTest.kt
diff --git a/plugins/symbol-processor/build.gradle.kts b/plugins/symbol-processor/build.gradle.kts
diff --git a/plugins/symbol-processor/src/test/kotlin/org/jetbrains/dataframe/ksp/runner/KotlinCompilationUtil.kt b/plugins/symbol-processor/src/test/kotlin/org/jetbrains/dataframe/ksp/runner/KotlinCompilationUtil.kt

Original file line number	Diff line number	Diff line change
@@ -13,3 +13,4 @@ This module is a friend module of [`:core`](../core) to be able to access intern
`13`	`13`	`See [Get started with Kotlin DataFrame on Jupyter Notebook](https://kotlin.github.io/dataframe/gettingstartedjupyternotebook.html),`
`14`	`14`	`and [Usage with Kotlin Notebook Plugin](https://kotlin.github.io/dataframe/usage-with-kotlin-notebook-plugin.html).`
`15`	`15`
	`16`	+This module targets java 11 because of the restriction from `org.jetbrains.kotlin.jupyter`.
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ dependencies {`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`tasks.withType<KotlinCompile> {`
`26`		`- compilerOptions.jvmTarget = JvmTarget.JVM_11`
	`26`	`+ compilerOptions.jvmTarget = JvmTarget.JVM_1_8`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`dataframes {`
Original file line number	Diff line number	Diff line change
`@@ -24,5 +24,5 @@ dependencies {`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`tasks.withType<KotlinCompile> {`
`27`		`- compilerOptions.jvmTarget = JvmTarget.JVM_11`
	`27`	`+ compilerOptions.jvmTarget = JvmTarget.JVM_1_8`
`28`	`28`	`}`