From 932cf21776c59779e0e693310ac4ae8c6e59aecd Mon Sep 17 00:00:00 2001
From: Ilya Goncharov <ilya.goncharov@jetbrains.com>
Date: Thu, 18 Jun 2020 15:19:49 +0300
Subject: [PATCH] [Gradle, JS] Allow to change destDir only for separate task
 and name it destinationDir

#KT-38331 fixed
---
 .../jetbrains/kotlin/gradle/targets/js/dukat/DukatTask.kt   | 6 +++---
 .../kotlin/gradle/targets/js/dukat/IntegratedDukatTask.kt   | 6 ++----
 .../kotlin/gradle/targets/js/dukat/SeparateDukatTask.kt     | 2 +-
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dukat/DukatTask.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dukat/DukatTask.kt
index 9cb6e2f62f1..f50d8652638 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dukat/DukatTask.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dukat/DukatTask.kt
@@ -60,7 +60,7 @@ abstract class DukatTask(
      * Destination directory for files with converted declarations
      */
     @get:OutputDirectory
-    abstract var destDir: File
+    abstract val destinationDir: File
 
     @get:Internal
     internal abstract val considerGeneratingFlag: Boolean
@@ -72,12 +72,12 @@ abstract class DukatTask(
     open fun run() {
         nodeJs.npmResolutionManager.checkRequiredDependencies(this)
 
-        destDir.deleteRecursively()
+        destinationDir.deleteRecursively()
 
         DukatRunner(
             compilation,
             dTsFiles,
-            destDir,
+            destinationDir,
             qualifiedPackageName,
             null,
             operation
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dukat/IntegratedDukatTask.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dukat/IntegratedDukatTask.kt
index beef50fb4f8..93690f416e0 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dukat/IntegratedDukatTask.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dukat/IntegratedDukatTask.kt
@@ -8,7 +8,6 @@ package org.jetbrains.kotlin.gradle.targets.js.dukat
 import org.gradle.api.tasks.OutputDirectory
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJsCompilation
 import org.jetbrains.kotlin.gradle.targets.js.npm.npmProject
-import org.jetbrains.kotlin.gradle.utils.property
 import java.io.File
 import javax.inject.Inject
 
@@ -21,9 +20,8 @@ constructor(
     override val considerGeneratingFlag: Boolean = true
 
     @get:OutputDirectory
-    override var destDir: File by property {
-        compilation.npmProject.externalsDir
-    }
+    override val destinationDir: File
+        get() = compilation.npmProject.externalsDir
 
     private val executor by lazy {
         DukatExecutor(nodeJs, dts, compilation.npmProject, true, compareInputs = false)
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dukat/SeparateDukatTask.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dukat/SeparateDukatTask.kt
index 5ba71135a2c..b22e114fcd8 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dukat/SeparateDukatTask.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dukat/SeparateDukatTask.kt
@@ -19,7 +19,7 @@ constructor(
     override val considerGeneratingFlag: Boolean = false
 
     @get:OutputDirectory
-    override var destDir: File by property {
+    override var destinationDir: File by property {
         project.projectDir.resolve("externals")
     }
 }
\ No newline at end of file