From cf5577dfa6173eedbcfde71e5bb6921b0e9f9193 Mon Sep 17 00:00:00 2001 From: Sergey Rostov Date: Sat, 18 May 2019 08:11:11 +0300 Subject: [PATCH] Gradle, tests: fix cleanAllTests task name --- .../kotlin/gradle/tasks/AggregateTestReport.kt | 7 ++++--- .../kotlin/gradle/testing/internal/testsRegistry.kt | 11 +++++++---- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/AggregateTestReport.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/AggregateTestReport.kt index ba9aa0cc7bf..2f57ddf1e4f 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/AggregateTestReport.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/AggregateTestReport.kt @@ -7,14 +7,15 @@ package org.jetbrains.kotlin.gradle.tasks import org.gradle.api.DefaultTask import org.gradle.api.GradleException -import org.gradle.api.file.FileCollection import org.gradle.api.internal.CollectionCallbackActionDecorator -import org.gradle.api.internal.file.UnionFileCollection import org.gradle.api.internal.tasks.testing.DefaultTestTaskReports import org.gradle.api.internal.tasks.testing.junit.result.* import org.gradle.api.internal.tasks.testing.report.DefaultTestReport import org.gradle.api.tasks.* -import org.gradle.api.tasks.testing.* +import org.gradle.api.tasks.testing.AbstractTestTask +import org.gradle.api.tasks.testing.TestDescriptor +import org.gradle.api.tasks.testing.TestListener +import org.gradle.api.tasks.testing.TestResult import org.gradle.internal.concurrent.CompositeStoppable.stoppable import org.gradle.internal.logging.ConsoleRenderer import org.gradle.internal.operations.BuildOperationExecutor diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/testing/internal/testsRegistry.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/testing/internal/testsRegistry.kt index 99f5321ee96..f420011e4d1 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/testing/internal/testsRegistry.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/testing/internal/testsRegistry.kt @@ -47,10 +47,13 @@ private fun cleanTaskName(taskName: String): String { } private val Project.cleanAllTestTask: Task - get() = tasks.findByName(cleanTaskName(allTestsTask.name)) - ?: tasks.create("clean", Task::class.java).also { - tasks.getByName(LifecycleBasePlugin.CLEAN_TASK_NAME).dependsOn(it) - } + get() { + val taskName = cleanTaskName(allTestsTask.name) + return tasks.findByName(taskName) + ?: tasks.create(taskName, Task::class.java).also { + tasks.getByName(LifecycleBasePlugin.CLEAN_TASK_NAME).dependsOn(it) + } + } @Suppress("UnstableApiUsage") internal fun registerTestTask(taskHolder: TaskHolder) {