Import: support mixing of TaskProviders and Tasks in task executors

#KT-34101 Fixed
2019-09-30 22:47:03 +03:00
parent 6d9be0ab5d
commit d7a2de59ac
1 changed files with 8 additions and 2 deletions
@@ -341,8 +341,14 @@ class KotlinMPPGradleModelBuilder : ModelBuilderService {
            if (testRuns != null) {
                val testReports = testRuns.mapNotNull { (it.javaClass.getMethodOrNull("getExecutionTask")?.invoke(it) as? TaskProvider<Task>)?.get() }
                val testTasks = testReports.flatMap {
-                    ((it.javaClass.getMethodOrNull("getTestTasks")?.invoke(it) as? Collection<Provider<Task>>)?.map { it.get() })
-                        ?: listOf(it)
+                    ((it.javaClass.getMethodOrNull("getTestTasks")?.invoke(it) as? Collection<Any>)?.mapNotNull {
+                        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 {
                    val name = it.name