From 2680ea6bdd458b16d054de8c9487080ed0a8b144 Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Mon, 27 Jan 2020 12:38:07 +0300 Subject: [PATCH] [Gradle, JS] Fix after rebase on master --- .../org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt index e230ccebd7a..ee6a686bebd 100755 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt @@ -90,7 +90,7 @@ internal abstract class KotlinSourceSetProcessor>( protected val sourceSetName: String = kotlinCompilation.compilationName - override val kotlinTask: TaskProvider = prepareKotlinCompileTask(kotlinCompilation.compileKotlinTaskName) + override val kotlinTask: TaskProvider = prepareKotlinCompileTask() protected val javaSourceSet: SourceSet? get() = @@ -101,8 +101,8 @@ internal abstract class KotlinSourceSetProcessor>( else null } - private fun prepareKotlinCompileTask(name: String): TaskProvider = - registerKotlinCompileTask(name).also { task -> + private fun prepareKotlinCompileTask(): TaskProvider = + registerKotlinCompileTask().also { task -> kotlinCompilation.output.addClassesDir { project.files(task.map { it.destinationDir }) } }