Remove hack with targets. Add target for most recent jdk

2019-05-15 11:59:29 +02:00
parent a53fa0dfbf
commit 812b766894
4 changed files with 40 additions and 32 deletions
@@ -31,12 +31,7 @@ enum class JvmTarget(override val description: String) : TargetPlatformVersion {
    val bytecodeVersion: Int by lazy {
        when (this) {
            JVM_1_6 -> Opcodes.V1_6
-            JVM_1_8 ->
-                when {
-                    java.lang.Boolean.valueOf(System.getProperty("kotlin.test.substitute.bytecode.1.8.to.10")) -> Opcodes.V9 + 1
-                    java.lang.Boolean.valueOf(System.getProperty("kotlin.test.substitute.bytecode.1.8.to.1.9")) -> Opcodes.V9
-                    else -> Opcodes.V1_8
-                }
+            JVM_1_8 -> Opcodes.V1_8
            JVM_9 -> Opcodes.V9
            JVM_10 -> Opcodes.V9 + 1
            JVM_11 -> Opcodes.V9 + 2