azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactoring: move mapKotlinTaskProperties call to createKotlinJVMTask

Browse Source
This commit is contained in:
Alexey Tsvetkov
2016-07-28 17:26:41 +03:00
parent 048982cf36
commit ad1340caf3
3 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/AnnotationProcessingManager.kt
-1
View File
@@ -53,7 +53,6 @@ fun Project.initKapt(
if (kaptExtension.generateStubs) { if (kaptExtension.generateStubs) {
kotlinAfterJavaTask = createKotlinAfterJavaTask(javaTask, kotlinTask, kotlinOptions, tasksProvider) kotlinAfterJavaTask = createKotlinAfterJavaTask(javaTask, kotlinTask, kotlinOptions, tasksProvider)
mapKotlinTaskProperties(this, kotlinAfterJavaTask)
kotlinTask.logger.kotlinDebug("kapt: Using class file stubs") kotlinTask.logger.kotlinDebug("kapt: Using class file stubs")
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt
-2
View File
@@ -112,7 +112,6 @@ abstract class KotlinSourceSetProcessor<T : AbstractCompile>(
javaBasePlugin.configureForSourceSet(sourceSet, kotlinTask) javaBasePlugin.configureForSourceSet(sourceSet, kotlinTask)
kotlinTask.description = taskDescription kotlinTask.description = taskDescription
kotlinTask.source(kotlinDirSet) kotlinTask.source(kotlinDirSet)
mapKotlinTaskProperties(project, kotlinTask)
} }
protected abstract fun doCreateTask(project: Project, taskName: String): T 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 kotlinTaskName = "compile${variantDataName.capitalize()}Kotlin"
val kotlinTask = tasksProvider.createKotlinJVMTask(project, kotlinTaskName) val kotlinTask = tasksProvider.createKotlinJVMTask(project, kotlinTaskName)
mapKotlinTaskProperties(project, kotlinTask)
kotlinTask.extensions.extraProperties.set("defaultModuleName", "${project.name}-$kotlinTaskName") kotlinTask.extensions.extraProperties.set("defaultModuleName", "${project.name}-$kotlinTaskName")
if (kotlinOptions != null) { if (kotlinOptions != null) {
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/TasksProvider.kt
+2
View File
@@ -3,11 +3,13 @@ package org.jetbrains.kotlin.gradle.tasks
import org.gradle.api.Project import org.gradle.api.Project
import org.jetbrains.kotlin.gradle.plugin.RegexTaskToFriendTaskMapper import org.jetbrains.kotlin.gradle.plugin.RegexTaskToFriendTaskMapper
import org.jetbrains.kotlin.gradle.plugin.TaskToFriendTaskMapper import org.jetbrains.kotlin.gradle.plugin.TaskToFriendTaskMapper
import org.jetbrains.kotlin.gradle.plugin.mapKotlinTaskProperties
open class KotlinTasksProvider { open class KotlinTasksProvider {
fun createKotlinJVMTask(project: Project, name: String): KotlinCompile { fun createKotlinJVMTask(project: Project, name: String): KotlinCompile {
return project.tasks.create(name, KotlinCompile::class.java).apply { return project.tasks.create(name, KotlinCompile::class.java).apply {
friendTaskName = taskToFriendTaskMapper[this] friendTaskName = taskToFriendTaskMapper[this]
mapKotlinTaskProperties(project, this)
} }
} }