From 850681f5e3a97b82e2bf449cce975657bd94b6e1 Mon Sep 17 00:00:00 2001 From: Mikhail Bogdanov Date: Tue, 14 Apr 2020 13:58:10 +0200 Subject: [PATCH] Rollback JVM 8 target support on Android --- .../android/tests/CodegenTestsOnAndroidGenerator.kt | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.kt b/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.kt index e163e540e53..18e8eb0862b 100644 --- a/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.kt +++ b/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.kt @@ -276,13 +276,11 @@ class CodegenTestsOnAndroidGenerator private constructor(private val pathManager if (fullFileText.contains("@file:JvmPackageName(")) continue // TODO: Support jvm assertions if (fullFileText.contains("// KOTLIN_CONFIGURATION_FLAGS: ASSERTIONS_MODE=jvm")) continue - val targets = InTextDirectivesUtils.findLinesWithPrefixesRemoved(fullFileText, "// JVM_TARGET:") - .also { it.remove(JvmTarget.JVM_1_6.description) } - val isJvm8Target = - if (targets.isEmpty()) false - else if (targets.contains(JvmTarget.JVM_1_8.description) && targets.size == 1) true - else continue //TODO: support other targets on Android + // TODO: support JVM 8 test with D8 + if (fullFileText.contains("// JVM_TARGET")) continue + + val isJvm8Target = false // TODO: support SKIP_JDK6 on new platforms if (fullFileText.contains("// SKIP_JDK6")) continue