From 80068c0a4016609193ce306d2af2b90b63e9f629 Mon Sep 17 00:00:00 2001
From: Sergey Rostov <sergey.rostov@jetbrains.com>
Date: Sun, 7 Jul 2019 23:58:45 +0300
Subject: [PATCH] Gradle, js: fix task annotations

---
 .../jetbrains/kotlin/gradle/targets/js/dukat/DukatTask.kt   | 4 ++++
 .../kotlin/gradle/targets/js/dukat/PackageJsonDukatTask.kt  | 1 +
 .../jetbrains/kotlin/gradle/targets/js/nodejs/NodeJsExec.kt | 6 ++++++
 .../gradle/targets/js/npm/tasks/KotlinPackageJsonTask.kt    | 1 -
 4 files changed, 11 insertions(+), 1 deletion(-)

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 f2e916deb77..0af414c3e83 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
@@ -16,11 +16,14 @@ import java.io.File
 abstract class AbstractDukatTask : AbstractTask(), RequiresNpmDependencies {
     private val nodeJs get() = NodeJsRootPlugin.apply(project.rootProject)
 
+    @get:Internal
     override lateinit var compilation: KotlinJsCompilation
 
+    @get:Internal
     override val nodeModulesRequired: Boolean
         get() = true
 
+    @get:Internal
     override val requiredNpmDependencies: Collection<RequiredKotlinJsDependency>
         get() = listOf(nodeJs.versions.dukat)
 
@@ -42,6 +45,7 @@ abstract class AbstractDukatTask : AbstractTask(), RequiresNpmDependencies {
     @get:OutputDirectory
     abstract val destDir: File
 
+    @get:Internal
     val operation: String = "Generating Kotlin/JS external declarations"
 
     @TaskAction
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dukat/PackageJsonDukatTask.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dukat/PackageJsonDukatTask.kt
index c9445112fd3..49097aeea9b 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dukat/PackageJsonDukatTask.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dukat/PackageJsonDukatTask.kt
@@ -15,6 +15,7 @@ import java.io.File
 open class PackageJsonDukatTask : AbstractDukatTask() {
     private val nodeJs get() = NodeJsRootPlugin.apply(project.rootProject)
 
+    @get:Internal
     val dts by lazy {
         val resolvedCompilation = nodeJs.npmResolutionManager.requireInstalled()[project][compilation]
         val dtsResolver = DtsResolver(resolvedCompilation.npmProject)
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/nodejs/NodeJsExec.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/nodejs/NodeJsExec.kt
index c9bd23ad3fb..33fcfd8d5a7 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/nodejs/NodeJsExec.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/nodejs/NodeJsExec.kt
@@ -7,6 +7,7 @@ package org.jetbrains.kotlin.gradle.targets.js.nodejs
 
 import org.gradle.api.tasks.AbstractExecTask
 import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.Internal
 import org.jetbrains.kotlin.gradle.plugin.TaskHolder
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJsCompilation
 import org.jetbrains.kotlin.gradle.targets.js.RequiredKotlinJsDependency
@@ -15,15 +16,20 @@ import org.jetbrains.kotlin.gradle.targets.js.npm.npmProject
 import org.jetbrains.kotlin.gradle.tasks.createOrRegisterTask
 
 open class NodeJsExec : AbstractExecTask<NodeJsExec>(NodeJsExec::class.java), RequiresNpmDependencies {
+    @get:Internal
     lateinit var nodeJs: NodeJsRootExtension
+
+    @get:Internal
     override lateinit var compilation: KotlinJsCompilation
 
     @Input
     var sourceMapStackTraces = true
 
+    @get:Internal
     override val nodeModulesRequired: Boolean
         get() = true
 
+    @get:Internal
     override val requiredNpmDependencies: Collection<RequiredKotlinJsDependency>
         get() = mutableListOf<RequiredKotlinJsDependency>().also {
             if (sourceMapStackTraces) {
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/tasks/KotlinPackageJsonTask.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/tasks/KotlinPackageJsonTask.kt
index 10768c1d4f1..be55299d824 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/tasks/KotlinPackageJsonTask.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/tasks/KotlinPackageJsonTask.kt
@@ -35,7 +35,6 @@ open class KotlinPackageJsonTask : DefaultTask() {
             dependentResolver.npmProject.packageJsonTask
         }
 
-    @get:Input
     @get:Nested
     internal val producerInputs: KotlinCompilationNpmResolver.PackageJsonProducerInputs
         get() = producer.inputs