From cfd6b7c14c212f615cff39b269c89064fd4a39ca Mon Sep 17 00:00:00 2001 From: Alexander Zolotov Date: Tue, 24 Oct 2017 17:50:47 +0300 Subject: [PATCH] External dependencies: throw exception if jdk ouput directory cannot be deleted --- build/dependencies/setupJdk.gradle | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/build/dependencies/setupJdk.gradle b/build/dependencies/setupJdk.gradle index 699e52c69c8a..7090d695e435 100644 --- a/build/dependencies/setupJdk.gradle +++ b/build/dependencies/setupJdk.gradle @@ -56,7 +56,11 @@ task setupJdk18(dependsOn: downloadJdk18) { def unpackJdk(jdkArchive, outputDir) { logger.info("Unpacking $jdkArchive to ${outputDir}") - file(outputDir).deleteDir() + if (file(outputDir).exists()) { + if (!file(outputDir).deleteDir()) { + throw new Exception("unpackJdk: Unable to delete folder: $outputDir") + } + } def currentOs = org.gradle.internal.os.OperatingSystem.current() if (currentOs.isWindows()) { copy {