From c6586f2ac883a81eb1d1194ae8ff3ba7a6e83da5 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Fri, 16 Dec 2016 14:43:17 +0300 Subject: [PATCH] Fix mapping kotlin properties in JS plugin --- .../kotlin/gradle/tasks/TasksProvider.kt | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/TasksProvider.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/TasksProvider.kt index 76b1d121cf5..78a18ee0bc8 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/TasksProvider.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/TasksProvider.kt @@ -22,28 +22,28 @@ import org.jetbrains.kotlin.gradle.plugin.TaskToFriendTaskMapper import org.jetbrains.kotlin.gradle.plugin.mapKotlinTaskProperties internal open class KotlinTasksProvider { - fun createKotlinJVMTask(project: Project, name: String, sourceSetName: String): KotlinCompile { - return project.tasks.create(name, KotlinCompile::class.java).apply { - this.sourceSetName = sourceSetName - friendTaskName = taskToFriendTaskMapper[this] - mapKotlinTaskProperties(project, this) - outputs.upToDateWhen { isCacheFormatUpToDate } - } - } + fun createKotlinJVMTask(project: Project, name: String, sourceSetName: String): KotlinCompile = + project.tasks.create(name, KotlinCompile::class.java).apply { + configure(project, sourceSetName) + outputs.upToDateWhen { isCacheFormatUpToDate } + } fun createKotlinJSTask(project: Project, name: String, sourceSetName: String): Kotlin2JsCompile = project.tasks.create(name, Kotlin2JsCompile::class.java).apply { - this.sourceSetName = sourceSetName - friendTaskName = taskToFriendTaskMapper[this] + configure(project, sourceSetName) } fun createKotlinCommonTask(project: Project, name: String, sourceSetName: String): KotlinCompileCommon = project.tasks.create(name, KotlinCompileCommon::class.java).apply { - this.sourceSetName = sourceSetName - friendTaskName = taskToFriendTaskMapper[this] - mapKotlinTaskProperties(project, this) + configure(project, sourceSetName) } + private fun AbstractKotlinCompile<*>.configure(project: Project, sourceSetName: String) { + this.sourceSetName = sourceSetName + this.friendTaskName = taskToFriendTaskMapper[this] + mapKotlinTaskProperties(project, this) + } + protected open val taskToFriendTaskMapper: TaskToFriendTaskMapper = RegexTaskToFriendTaskMapper.Default() }