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

Move to JDK_X_Y variables

Browse Source
This commit is contained in:
Nikolay Krasko
2022-09-05 15:04:44 +02:00
committed by Space
parent 2df9203336
commit 1630386712
24 changed files with 71 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/test/TestJdkKind.kt
+3 -3
View File
@@ -23,13 +23,13 @@ enum class TestJdkKind(val requiresSeparateProcess: Boolean = false) {
// Also, now it contains new methods in java.lang.String introduced in JDK 11
MODIFIED_MOCK_JDK,
// JDK found at $JDK_16
// JDK found at $JDK_1_6
FULL_JDK_6(requiresSeparateProcess = true),
// JDK found at $JDK_11
// JDK found at $JDK_11_0
FULL_JDK_11(requiresSeparateProcess = true),
// JDK found at $JDK_17
// JDK found at $JDK_17_0
FULL_JDK_17(requiresSeparateProcess = true),
// JDK found at java.home
compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/test/util/KtTestUtil.java
+3 -3
View File
@@ -145,17 +145,17 @@ public class KtTestUtil {
@NotNull
public static File getJdk6Home() {
return getJdkHome("JDK_6", "JDK_16");
return getJdkHome("JDK_1_6", "JDK_6", "JDK_16");
}
@NotNull
public static File getJdk8Home() {
return getJdkHome("JDK_8", "JDK_18");
return getJdkHome("JDK_1_8", "JDK_8", "JDK_18");
}
@NotNull
public static File getJdk11Home() {
return getJdkHome("JDK_11");
return getJdkHome("JDK_11_0", "JDK_11");
}
@NotNull