From 92e94a406865c80bcc46dcdaac607640acb9cdc2 Mon Sep 17 00:00:00 2001 From: Mikhael Bogdanov Date: Mon, 23 Aug 2021 13:03:42 +0200 Subject: [PATCH] Add JDK 17 test configuration --- compiler/tests-different-jdk/build.gradle.kts | 11 ++++++++++- .../codegen/jdk/CustomJvmTargetOnJvmBaseTest.kt | 10 ++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/compiler/tests-different-jdk/build.gradle.kts b/compiler/tests-different-jdk/build.gradle.kts index 863ce38abc9..2bd03e3fe96 100644 --- a/compiler/tests-different-jdk/build.gradle.kts +++ b/compiler/tests-different-jdk/build.gradle.kts @@ -85,7 +85,7 @@ codegenTest(target = 8, jdk = JdkMajorVersion.JDK_11) codegenTest(target = 11, jdk = JdkMajorVersion.JDK_11) -//JDK 15 +//JDK 15 (TODO: remove) codegenTest(target = 6, jdk = JdkMajorVersion.JDK_15) codegenTest(target = 8, jdk = JdkMajorVersion.JDK_15) @@ -94,6 +94,15 @@ codegenTest(target = 15, jdk = JdkMajorVersion.JDK_15) { systemProperty("kotlin.test.box.d8.disable", true) } +//JDK 17 +codegenTest(target = 6, jdk = JdkMajorVersion.JDK_17) + +codegenTest(target = 8, jdk = JdkMajorVersion.JDK_17) + +codegenTest(target = 17, jdk = JdkMajorVersion.JDK_17) { + systemProperty("kotlin.test.box.d8.disable", true) +} + //..also add this two tasks to build after adding fresh jdks to build agents val mostRecentJdk = JdkMajorVersion.values().last() diff --git a/compiler/tests-different-jdk/tests/org/jetbrains/kotlin/codegen/jdk/CustomJvmTargetOnJvmBaseTest.kt b/compiler/tests-different-jdk/tests/org/jetbrains/kotlin/codegen/jdk/CustomJvmTargetOnJvmBaseTest.kt index 48f6eccaa1b..9691319c238 100644 --- a/compiler/tests-different-jdk/tests/org/jetbrains/kotlin/codegen/jdk/CustomJvmTargetOnJvmBaseTest.kt +++ b/compiler/tests-different-jdk/tests/org/jetbrains/kotlin/codegen/jdk/CustomJvmTargetOnJvmBaseTest.kt @@ -66,6 +66,16 @@ class JvmTarget8OnJvm15 : CustomJvmTargetOnJvmBaseTest() @RunWith(JUnitPlatform::class) class JvmTarget15OnJvm15 : CustomJvmTargetOnJvmBaseTest() +@RunWith(JUnitPlatform::class) +class JvmTarget6OnJvm17 : CustomJvmTargetOnJvmBaseTest() + +@RunWith(JUnitPlatform::class) +class JvmTarget8OnJvm17 : CustomJvmTargetOnJvmBaseTest() + +@RunWith(JUnitPlatform::class) +class JvmTarget17OnJvm17 : CustomJvmTargetOnJvmBaseTest() + + // LAST JDK from JdkMajorVersion available on machine @RunWith(JUnitPlatform::class) class JvmTarget6OnJvmLast : CustomJvmTargetOnJvmBaseTest()