[Gradle, JS] Allow to change destDir only for separate task and name it destinationDir

#KT-38331 fixed
This commit is contained in:
Ilya Goncharov
2020-06-18 15:19:49 +03:00
parent 7386408e94
commit 932cf21776
3 changed files with 6 additions and 8 deletions
@@ -60,7 +60,7 @@ abstract class DukatTask(
* Destination directory for files with converted declarations * Destination directory for files with converted declarations
*/ */
@get:OutputDirectory @get:OutputDirectory
abstract var destDir: File abstract val destinationDir: File
@get:Internal @get:Internal
internal abstract val considerGeneratingFlag: Boolean internal abstract val considerGeneratingFlag: Boolean
@@ -72,12 +72,12 @@ abstract class DukatTask(
open fun run() { open fun run() {
nodeJs.npmResolutionManager.checkRequiredDependencies(this) nodeJs.npmResolutionManager.checkRequiredDependencies(this)
destDir.deleteRecursively() destinationDir.deleteRecursively()
DukatRunner( DukatRunner(
compilation, compilation,
dTsFiles, dTsFiles,
destDir, destinationDir,
qualifiedPackageName, qualifiedPackageName,
null, null,
operation operation
@@ -8,7 +8,6 @@ package org.jetbrains.kotlin.gradle.targets.js.dukat
import org.gradle.api.tasks.OutputDirectory import org.gradle.api.tasks.OutputDirectory
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJsCompilation import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJsCompilation
import org.jetbrains.kotlin.gradle.targets.js.npm.npmProject import org.jetbrains.kotlin.gradle.targets.js.npm.npmProject
import org.jetbrains.kotlin.gradle.utils.property
import java.io.File import java.io.File
import javax.inject.Inject import javax.inject.Inject
@@ -21,9 +20,8 @@ constructor(
override val considerGeneratingFlag: Boolean = true override val considerGeneratingFlag: Boolean = true
@get:OutputDirectory @get:OutputDirectory
override var destDir: File by property { override val destinationDir: File
compilation.npmProject.externalsDir get() = compilation.npmProject.externalsDir
}
private val executor by lazy { private val executor by lazy {
DukatExecutor(nodeJs, dts, compilation.npmProject, true, compareInputs = false) DukatExecutor(nodeJs, dts, compilation.npmProject, true, compareInputs = false)
@@ -19,7 +19,7 @@ constructor(
override val considerGeneratingFlag: Boolean = false override val considerGeneratingFlag: Boolean = false
@get:OutputDirectory @get:OutputDirectory
override var destDir: File by property { override var destinationDir: File by property {
project.projectDir.resolve("externals") project.projectDir.resolve("externals")
} }
} }