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

Cleanup (removed clean task).

Browse Source 
Fixed 'getTask' naming (no side effects now).
This commit is contained in:
Alexander Podkhalyuzin
2017-06-15 18:00:13 +03:00
committed by ilmat192
parent 7ef5cbb52a
commit c26e6933ed
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KonanPlugin.kt
+4 -5
View File
@@ -207,7 +207,9 @@ class KonanPlugin @Inject constructor(private val registry: ToolingModelBuilderR
* Looks for task with given name in the given project. * Looks for task with given name in the given project.
* If such task isn't found, will create it. Returns created/found task. * 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) var tasks = project.getTasksByName(name, false)
assert(tasks.size <= 1) assert(tasks.size <= 1)
return if (tasks.isEmpty()) { 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)) { if (!project.extensions.extraProperties.has(KonanPlugin.KONAN_BUILD_TARGETS)) {
project.extensions.extraProperties.set(KonanPlugin.KONAN_BUILD_TARGETS, hostTarget) project.extensions.extraProperties.set(KonanPlugin.KONAN_BUILD_TARGETS, hostTarget)
} }
getTask(project, "clean").doLast {
project.delete(project.konanBuildRoot)
}
getTask(project, "build").apply { getTask(project, "build").apply {
dependsOn(project.supportedCompileTasks) dependsOn(project.supportedCompileTasks)
} }
getTask(project, "run").apply { getOrCreateTask(project, "run").apply {
dependsOn(getTask(project, "build")) dependsOn(getTask(project, "build"))
doLast { doLast {
for (task in project.tasks.withType(KonanCompileTask::class.java).matching { it.target?.equals(hostTarget) ?: true}) { for (task in project.tasks.withType(KonanCompileTask::class.java).matching { it.target?.equals(hostTarget) ?: true}) {