From ee1d2ecb4b1360ec4e2dfe636886a1e544fd4830 Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Thu, 2 Sep 2021 17:47:53 +0300 Subject: [PATCH] [Gradle, JS] Delete recursively tmp directory in up-to-date case --- .../kotlin/gradle/targets/js/nodejs/NodeJsSetupTask.kt | 5 ++++- .../jetbrains/kotlin/gradle/targets/js/yarn/YarnSetupTask.kt | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/nodejs/NodeJsSetupTask.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/nodejs/NodeJsSetupTask.kt index 6fabd1b5e8b..acee86234ba 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/nodejs/NodeJsSetupTask.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/nodejs/NodeJsSetupTask.kt @@ -95,7 +95,10 @@ abstract class NodeJsSetupTask : DefaultTask() { val tmpDir = temporaryDir unpackNodeArchive(nodeJsDist, tmpDir) - if (upToDate && fileHasher.calculateDirHash(tmpDir.resolve(destination.name))!! == dirHash) return + if (upToDate && fileHasher.calculateDirHash(tmpDir.resolve(destination.name))!! == dirHash) { + tmpDir.deleteRecursively() + return + } if (destination.isDirectory) { destination.deleteRecursively() diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/yarn/YarnSetupTask.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/yarn/YarnSetupTask.kt index f589ee3bc31..70aa2eaff1f 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/yarn/YarnSetupTask.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/yarn/YarnSetupTask.kt @@ -105,7 +105,10 @@ open class YarnSetupTask : DefaultTask() { val tmpDir = temporaryDir extract(yarnDist, tmpDir) // parent because archive contains name already - if (upToDate && fileHasher.calculateDirHash(tmpDir.resolve(destination.name))!! == dirHash) return + if (upToDate && fileHasher.calculateDirHash(tmpDir.resolve(destination.name))!! == dirHash) { + tmpDir.deleteRecursively() + return + } if (destination.isDirectory) { destination.deleteRecursively()