Build: properly remove artifact from archives in runtimeJar helper

2019-02-20 21:19:39 +03:00
parent 6098e97ae5
commit f4c157a9bc
1 changed files with 1 additions and 1 deletions
@@ -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)