setting java version to 11

Jolanrensen · Jolanrensen · commit e77e771f7b9c · 2025-03-04T14:42:02.000+01:00
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
@@ -40,7 +40,6 @@ tasks.test {
     useJUnitPlatform()
     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
@@ -37,7 +37,7 @@ open class AbstractExplainerBlackBoxCodegenTest : BaseTestRunner() {
             targetBackend = TargetBackend.JVM_IR
         }
         defaultDirectives {
-            JvmEnvironmentConfigurationDirectives.JDK_KIND with TestJdkKind.FULL_JDK
+            JvmEnvironmentConfigurationDirectives.JDK_KIND with TestJdkKind.FULL_JDK_11
             +JvmEnvironmentConfigurationDirectives.WITH_REFLECT
         }
         facadeStep(::ClassicFrontendFacade)
diff --git a/plugins/kotlin-dataframe/build.gradle.kts b/plugins/kotlin-dataframe/build.gradle.kts
@@ -62,7 +62,6 @@ tasks.test {
     environment("TEST_RESOURCES", project.layout.projectDirectory)
     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 +82,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/tests/org/jetbrains/kotlin/fir/dataframe/AbstractDataFrameBlackBoxCodegenTest.kt b/plugins/kotlin-dataframe/tests/org/jetbrains/kotlin/fir/dataframe/AbstractDataFrameBlackBoxCodegenTest.kt
@@ -40,7 +40,7 @@ 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.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
@@ -52,7 +52,7 @@ 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
         }
 
         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 {`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ open class AbstractExplainerBlackBoxCodegenTest : BaseTestRunner() {`
`37`	`37`	`targetBackend = TargetBackend.JVM_IR`
`38`	`38`	`}`
`39`	`39`	`defaultDirectives {`
`40`		`- JvmEnvironmentConfigurationDirectives.JDK_KIND with TestJdkKind.FULL_JDK`
	`40`	`+ JvmEnvironmentConfigurationDirectives.JDK_KIND with TestJdkKind.FULL_JDK_11`
`41`	`41`	`+JvmEnvironmentConfigurationDirectives.WITH_REFLECT`
`42`	`42`	`}`
`43`	`43`	`facadeStep(::ClassicFrontendFacade)`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,6 @@ tasks.test {`
`62`	`62`	`environment("TEST_RESOURCES", project.layout.projectDirectory)`
`63`	`63`	`doFirst {`
`64`	`64`	`setLibraryProperty("org.jetbrains.kotlin.test.kotlin-stdlib", "kotlin-stdlib")`
`65`		`- setLibraryProperty("org.jetbrains.kotlin.test.kotlin-stdlib-jdk8", "kotlin-stdlib-jdk8")`
`66`	`65`	`setLibraryProperty("org.jetbrains.kotlin.test.kotlin-reflect", "kotlin-reflect")`
`67`	`66`	`setLibraryProperty("org.jetbrains.kotlin.test.kotlin-test", "kotlin-test")`
`68`	`67`	`setLibraryProperty("org.jetbrains.kotlin.test.kotlin-script-runtime", "kotlin-script-runtime")`
`@@ -83,21 +82,21 @@ tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach`
`83`	`82`	`}`
`84`	`83`
`85`	`84`	`tasks.withType<JavaCompile> {`
`86`		`- sourceCompatibility = JavaVersion.VERSION_1_8.toString()`
`87`		`- targetCompatibility = JavaVersion.VERSION_1_8.toString()`
	`85`	`+ sourceCompatibility = JavaVersion.VERSION_11.toString()`
	`86`	`+ targetCompatibility = JavaVersion.VERSION_11.toString()`
`88`	`87`	`}`
`89`	`88`
`90`	`89`	`tasks.compileKotlin {`
`91`	`90`	`compilerOptions {`
`92`	`91`	`languageVersion = KotlinVersion.KOTLIN_2_0`
`93`		`- jvmTarget = JvmTarget.JVM_1_8`
	`92`	`+ jvmTarget = JvmTarget.JVM_11`
`94`	`93`	`}`
`95`	`94`	`}`
`96`	`95`
`97`	`96`	`tasks.compileTestKotlin {`
`98`	`97`	`compilerOptions {`
`99`	`98`	`languageVersion = KotlinVersion.KOTLIN_2_0`
`100`		`- jvmTarget = JvmTarget.JVM_1_8`
	`99`	`+ jvmTarget = JvmTarget.JVM_11`
`101`	`100`	`}`
`102`	`101`	`}`
`103`	`102`