From ee9c5977671dccc8d162fc967ffe7f79006dcd81 Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Mon, 24 Aug 2020 14:09:52 +0200 Subject: [PATCH] Build: Remove exclusion of kotlinx-coroutines-core in scripting-compiler The previous fix was insufficient to fix gradle substitution in MPP projects (https://github.com/gradle/gradle/issues/14017) --- .../scripting-compiler-impl-embeddable/build.gradle.kts | 2 +- plugins/scripting/scripting-compiler-impl/build.gradle.kts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/scripting/scripting-compiler-impl-embeddable/build.gradle.kts b/plugins/scripting/scripting-compiler-impl-embeddable/build.gradle.kts index 8fa135b27d4..85b519d2e3f 100644 --- a/plugins/scripting/scripting-compiler-impl-embeddable/build.gradle.kts +++ b/plugins/scripting/scripting-compiler-impl-embeddable/build.gradle.kts @@ -10,7 +10,7 @@ dependencies { runtimeOnly(project(":kotlin-scripting-common")) runtimeOnly(project(":kotlin-scripting-jvm")) runtimeOnly(kotlinStdlib()) - runtimeOnly(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false } + runtimeOnly(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) } publish() diff --git a/plugins/scripting/scripting-compiler-impl/build.gradle.kts b/plugins/scripting/scripting-compiler-impl/build.gradle.kts index df65eaff1e3..701be0ccfdd 100644 --- a/plugins/scripting/scripting-compiler-impl/build.gradle.kts +++ b/plugins/scripting/scripting-compiler-impl/build.gradle.kts @@ -17,7 +17,7 @@ dependencies { compile(project(":kotlin-scripting-jvm")) compile(kotlinStdlib()) compileOnly(project(":kotlin-reflect-api")) - compile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false } + compile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) compileOnly(intellijCoreDep()) { includeJars("intellij-core") } compileOnly(intellijDep()) { includeJars("asm-all", rootProject = rootProject) }