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

Build: Fix dependency on markdown in :prepare:idea-plugin

Browse Source 
org.jetbrains:markdown brings kotlin-stdlib dependency transitively, which resolves to default configuration of :kotlin-stdlib project. But we need to pack jar from distJar configuration. Also sourceSets.builtins.output is copied to plugin because :kotlin-stdlib has compile dependency on it. Probably we should also refactor :kotlin-stdlib to avoid such confusions in future.
This commit is contained in:
Vyacheslav Gerasimov
2018-03-27 16:20:43 +03:00
parent 22496353b6
commit 10c14260b1
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
prepare/idea-plugin/build.gradle.kts
+2 -1
View File
@@ -68,7 +68,7 @@ dependencies {
sideJars(commonDep("javax.inject")) sideJars(commonDep("javax.inject"))
sideJars(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false } sideJars(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false }
sideJars(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-jdk8")) { isTransitive = false } sideJars(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-jdk8")) { isTransitive = false }
sideJars(commonDep("org.jetbrains", "markdown")) sideJars(commonDep("org.jetbrains", "markdown")) { isTransitive = false }
} }
val jar = runtimeJar(task<ShadowJar>("shadowJar")) { val jar = runtimeJar(task<ShadowJar>("shadowJar")) {
@@ -82,6 +82,7 @@ val jar = runtimeJar(task<ShadowJar>("shadowJar")) {
} }
ideaPlugin { ideaPlugin {
duplicatesStrategy = DuplicatesStrategy.FAIL // Investigation is required if we have multiple jars with same name
dependsOn(":dist") dependsOn(":dist")
from(jar) from(jar)
from(sideJars) from(sideJars)