From 186b002a010e8260f55d240a911ea3e2a9cf7ac6 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Thu, 18 May 2017 19:05:53 +0300 Subject: [PATCH] Implement Java 9 module visibility checks In this commit, only IDE tests are added, because we look for module declarations in the IDE across the whole project, whereas in the compiler we should do this on the module path only and that requires separate work (KT-18599) which is done in the following commits. (The change in Cache.kt is needed so that JvmModuleAccessibilityChecker.ClassifierUsage, which is an inner class, would be injected properly.) #KT-18598 In Progress #KT-18599 In Progress Original commit: e32880d9a3ce6d9badd686e25675bc50fb7e072e --- .../test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt index 2706d875e56..7a484fa415f 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt @@ -939,7 +939,7 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { } fun testJre9() { - val path = KotlinTestUtils.getJre9HomeIfPossible()?.absolutePath ?: return + val path = KotlinTestUtils.getJdk9HomeIfPossible()?.absolutePath ?: return val jdk = myModel.global.addSdk(JDK_NAME, path, "9", JpsJavaSdkType.INSTANCE) jdk.addRoot(StandardFileSystems.JRT_PROTOCOL_PREFIX + path + URLUtil.JAR_SEPARATOR + "java.base", JpsOrderRootType.COMPILED)