From ad1340caf3ab08fcc9dd8b62447467aa51d33d87 Mon Sep 17 00:00:00 2001
From: Alexey Tsvetkov <alexey.tsvetkov@jetbrains.com>
Date: Thu, 28 Jul 2016 17:26:41 +0300
Subject: [PATCH] Refactoring: move mapKotlinTaskProperties call to
 createKotlinJVMTask

---
 .../kotlin/gradle/internal/AnnotationProcessingManager.kt       | 1 -
 .../kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt   | 2 --
 .../kotlin/org/jetbrains/kotlin/gradle/tasks/TasksProvider.kt   | 2 ++
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/AnnotationProcessingManager.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/AnnotationProcessingManager.kt
index dff6d3614d1..dda8e68a367 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/AnnotationProcessingManager.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/AnnotationProcessingManager.kt
@@ -53,7 +53,6 @@ fun Project.initKapt(
 
     if (kaptExtension.generateStubs) {
         kotlinAfterJavaTask = createKotlinAfterJavaTask(javaTask, kotlinTask, kotlinOptions, tasksProvider)
-        mapKotlinTaskProperties(this, kotlinAfterJavaTask)
 
         kotlinTask.logger.kotlinDebug("kapt: Using class file stubs")
 
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 b39ef5edb8a..bbfc143c7aa 100644
--- 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
@@ -112,7 +112,6 @@ abstract class KotlinSourceSetProcessor<T : AbstractCompile>(
         javaBasePlugin.configureForSourceSet(sourceSet, kotlinTask)
         kotlinTask.description = taskDescription
         kotlinTask.source(kotlinDirSet)
-        mapKotlinTaskProperties(project, kotlinTask)
     }
 
     protected abstract fun doCreateTask(project: Project, taskName: String): T
@@ -355,7 +354,6 @@ open class KotlinAndroidPlugin @Inject constructor(val scriptHandler: ScriptHand
 
             val kotlinTaskName = "compile${variantDataName.capitalize()}Kotlin"
             val kotlinTask = tasksProvider.createKotlinJVMTask(project, kotlinTaskName)
-            mapKotlinTaskProperties(project, kotlinTask)
 
             kotlinTask.extensions.extraProperties.set("defaultModuleName", "${project.name}-$kotlinTaskName")
             if (kotlinOptions != null) {
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 ccd18785be8..6939cedaf52 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
@@ -3,11 +3,13 @@ package org.jetbrains.kotlin.gradle.tasks
 import org.gradle.api.Project
 import org.jetbrains.kotlin.gradle.plugin.RegexTaskToFriendTaskMapper
 import org.jetbrains.kotlin.gradle.plugin.TaskToFriendTaskMapper
+import org.jetbrains.kotlin.gradle.plugin.mapKotlinTaskProperties
 
 open class KotlinTasksProvider {
     fun createKotlinJVMTask(project: Project, name: String): KotlinCompile {
         return project.tasks.create(name, KotlinCompile::class.java).apply {
             friendTaskName = taskToFriendTaskMapper[this]
+            mapKotlinTaskProperties(project, this)
         }
     }