azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Build: Remove exclusion of kotlinx-coroutines-core in scripting-compiler

Browse Source 
The previous fix was insufficient to fix gradle substitution in MPP
projects (https://github.com/gradle/gradle/issues/14017)
This commit is contained in:
Ilya Chernikov
2020-08-24 14:09:52 +02:00
parent 741f5de0f9
commit ee9c597767
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/scripting/scripting-compiler-impl-embeddable/build.gradle.kts
+1 -1
View File
@@ -10,7 +10,7 @@ dependencies {
runtimeOnly(project(":kotlin-scripting-common")) runtimeOnly(project(":kotlin-scripting-common"))
runtimeOnly(project(":kotlin-scripting-jvm")) runtimeOnly(project(":kotlin-scripting-jvm"))
runtimeOnly(kotlinStdlib()) runtimeOnly(kotlinStdlib())
runtimeOnly(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false } runtimeOnly(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core"))
} }
publish() publish()
plugins/scripting/scripting-compiler-impl/build.gradle.kts
+1 -1
View File
@@ -17,7 +17,7 @@ dependencies {
compile(project(":kotlin-scripting-jvm")) compile(project(":kotlin-scripting-jvm"))
compile(kotlinStdlib()) compile(kotlinStdlib())
compileOnly(project(":kotlin-reflect-api")) 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(intellijCoreDep()) { includeJars("intellij-core") }
compileOnly(intellijDep()) { includeJars("asm-all", rootProject = rootProject) } compileOnly(intellijDep()) { includeJars("asm-all", rootProject = rootProject) }