From 19031c88d92242bac726a4010c6c6058a9f21139 Mon Sep 17 00:00:00 2001
From: Pavel Punegov <pavel.punegov@jetbrains.com>
Date: Tue, 23 Nov 2021 18:44:42 +0300
Subject: [PATCH] [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.
---
 .../src/main/kotlin/org/jetbrains/kotlin/KotlinNativeTest.kt  | 1 -
 .../build-tools/src/main/kotlin/org/jetbrains/kotlin/Utils.kt | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/KotlinNativeTest.kt b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/KotlinNativeTest.kt
index c1b36368bd8..36b346f0358 100644
--- a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/KotlinNativeTest.kt
+++ b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/KotlinNativeTest.kt
@@ -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
diff --git a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/Utils.kt b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/Utils.kt
index 9a5a48512dd..589fb3dd7ed 100644
--- a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/Utils.kt
+++ b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/Utils.kt
@@ -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)
 }