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

Build: properly remove artifact from archives in runtimeJar helper

Browse Source
This commit is contained in:
Vyacheslav Gerasimov
2019-02-20 21:19:39 +03:00
parent 6098e97ae5
commit f4c157a9bc
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
buildSrc/src/main/kotlin/artifacts.kt
+1 -1
View File
@@ -59,7 +59,7 @@ fun <T : Jar> Project.runtimeJar(task: T, body: T.() -> Unit = {}): T {
extra["runtimeJarTask"] = task extra["runtimeJarTask"] = task
tasks.findByName("jar")?.let { defaultJarTask -> tasks.findByName("jar")?.let { defaultJarTask ->
configurations.getOrCreate("archives") 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 { return task.apply {
setupPublicJar(project.the<BasePluginConvention>().archivesBaseName) setupPublicJar(project.the<BasePluginConvention>().archivesBaseName)