From 99e05b777a983eebb28edec6b9efde06faeb2ffb Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Mon, 8 Jun 2020 13:00:11 +0300 Subject: [PATCH] [Gradle, JS] PackageJsonDukatExecutor -> DukatExecutor --- .../gradle/targets/js/dukat/DukatCompilationResolverPlugin.kt | 4 ++-- .../dukat/{PackageJsonDukatExecutor.kt => DukatExecutor.kt} | 2 +- .../org/jetbrains/kotlin/gradle/targets/js/dukat/DukatTask.kt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) rename libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dukat/{PackageJsonDukatExecutor.kt => DukatExecutor.kt} (98%) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dukat/DukatCompilationResolverPlugin.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dukat/DukatCompilationResolverPlugin.kt index edf8e0485ac..a9bcc494766 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dukat/DukatCompilationResolverPlugin.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dukat/DukatCompilationResolverPlugin.kt @@ -52,12 +52,12 @@ internal class DukatCompilationResolverPlugin( ) { val externalNpmDependencies = resolution[project][compilation].externalNpmDependencies - PackageJsonDukatExecutor( + DukatExecutor( nodeJs, DtsResolver(npmProject).getAllDts(externalNpmDependencies), npmProject, packageJsonIsUpdated, - operation = compilation.name + " > " + PackageJsonDukatExecutor.OPERATION, + operation = compilation.name + " > " + DukatExecutor.OPERATION, compareInputs = true ).execute() } diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dukat/PackageJsonDukatExecutor.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dukat/DukatExecutor.kt similarity index 98% rename from libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dukat/PackageJsonDukatExecutor.kt rename to libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dukat/DukatExecutor.kt index 9ad376e3da0..1a0538a0451 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dukat/PackageJsonDukatExecutor.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dukat/DukatExecutor.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.gradle.targets.js.dukat import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension import org.jetbrains.kotlin.gradle.targets.js.npm.NpmProject -class PackageJsonDukatExecutor( +class DukatExecutor( val nodeJs: NodeJsRootExtension, val typeDefinitions: List, val npmProject: NpmProject, 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 f3051814b7c..615c8c13768 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 @@ -35,7 +35,7 @@ open class DukatTask : AbstractDukatTask() { get() = compilation.npmProject.externalsDir private val executor by lazy { - PackageJsonDukatExecutor(nodeJs, dts, compilation.npmProject, true, compareInputs = false) + DukatExecutor(nodeJs, dts, compilation.npmProject, true, compareInputs = false) } override fun run() {