[Native][test] Fix task dependencies
Apply dependencies on build task, not its provider, because otherwise dependencies are being set during the task creation that makes them circular.
This commit is contained in:
@@ -92,7 +92,6 @@ abstract class KonanTest : DefaultTask(), KonanTestExecutable {
|
||||
@Suppress("UnstableApiUsage")
|
||||
override fun configure(config: Closure<*>): Task {
|
||||
super.configure(config)
|
||||
dependsOnDist()
|
||||
|
||||
// Set Gradle properties for the better navigation
|
||||
group = LifecycleBasePlugin.VERIFICATION_GROUP
|
||||
|
||||
@@ -290,11 +290,11 @@ fun Task.sameDependenciesAs(task: Task) {
|
||||
*/
|
||||
fun Task.dependsOnKonanBuildingTask(artifact: String, target: KonanTarget) {
|
||||
val buildTask = project.findKonanBuildTask(artifact, target)
|
||||
buildTask.configure {
|
||||
buildTask.get().apply {
|
||||
konanOldPluginTaskDependenciesWalker {
|
||||
dependsOnDist()
|
||||
}
|
||||
sameDependenciesAs(this)
|
||||
sameDependenciesAs(this@dependsOnKonanBuildingTask)
|
||||
}
|
||||
dependsOn(buildTask)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user