Merge pull request #1083 from Kotlin/java11

Jolanrensen · web-flow · commit d8c6c4bae45c · 2025-03-04T18:09:40.000+01:00
Setting java version to 11
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -144,13 +144,13 @@ kotlin.jvmToolchain(11)
 allprojects {
     tasks.withType<KotlinCompile> {
         compilerOptions {
-            jvmTarget = JvmTarget.JVM_1_8
+            jvmTarget = JvmTarget.JVM_11
         }
     }
 
     tasks.withType<JavaCompile> {
-        sourceCompatibility = JavaVersion.VERSION_1_8.toString()
-        targetCompatibility = JavaVersion.VERSION_1_8.toString()
+        sourceCompatibility = JavaVersion.VERSION_11.toString()
+        targetCompatibility = JavaVersion.VERSION_11.toString()
     }
 
     // Attempts to configure ktlint for each sub-project that uses the plugin
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
@@ -65,7 +65,6 @@ dependencies {
     api(libs.kotlin.reflect)
     implementation(libs.kotlin.stdlib)
     kotlinCompilerPluginClasspathSamples(project(":plugins:expressions-converter"))
-    implementation(libs.kotlin.stdlib.jdk8)
 
     api(libs.commonsCsv)
     implementation(libs.commonsIo)
@@ -364,11 +363,6 @@ kotlin {
     explicitApi()
 }
 
-tasks.withType<JavaCompile> {
-    sourceCompatibility = JavaVersion.VERSION_1_8.toString()
-    targetCompatibility = JavaVersion.VERSION_1_8.toString()
-}
-
 tasks.withType<KotlinCompile> {
     compilerOptions {
         optIn.addAll("kotlin.RequiresOptIn")
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_1_8
+    compilerOptions.jvmTarget = JvmTarget.JVM_11
 }
 
 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_1_8
+    compilerOptions.jvmTarget = JvmTarget.JVM_11
 }
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_1_8
+    compilerOptions.jvmTarget = JvmTarget.JVM_11
 }
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -68,7 +68,6 @@ ksp-api = { group = "com.google.devtools.ksp", name = "symbol-processing-api", v
 jupyter-api = { group = "org.jetbrains.kotlinx", name = "kotlin-jupyter-kernel", version.ref = "kotlinJupyter" }
 
 kotlin-stdlib = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib", version.ref = "kotlin" }
-kotlin-stdlib-jdk8 = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib-jdk8", version.ref = "kotlin" }
 
 kotlin-reflect = { group = "org.jetbrains.kotlin", name = "kotlin-reflect", version.ref = "kotlin" }
 kotlin-scriptingJvm = { group = "org.jetbrains.kotlin", name = "kotlin-scripting-jvm", version.ref = "kotlin" }
diff --git a/plugins/dataframe-gradle-plugin/build.gradle.kts b/plugins/dataframe-gradle-plugin/build.gradle.kts
@@ -91,12 +91,12 @@ gradlePlugin {
 }
 
 tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
-    compilerOptions.jvmTarget = JvmTarget.JVM_1_8
+    compilerOptions.jvmTarget = JvmTarget.JVM_11
 }
 
 tasks.withType<JavaCompile>().all {
-    sourceCompatibility = JavaVersion.VERSION_1_8.toString()
-    targetCompatibility = JavaVersion.VERSION_1_8.toString()
+    sourceCompatibility = JavaVersion.VERSION_11.toString()
+    targetCompatibility = JavaVersion.VERSION_11.toString()
 }
 
 sourceSets {
diff --git a/plugins/expressions-converter/build.gradle.kts b/plugins/expressions-converter/build.gradle.kts
@@ -38,9 +38,13 @@ 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-stdlib-jdk8", "kotlin-stdlib-jdk8")
         setLibraryProperty("org.jetbrains.kotlin.test.kotlin-reflect", "kotlin-reflect")
         setLibraryProperty("org.jetbrains.kotlin.test.kotlin-test", "kotlin-test")
         setLibraryProperty("org.jetbrains.kotlin.test.kotlin-script-runtime", "kotlin-script-runtime")
diff --git a/plugins/expressions-converter/tests/org/jetbrains/kotlinx/dataframe/AbstractExplainerBlackBoxCodegenTest.kt b/plugins/expressions-converter/tests/org/jetbrains/kotlinx/dataframe/AbstractExplainerBlackBoxCodegenTest.kt
@@ -1,5 +1,6 @@
 package org.jetbrains.kotlinx.dataframe
 
+import org.jetbrains.kotlin.config.JvmTarget
 import org.jetbrains.kotlin.platform.jvm.JvmPlatforms
 import org.jetbrains.kotlin.test.TargetBackend
 import org.jetbrains.kotlin.test.TestJdkKind
@@ -22,22 +23,25 @@ import org.jetbrains.kotlin.test.model.DependencyKind
 import org.jetbrains.kotlin.test.model.FrontendKinds
 import org.jetbrains.kotlin.test.model.TestModule
 import org.jetbrains.kotlin.test.services.RuntimeClasspathProvider
+import org.jetbrains.kotlin.test.services.TemporaryDirectoryManager
 import org.jetbrains.kotlin.test.services.TestServices
 import org.jetbrains.kotlin.test.services.configuration.CommonEnvironmentConfigurator
 import org.jetbrains.kotlin.test.services.configuration.JvmEnvironmentConfigurator
+import org.jetbrains.kotlinx.dataframe.services.TemporaryDirectoryManagerImplFixed
 import java.io.File
 
 open class AbstractExplainerBlackBoxCodegenTest : BaseTestRunner() {
 
     override fun TestConfigurationBuilder.configuration() {
         globalDefaults {
-            frontend = FrontendKinds.ClassicFrontend
-            targetPlatform = JvmPlatforms.defaultJvmPlatform
+            frontend = FrontendKinds.ClassicAndFIR
+            targetPlatform = JvmPlatforms.jvm11
             dependencyKind = DependencyKind.Binary
             targetBackend = TargetBackend.JVM_IR
         }
         defaultDirectives {
-            JvmEnvironmentConfigurationDirectives.JDK_KIND with TestJdkKind.FULL_JDK
+            JvmEnvironmentConfigurationDirectives.JDK_KIND with TestJdkKind.FULL_JDK_11
+            JvmEnvironmentConfigurationDirectives.JVM_TARGET with JvmTarget.JVM_11
             +JvmEnvironmentConfigurationDirectives.WITH_REFLECT
         }
         facadeStep(::ClassicFrontendFacade)
@@ -63,6 +67,7 @@ open class AbstractExplainerBlackBoxCodegenTest : BaseTestRunner() {
         useConfigurators(::JvmEnvironmentConfigurator, ::CommonEnvironmentConfigurator, ::PluginAnnotationsProvider)
         useCustomRuntimeClasspathProviders(::MyClasspathProvider)
         useAfterAnalysisCheckers(::BlackBoxCodegenSuppressor)
+        useAdditionalService<TemporaryDirectoryManager>(::TemporaryDirectoryManagerImplFixed)
     }
 
     class MyClasspathProvider(testServices: TestServices) : RuntimeClasspathProvider(testServices) {
diff --git a/plugins/expressions-converter/tests/org/jetbrains/kotlinx/dataframe/services/TemporaryDirectoryManagerImplFixed.kt b/plugins/expressions-converter/tests/org/jetbrains/kotlinx/dataframe/services/TemporaryDirectoryManagerImplFixed.kt
@@ -0,0 +1,58 @@
+package org.jetbrains.kotlinx.dataframe.services
+
+import org.jetbrains.kotlin.test.services.TemporaryDirectoryManager
+import org.jetbrains.kotlin.test.services.TestServices
+import org.jetbrains.kotlin.test.services.testInfo
+import org.jetbrains.kotlin.test.util.KtTestUtil
+import java.io.File
+import java.nio.file.Paths
+import java.util.Locale
+import kotlin.io.path.ExperimentalPathApi
+import kotlin.io.path.deleteRecursively
+
+// Copied from org.jetbrains.kotlin.test.services.impl.TemporaryDirectoryManagerImpl
+// because it uses NioFiles#deleteRecursively and throws method not found as a result.
+class TemporaryDirectoryManagerImplFixed(testServices: TestServices) : TemporaryDirectoryManager(testServices) {
+    private val cache = mutableMapOf<String, File>()
+    private val rootTempDir = lazy {
+        val testInfo = testServices.testInfo
+        val className = testInfo.className
+        val methodName = testInfo.methodName
+        if (!onWindows && className.length + methodName.length < 255) {
+            return@lazy KtTestUtil.tmpDirForTest(className, methodName)
+        }
+
+        // This code will simplify directory name for windows. This is needed because there can occur errors due to long name
+        val lastDot = className.lastIndexOf('.')
+        val simplifiedClassName = className.substring(lastDot + 1).getOnlyUpperCaseSymbols()
+        val simplifiedMethodName = methodName.getOnlyUpperCaseSymbols()
+        KtTestUtil.tmpDirForTest(simplifiedClassName, simplifiedMethodName)
+    }
+
+    override val rootDir: File
+        get() = rootTempDir.value
+
+    override fun getOrCreateTempDirectory(name: String): File =
+        cache.getOrPut(name) {
+            KtTestUtil.tmpDir(rootDir, name)
+        }
+
+    @OptIn(ExperimentalPathApi::class)
+    override fun cleanupTemporaryDirectories() {
+        cache.clear()
+
+        if (rootTempDir.isInitialized()) {
+            Paths.get(rootDir.path).deleteRecursively()
+        }
+    }
+
+    companion object {
+        private val onWindows: Boolean =
+            System.getProperty("os.name").lowercase(Locale.getDefault()).contains("windows")
+
+        private fun String.getOnlyUpperCaseSymbols(): String =
+            this.filter { it.isUpperCase() || it == '$' }
+                .toList()
+                .joinToString(separator = "")
+    }
+}
diff --git a/plugins/kotlin-dataframe/build.gradle.kts b/plugins/kotlin-dataframe/build.gradle.kts
@@ -60,9 +60,14 @@ 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-stdlib-jdk8", "kotlin-stdlib-jdk8")
         setLibraryProperty("org.jetbrains.kotlin.test.kotlin-reflect", "kotlin-reflect")
         setLibraryProperty("org.jetbrains.kotlin.test.kotlin-test", "kotlin-test")
         setLibraryProperty("org.jetbrains.kotlin.test.kotlin-script-runtime", "kotlin-script-runtime")
@@ -83,21 +88,21 @@ tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach
 }
 
 tasks.withType<JavaCompile> {
-    sourceCompatibility = JavaVersion.VERSION_1_8.toString()
-    targetCompatibility = JavaVersion.VERSION_1_8.toString()
+    sourceCompatibility = JavaVersion.VERSION_11.toString()
+    targetCompatibility = JavaVersion.VERSION_11.toString()
 }
 
 tasks.compileKotlin {
     compilerOptions {
         languageVersion = KotlinVersion.KOTLIN_2_0
-        jvmTarget = JvmTarget.JVM_1_8
+        jvmTarget = JvmTarget.JVM_11
     }
 }
 
 tasks.compileTestKotlin {
     compilerOptions {
         languageVersion = KotlinVersion.KOTLIN_2_0
-        jvmTarget = JvmTarget.JVM_1_8
+        jvmTarget = JvmTarget.JVM_11
     }
 }
 
diff --git a/plugins/kotlin-dataframe/gradle.properties b/plugins/kotlin-dataframe/gradle.properties
@@ -1,2 +1,6 @@
 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/org/jetbrains/kotlin/fir/dataframe/AbstractDataFrameBlackBoxCodegenTest.kt b/plugins/kotlin-dataframe/tests/org/jetbrains/kotlin/fir/dataframe/AbstractDataFrameBlackBoxCodegenTest.kt
@@ -5,6 +5,7 @@
 
 package org.jetbrains.kotlin.fir.dataframe
 
+import org.jetbrains.kotlin.config.JvmTarget
 import org.jetbrains.kotlin.fir.dataframe.services.DataFramePluginAnnotationsProvider
 import org.jetbrains.kotlin.fir.dataframe.services.ExperimentalExtensionRegistrarConfigurator
 import org.jetbrains.kotlin.fir.dataframe.services.TemporaryDirectoryManagerImplFixed
@@ -40,7 +41,8 @@ open class AbstractDataFrameBlackBoxCodegenTest : AbstractFirLightTreeBlackBoxCo
     override fun configure(builder: TestConfigurationBuilder) {
         super.configure(builder)
         builder.defaultDirectives {
-            JvmEnvironmentConfigurationDirectives.JDK_KIND with TestJdkKind.FULL_JDK
+            JvmEnvironmentConfigurationDirectives.JDK_KIND with TestJdkKind.FULL_JDK_11
+            JvmEnvironmentConfigurationDirectives.JVM_TARGET with JvmTarget.JVM_11
             +JvmEnvironmentConfigurationDirectives.WITH_REFLECT
             +IGNORE_DEXING
         }
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
@@ -5,6 +5,7 @@
 
 package org.jetbrains.kotlin.fir.dataframe
 
+import org.jetbrains.kotlin.config.JvmTarget
 import org.jetbrains.kotlin.fir.dataframe.services.Directives
 import org.jetbrains.kotlin.fir.dataframe.services.DataFramePluginAnnotationsProvider
 import org.jetbrains.kotlin.fir.dataframe.services.ExperimentalExtensionRegistrarConfigurator
@@ -52,7 +53,8 @@ abstract class AbstractDataFrameDiagnosticTest : AbstractKotlinCompilerTest() {
             +FirDiagnosticsDirectives.ENABLE_PLUGIN_PHASES
             +FirDiagnosticsDirectives.FIR_DUMP
             FirDiagnosticsDirectives.FIR_PARSER with FirParser.LightTree
-            JvmEnvironmentConfigurationDirectives.JDK_KIND with TestJdkKind.FULL_JDK
+            JvmEnvironmentConfigurationDirectives.JDK_KIND with TestJdkKind.FULL_JDK_11
+            JvmEnvironmentConfigurationDirectives.JVM_TARGET with JvmTarget.JVM_11
         }
 
         useDirectives(Directives)
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
@@ -26,7 +26,7 @@ internal object KotlinCompilationUtil {
         // workaround for https://github.com/tschuchortdev/kotlin-compile-testing/issues/105
         compilation.kotlincArguments += "-Xjava-source-roots=${javaSrcRoot.absolutePath}"
         compilation.jvmDefault = "all"
-        compilation.jvmTarget = JvmTarget.JVM_1_8.description
+        compilation.jvmTarget = JvmTarget.JVM_11.description
         compilation.inheritClassPath = false
         compilation.verbose = false
         compilation.classpaths = Classpaths.inheritedClasspath + classpaths

Original file line number	Diff line number	Diff line change
`@@ -144,13 +144,13 @@ kotlin.jvmToolchain(11)`
`144`	`144`	`allprojects {`
`145`	`145`	`tasks.withType<KotlinCompile> {`
`146`	`146`	`compilerOptions {`
`147`		`- jvmTarget = JvmTarget.JVM_1_8`
	`147`	`+ jvmTarget = JvmTarget.JVM_11`
`148`	`148`	`}`
`149`	`149`	`}`
`150`	`150`
`151`	`151`	`tasks.withType<JavaCompile> {`
`152`		`- sourceCompatibility = JavaVersion.VERSION_1_8.toString()`
`153`		`- targetCompatibility = JavaVersion.VERSION_1_8.toString()`
	`152`	`+ sourceCompatibility = JavaVersion.VERSION_11.toString()`
	`153`	`+ targetCompatibility = JavaVersion.VERSION_11.toString()`
`154`	`154`	`}`
`155`	`155`
`156`	`156`	`// Attempts to configure ktlint for each sub-project that uses the plugin`
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_1_8`
	`26`	`+ compilerOptions.jvmTarget = JvmTarget.JVM_11`
`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_1_8`
	`27`	`+ compilerOptions.jvmTarget = JvmTarget.JVM_11`
`28`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,6 @@ dependencies {`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`tasks.withType<KotlinCompile> {`
`28`		`- compilerOptions.jvmTarget = JvmTarget.JVM_1_8`
	`28`	`+ compilerOptions.jvmTarget = JvmTarget.JVM_11`
`29`	`29`	`}`
`30`	`30`
Original file line number	Diff line number	Diff line change
`@@ -91,12 +91,12 @@ gradlePlugin {`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {`
`94`		`- compilerOptions.jvmTarget = JvmTarget.JVM_1_8`
	`94`	`+ compilerOptions.jvmTarget = JvmTarget.JVM_11`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`tasks.withType<JavaCompile>().all {`
`98`		`- sourceCompatibility = JavaVersion.VERSION_1_8.toString()`
`99`		`- targetCompatibility = JavaVersion.VERSION_1_8.toString()`
	`98`	`+ sourceCompatibility = JavaVersion.VERSION_11.toString()`
	`99`	`+ targetCompatibility = JavaVersion.VERSION_11.toString()`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`sourceSets {`