From da9080055cb233b73e2e1aac4a98b8c7dac32256 Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Tue, 28 Jan 2020 18:42:57 +0300 Subject: [PATCH] [Gradle, JS] Remove sources for link tasks --- .../kotlin/gradle/targets/js/ir/KotlinJsIrLink.kt | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrLink.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrLink.kt index aa7d831deb1..bc9d3fb0f22 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrLink.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrLink.kt @@ -8,26 +8,23 @@ package org.jetbrains.kotlin.gradle.targets.js.ir import org.gradle.api.file.FileTree import org.gradle.api.file.RegularFileProperty import org.gradle.api.tasks.Input -import org.gradle.api.tasks.InputFiles import org.gradle.api.tasks.OutputFile -import org.gradle.api.tasks.SkipWhenEmpty import org.jetbrains.kotlin.gradle.dsl.KotlinJsOptions import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinJsIrType.DEVELOPMENT import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinJsIrType.PRODUCTION import org.jetbrains.kotlin.gradle.tasks.Kotlin2JsCompile +import org.jetbrains.kotlin.gradle.tasks.SourceRoots import org.jetbrains.kotlin.gradle.utils.newFileProperty +import java.io.File open class KotlinJsIrLink : Kotlin2JsCompile() { @Input lateinit var type: KotlinJsIrType - @InputFiles - @SkipWhenEmpty - override fun getSource(): FileTree { - // compile from sources, support compile from klib whe it will be supported - val jsIrCompilation = taskData.compilation as KotlinJsIrCompilation - return project.files(jsIrCompilation.allSources).asFileTree - } + override fun getSourceRoots() = SourceRoots.KotlinOnly.create( + emptyList() as FileTree, + emptyList() + ) @OutputFile val outputFileProperty: RegularFileProperty = project.newFileProperty {