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

Gradle, tests: fix cleanAllTests task name

Browse Source
This commit is contained in:
Sergey Rostov
2019-05-18 08:11:11 +03:00
parent cec2e8c61a
commit cf5577dfa6
2 changed files with 11 additions and 7 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/tasks/AggregateTestReport.kt
+4 -3
View File
@@ -7,14 +7,15 @@ package org.jetbrains.kotlin.gradle.tasks
import org.gradle.api.DefaultTask import org.gradle.api.DefaultTask
import org.gradle.api.GradleException import org.gradle.api.GradleException
import org.gradle.api.file.FileCollection
import org.gradle.api.internal.CollectionCallbackActionDecorator 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.DefaultTestTaskReports
import org.gradle.api.internal.tasks.testing.junit.result.* import org.gradle.api.internal.tasks.testing.junit.result.*
import org.gradle.api.internal.tasks.testing.report.DefaultTestReport import org.gradle.api.internal.tasks.testing.report.DefaultTestReport
import org.gradle.api.tasks.* 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.concurrent.CompositeStoppable.stoppable
import org.gradle.internal.logging.ConsoleRenderer import org.gradle.internal.logging.ConsoleRenderer
import org.gradle.internal.operations.BuildOperationExecutor import org.gradle.internal.operations.BuildOperationExecutor
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/testing/internal/testsRegistry.kt
+7 -4
View File
@@ -47,10 +47,13 @@ private fun cleanTaskName(taskName: String): String {
} }
private val Project.cleanAllTestTask: Task private val Project.cleanAllTestTask: Task
get() = tasks.findByName(cleanTaskName(allTestsTask.name)) get() {
?: tasks.create("clean", Task::class.java).also { val taskName = cleanTaskName(allTestsTask.name)
tasks.getByName(LifecycleBasePlugin.CLEAN_TASK_NAME).dependsOn(it) return tasks.findByName(taskName)
} ?: tasks.create(taskName, Task::class.java).also {
tasks.getByName(LifecycleBasePlugin.CLEAN_TASK_NAME).dependsOn(it)
}
}
@Suppress("UnstableApiUsage") @Suppress("UnstableApiUsage")
internal fun registerTestTask(taskHolder: TaskHolder<AbstractTestTask>) { internal fun registerTestTask(taskHolder: TaskHolder<AbstractTestTask>) {