From 10c14260b18f2f016ac18e6cbfc9c45679e3e2da Mon Sep 17 00:00:00 2001 From: Vyacheslav Gerasimov Date: Tue, 27 Mar 2018 16:20:43 +0300 Subject: [PATCH] Build: Fix dependency on markdown in :prepare:idea-plugin 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. --- prepare/idea-plugin/build.gradle.kts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/prepare/idea-plugin/build.gradle.kts b/prepare/idea-plugin/build.gradle.kts index 550a4f59c91..190338f591f 100644 --- a/prepare/idea-plugin/build.gradle.kts +++ b/prepare/idea-plugin/build.gradle.kts @@ -68,7 +68,7 @@ dependencies { sideJars(commonDep("javax.inject")) sideJars(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { 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")) { @@ -82,6 +82,7 @@ val jar = runtimeJar(task("shadowJar")) { } ideaPlugin { + duplicatesStrategy = DuplicatesStrategy.FAIL // Investigation is required if we have multiple jars with same name dependsOn(":dist") from(jar) from(sideJars)