From 02c40086902beeeab304092068946c3165721faa Mon Sep 17 00:00:00 2001 From: Ilya Matveev Date: Mon, 6 Apr 2020 18:57:29 +0700 Subject: [PATCH] [Gradle, native] Blacklist java.endorsed.dirs for all tools System property java.endorsed.dirs is set by IDEA but not supported since Java 9 preventing starting a JVM. This patch takes this into account and blacklists this property for all K/N tools including the commonizer. See also: https://youtrack.jetbrains.com/issue/IDEA-193219 https://youtrack.jetbrains.com/issue/KT-25887 --- .../org/jetbrains/kotlin/compilerRunner/KotlinToolRunner.kt | 2 +- .../org/jetbrains/kotlin/compilerRunner/nativeToolRunners.kt | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/KotlinToolRunner.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/KotlinToolRunner.kt index 5fa1408fcb2..7f13f3086df 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/KotlinToolRunner.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/KotlinToolRunner.kt @@ -25,7 +25,7 @@ internal abstract class KotlinToolRunner( open val environmentBlacklist: Set = emptySet() open val systemProperties: Map = emptyMap() - open val systemPropertiesBlacklist: Set = emptySet() + open val systemPropertiesBlacklist: Set = setOf("java.endorsed.dirs") abstract val classpath: Set open fun checkClasspath(): Unit = check(classpath.isNotEmpty()) { "Classpath of the tool is empty: $displayName" } diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/nativeToolRunners.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/nativeToolRunners.kt index 43342f678d6..38aa50a119e 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/nativeToolRunners.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/nativeToolRunners.kt @@ -59,7 +59,6 @@ internal abstract class KotlinNativeToolRunner( "java.library.path" to "${project.konanHome}/konan/nativelib" ) } - final override val systemPropertiesBlacklist = setOf("java.endorsed.dirs") final override val classpath by lazy { project.fileTree("${project.konanHome}/konan/lib/").apply { include("*.jar") }.toSet()