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

Import: support mixing of TaskProviders and Tasks in task executors

Browse Source 
#KT-34101 Fixed
This commit is contained in:
Andrey Uskov
2019-09-30 22:47:03 +03:00
parent 6d9be0ab5d
commit d7a2de59ac
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/kotlin-gradle-tooling/src/KotlinMPPGradleModelBuilder.kt
+8 -2
View File
@@ -341,8 +341,14 @@ class KotlinMPPGradleModelBuilder : ModelBuilderService {
if (testRuns != null) { if (testRuns != null) {
val testReports = testRuns.mapNotNull { (it.javaClass.getMethodOrNull("getExecutionTask")?.invoke(it) as? TaskProvider<Task>)?.get() } val testReports = testRuns.mapNotNull { (it.javaClass.getMethodOrNull("getExecutionTask")?.invoke(it) as? TaskProvider<Task>)?.get() }
val testTasks = testReports.flatMap { val testTasks = testReports.flatMap {
((it.javaClass.getMethodOrNull("getTestTasks")?.invoke(it) as? Collection<Provider<Task>>)?.map { it.get() }) ((it.javaClass.getMethodOrNull("getTestTasks")?.invoke(it) as? Collection<Any>)?.mapNotNull {
?: listOf(it) when {
//TODO(auskov): getTestTasks should return collection of TaskProviders without mixing with Tasks
it is Provider<*> -> it.get() as? Task
it is Task -> it
else -> null
}
}) ?: listOf(it)
} }
return testTasks.mapNotNull { return testTasks.mapNotNull {
val name = it.name val name = it.name