diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/modules/CoreJrtFileSystem.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/modules/CoreJrtFileSystem.kt index 44ed36bcd71..a444752f2ee 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/modules/CoreJrtFileSystem.kt +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/modules/CoreJrtFileSystem.kt @@ -37,10 +37,9 @@ class CoreJrtFileSystem : DeprecatedVirtualFileSystem() { val rootUri = URI.create(StandardFileSystems.JRT_PROTOCOL + ":/") val jrtFsJar = loadJrtFsJar(jdkHome) ?: return@createMap null val fileSystem = - if (SystemInfo.isJavaVersionAtLeast(9, 0, 0)) { + if (isAtLeastJava9()) { FileSystems.newFileSystem(rootUri, mapOf("java.home" to jdkHome.absolutePath)) - } - else { + } else { val classLoader = URLClassLoader(arrayOf(jrtFsJar.toURI().toURL()), null) FileSystems.newFileSystem(rootUri, emptyMap(), classLoader) } diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/modules/javaVersionUtils.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/modules/javaVersionUtils.kt new file mode 100644 index 00000000000..8c6dec8300b --- /dev/null +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/modules/javaVersionUtils.kt @@ -0,0 +1,12 @@ +/* + * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license + * that can be found in the license/LICENSE.txt file. + */ + +package org.jetbrains.kotlin.cli.jvm.modules + +import com.intellij.openapi.util.SystemInfo + +fun isAtLeastJava9(): Boolean { + return SystemInfo.isJavaVersionAtLeast(9, 0, 0) +} diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/modules/javaVersionUtils.kt.173 b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/modules/javaVersionUtils.kt.173 new file mode 100644 index 00000000000..c749d40a32b --- /dev/null +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/modules/javaVersionUtils.kt.173 @@ -0,0 +1,12 @@ +/* + * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license + * that can be found in the license/LICENSE.txt file. + */ + +package org.jetbrains.kotlin.cli.jvm.modules + +import com.intellij.openapi.util.SystemInfo + +fun isAtLeastJava9(): Boolean { + return SystemInfo.isJavaVersionAtLeast("9") +}