From 6fe0829cf8279d5ad1360268c97f68d5a540883d Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Wed, 30 May 2018 00:20:45 +0300 Subject: [PATCH] Remove scripting plugin from JVM compiler classpath #KT-24559 fixed --- .../org/jetbrains/kotlin/gradle/tasks/jarSearchingUtil.kt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/jarSearchingUtil.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/jarSearchingUtil.kt index bae3f80e0d4..ddbc7ae6ee9 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/jarSearchingUtil.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/jarSearchingUtil.kt @@ -50,8 +50,7 @@ private val KOTLIN_REFLECT = "kotlin-reflect" internal fun findKotlinJvmCompilerClasspath(project: Project): List = findKotlinModuleJar(project, K2JVM_COMPILER_CLASS, KOTLIN_COMPILER_EMBEDDABLE).let { if (it.isEmpty()) it - else it + findKotlinStdlibClasspath(project) + findKotlinScriptRuntimeClasspath(project) + findKotlinReflectClasspath(project) + - findKotlinScriptCommonClasspath(project) + findKotlinScriptJvmClasspath(project) + findCoroutinesClasspath() + else it + findKotlinStdlibClasspath(project) + findKotlinScriptRuntimeClasspath(project) + findKotlinReflectClasspath(project) } internal fun findKotlinJsCompilerClasspath(project: Project): List =