Gradle, js: fix task annotations

This commit is contained in:
Sergey Rostov
2019-07-07 23:58:45 +03:00
parent 3c606c27a1
commit 80068c0a40
4 changed files with 11 additions and 1 deletions
@@ -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
@@ -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)
@@ -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) {
@@ -35,7 +35,6 @@ open class KotlinPackageJsonTask : DefaultTask() {
dependentResolver.npmProject.packageJsonTask
}
@get:Input
@get:Nested
internal val producerInputs: KotlinCompilationNpmResolver.PackageJsonProducerInputs
get() = producer.inputs