From f4c157a9bccd7e3c0c05341c8efd83ec5641e0fa Mon Sep 17 00:00:00 2001
From: Vyacheslav Gerasimov <vyacheslav.gerasimov@jetbrains.com>
Date: Wed, 20 Feb 2019 21:19:39 +0300
Subject: [PATCH] Build: properly remove artifact from archives in runtimeJar
 helper

---
 buildSrc/src/main/kotlin/artifacts.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildSrc/src/main/kotlin/artifacts.kt b/buildSrc/src/main/kotlin/artifacts.kt
index 7df28ab9ead..eb487d21d4c 100644
--- a/buildSrc/src/main/kotlin/artifacts.kt
+++ b/buildSrc/src/main/kotlin/artifacts.kt
@@ -59,7 +59,7 @@ fun <T : Jar> Project.runtimeJar(task: T, body: T.() -> Unit = {}): T {
     extra["runtimeJarTask"] = task
     tasks.findByName("jar")?.let { defaultJarTask ->
         configurations.getOrCreate("archives")
-            .artifacts.removeAll { (it as? ArchivePublishArtifact)?.archiveTask?.let { it == defaultJarTask } ?: false }
+            .artifacts.removeAll { artifact -> artifact.file in defaultJarTask.outputs.files }
     }
     return task.apply {
         setupPublicJar(project.the<BasePluginConvention>().archivesBaseName)