From 29568d2f485975cace1226242045bc2588335117 Mon Sep 17 00:00:00 2001
From: Mikhael Bogdanov <mikhael.bogdanov@jetbrains.com>
Date: Wed, 26 Sep 2018 15:44:48 +0200
Subject: [PATCH] Add test configuration for JDK_11

---
 build.gradle.kts                       | 1 +
 buildSrc/src/main/kotlin/jdksFinder.kt | 2 +-
 compiler/build.gradle.kts              | 5 +++++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 1cc4d8537c1..b009232f5a2 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -107,6 +107,7 @@ extra["JDK_17"] = jdkPath("1.7")
 extra["JDK_18"] = jdkPath("1.8")
 extra["JDK_9"] = jdkPath("9")
 extra["JDK_10"] = jdkPathIfFound("10")
+extra["JDK_11"] = jdkPathIfFound("11")
 
 rootProject.apply {
     from(rootProject.file("versions.gradle.kts"))
diff --git a/buildSrc/src/main/kotlin/jdksFinder.kt b/buildSrc/src/main/kotlin/jdksFinder.kt
index c63fa280543..a46d8a64ba7 100644
--- a/buildSrc/src/main/kotlin/jdksFinder.kt
+++ b/buildSrc/src/main/kotlin/jdksFinder.kt
@@ -9,7 +9,7 @@ import net.rubygrapefruit.platform.WindowsRegistry.Key.HKEY_LOCAL_MACHINE
 import org.gradle.internal.os.OperatingSystem
 
 enum class JdkMajorVersion {
-    JDK_16, JDK_17, JDK_18, JDK_9, JDK_10
+    JDK_16, JDK_17, JDK_18, JDK_9, JDK_10, JDK_11
 }
 
 val jdkAlternativeVarNames = mapOf(JdkMajorVersion.JDK_9 to listOf("JDK_19"))
diff --git a/compiler/build.gradle.kts b/compiler/build.gradle.kts
index 8a3cf4d2def..5a2390d91c7 100644
--- a/compiler/build.gradle.kts
+++ b/compiler/build.gradle.kts
@@ -200,6 +200,11 @@ codegenTest(target = 10, jvm = 10) {
     systemProperty("kotlin.test.substitute.bytecode.1.8.to.10", "true")
 }
 
+codegenTest(target = 8, jvm = 11) {
+    systemProperty("kotlin.test.default.jvm.target", "1.8")
+    jvmArgs!!.add( "-XX:-FailOverToOldVerifier")
+}
+
 val generateTests by generator("org.jetbrains.kotlin.generators.tests.GenerateCompilerTestsKt")
 
 testsJar()