azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

JVM: remove most usages of JvmTarget.JVM_1_6

Browse Source
This commit is contained in:
Alexander Udalov
2023-05-12 10:50:07 +02:00
committed by Space Team
parent 75197d1b86
commit fb900d2e2a
20 changed files with 137 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/classic/JavaCompilerFacade.kt
+1 -3
View File
@@ -65,8 +65,7 @@ class JavaCompilerFacade(private val testServices: TestServices) {
}
private fun compileJavaFiles(module: TestModule, jvmTarget: JvmTarget, files: List<File>, javacOptions: List<String>, ignoreErrors: Boolean) {
val targetIsJava8OrLower = System.getProperty("java.version").startsWith("1.") && jvmTarget <= JvmTarget.JVM_1_6
if (USE_JAVAC_BASED_ON_JVM_TARGET !in module.directives || targetIsJava8OrLower) {
if (USE_JAVAC_BASED_ON_JVM_TARGET !in module.directives) {
org.jetbrains.kotlin.test.compileJavaFiles(
files,
javacOptions,
@@ -76,7 +75,6 @@ class JavaCompilerFacade(private val testServices: TestServices) {
return
}
val jdkHome = when (jvmTarget) {
JvmTarget.JVM_1_6 -> KtTestUtil.getJdk6Home()
JvmTarget.JVM_1_8 -> KtTestUtil.getJdk8Home()
JvmTarget.JVM_9,
JvmTarget.JVM_11 -> KtTestUtil.getJdk11Home()