From 3b472f44114bd3177531496c0819a92ff08a7370 Mon Sep 17 00:00:00 2001 From: Vyacheslav Gerasimov Date: Wed, 18 Apr 2018 17:05:58 +0300 Subject: [PATCH] Build: Use lazy from with trailing lambda in `fromEmbeddedComponents` configurations shouldn't be resolved at project configuration step --- buildSrc/src/main/kotlin/dependencies.kt | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/buildSrc/src/main/kotlin/dependencies.kt b/buildSrc/src/main/kotlin/dependencies.kt index f341a4e3c4f..8fb83a291a2 100644 --- a/buildSrc/src/main/kotlin/dependencies.kt +++ b/buildSrc/src/main/kotlin/dependencies.kt @@ -112,6 +112,14 @@ fun AbstractCopyTask.fromEmbeddedComponents() { if (this is ShadowJar) { from(embeddedComponents) } else { - embeddedComponents.forEach { from(if (it.isDirectory) it else project.zipTree(it)) } + dependsOn(embeddedComponents) + from { + embeddedComponents.map { file -> + if (file.isDirectory) + project.files(file) + else + project.zipTree(file) + } + } } } \ No newline at end of file