From 39218f007eb30c578b1619ca98f958ea50e6a7bb Mon Sep 17 00:00:00 2001
From: Alexander Zolotov <goldifit@gmail.com>
Date: Tue, 27 Feb 2018 15:54:25 +0300
Subject: [PATCH] Dependencies: use Gradle file operations to remove outdated
 JDK

it throws an exception in case of any problems
---
 build/dependencies/setupJdk.gradle | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/build/dependencies/setupJdk.gradle b/build/dependencies/setupJdk.gradle
index a1270837526f..c0ca15e62173 100644
--- a/build/dependencies/setupJdk.gradle
+++ b/build/dependencies/setupJdk.gradle
@@ -43,9 +43,7 @@ task setupJdk18(dependsOn: downloadJdk18) {
 def unpackJdk(jdkArchive, outputDir) {
   logger.info("Unpacking $jdkArchive to ${outputDir}")
   if (file(outputDir).exists()) {
-    if (!file(outputDir).deleteDir()) {
-      throw new Exception("unpackJdk: Unable to delete folder: $outputDir")
-    }
+    delete(outputDir)
   }
   def currentOs = org.gradle.internal.os.OperatingSystem.current()
   if (currentOs.isWindows()) {