From 1f0e9f24c5575b97b41603356cb12832494f0dca Mon Sep 17 00:00:00 2001 From: Vyacheslav Gerasimov Date: Fri, 21 Sep 2018 18:45:50 +0300 Subject: [PATCH] Fix noDefaultJar helper for gradle 4.10 artifacts don't implement ArchivePublishArtifact in gradle 4.10 --- buildSrc/src/main/kotlin/artifacts.kt | 5 ++--- libraries/tools/kotlin-main-kts/build.gradle.kts | 1 - 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/buildSrc/src/main/kotlin/artifacts.kt b/buildSrc/src/main/kotlin/artifacts.kt index fe8e8f1972d..2920ffa2809 100644 --- a/buildSrc/src/main/kotlin/artifacts.kt +++ b/buildSrc/src/main/kotlin/artifacts.kt @@ -56,11 +56,10 @@ fun Project.noDefaultJar() { defaultJarTask.enabled = false defaultJarTask.actions = emptyList() configurations.forEach { cfg -> - cfg.artifacts.removeAll { - (it as? ArchivePublishArtifact)?.archiveTask?.let { it == defaultJarTask } ?: false + cfg.artifacts.removeAll { artifact -> + artifact.file in defaultJarTask.outputs.files } } - } } diff --git a/libraries/tools/kotlin-main-kts/build.gradle.kts b/libraries/tools/kotlin-main-kts/build.gradle.kts index 155410d05ee..62ab1642150 100644 --- a/libraries/tools/kotlin-main-kts/build.gradle.kts +++ b/libraries/tools/kotlin-main-kts/build.gradle.kts @@ -98,4 +98,3 @@ sourcesJar() javadocJar() publish() -