From 441e7cc15d15322a72fd3c45c1b62cfc7f17f2e0 Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Sun, 10 Feb 2019 20:05:15 +0300 Subject: [PATCH] Always use singleFile when passing a configuration as a zipTree parameter --- libraries/stdlib/jvm-minimal-for-test/build.gradle.kts | 2 +- libraries/stdlib/jvm/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/stdlib/jvm-minimal-for-test/build.gradle.kts b/libraries/stdlib/jvm-minimal-for-test/build.gradle.kts index d9441c164b4..ec318c0f9b3 100644 --- a/libraries/stdlib/jvm-minimal-for-test/build.gradle.kts +++ b/libraries/stdlib/jvm-minimal-for-test/build.gradle.kts @@ -62,7 +62,7 @@ tasks.withType { val jar = runtimeJar { dependsOn(builtins) - from(provider { zipTree(builtins.asPath) }) { include("kotlin/**") } + from(provider { zipTree(builtins.singleFile) }) { include("kotlin/**") } } val distDir: String by rootProject.extra diff --git a/libraries/stdlib/jvm/build.gradle b/libraries/stdlib/jvm/build.gradle index 7ff100533a3..912690f68b5 100644 --- a/libraries/stdlib/jvm/build.gradle +++ b/libraries/stdlib/jvm/build.gradle @@ -88,7 +88,7 @@ jar { dependsOn(configurations.builtins) manifestAttributes(manifest, project, 'Main' /*true*/) from { - zipTree(configurations.builtins.asPath) + zipTree(configurations.builtins.singleFile) } from sourceSets.experimental.output from sourceSets.coroutinesExperimental.output