From c26e6933ed365654800ca716a4a3f781be2a3f14 Mon Sep 17 00:00:00 2001 From: Alexander Podkhalyuzin Date: Thu, 15 Jun 2017 18:00:13 +0300 Subject: [PATCH] Cleanup (removed clean task). Fixed 'getTask' naming (no side effects now). --- .../org/jetbrains/kotlin/gradle/plugin/KonanPlugin.kt | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KonanPlugin.kt b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KonanPlugin.kt index c6d2b70b8b9..9ae119af912 100644 --- a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KonanPlugin.kt +++ b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KonanPlugin.kt @@ -207,7 +207,9 @@ class KonanPlugin @Inject constructor(private val registry: ToolingModelBuilderR * Looks for task with given name in the given project. * If such task isn't found, will create it. Returns created/found task. */ - private fun getTask(project: ProjectInternal, name: String): Task { + private fun getTask(project: ProjectInternal, name: String): Task = project.getTasksByName(name, false).single() + + private fun getOrCreateTask(project: ProjectInternal, name: String): Task { var tasks = project.getTasksByName(name, false) assert(tasks.size <= 1) return if (tasks.isEmpty()) { @@ -237,14 +239,11 @@ class KonanPlugin @Inject constructor(private val registry: ToolingModelBuilderR if (!project.extensions.extraProperties.has(KonanPlugin.KONAN_BUILD_TARGETS)) { project.extensions.extraProperties.set(KonanPlugin.KONAN_BUILD_TARGETS, hostTarget) } - getTask(project, "clean").doLast { - project.delete(project.konanBuildRoot) - } getTask(project, "build").apply { dependsOn(project.supportedCompileTasks) } - getTask(project, "run").apply { + getOrCreateTask(project, "run").apply { dependsOn(getTask(project, "build")) doLast { for (task in project.tasks.withType(KonanCompileTask::class.java).matching { it.target?.equals(hostTarget) ?: true}) {