From 1d8fd0bd55d328073a9490f9807a2feea948d5e9 Mon Sep 17 00:00:00 2001
From: Anton Lakotka <anton.lakotka@jetbrains.com>
Date: Mon, 16 Jan 2023 16:48:00 +0100
Subject: [PATCH] [Gradle] Update IdeResolveDependenciesTask to depend on...

...TRANSFORM_ALL_SOURCESETS_DEPENDENCIES_METADATA in an idiomatic way
---
 .../gradle/plugin/ide/IdeResolveDependenciesTask.kt    | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeResolveDependenciesTask.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeResolveDependenciesTask.kt
index 99e55630fb3..6f6f2f4871b 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeResolveDependenciesTask.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeResolveDependenciesTask.kt
@@ -23,12 +23,10 @@ import java.io.File
 import java.lang.reflect.Type
 
 internal fun Project.locateOrRegisterIdeResolveDependenciesTask(): TaskProvider<IdeResolveDependenciesTask> {
-    return locateOrRegisterTask<IdeResolveDependenciesTask>("resolveIdeDependencies") { task ->
+    return locateOrRegisterTask("resolveIdeDependencies") { task ->
         task.description = "Debugging/Diagnosing task that will resolve dependencies for the IDE"
         task.group = "ide"
         task.notCompatibleWithConfigurationCacheCompat("Just a debugging util")
-    }.also {
-        it.dependsOn(locateOrRegisterTask<Task>(KotlinMetadataTargetConfigurator.TRANSFORM_ALL_SOURCESETS_DEPENDENCIES_METADATA))
     }
 }
 
@@ -37,7 +35,11 @@ internal fun Project.locateOrRegisterIdeResolveDependenciesTask(): TaskProvider<
  * This will invoke the [IdeMultiplatformImport] to resolve all dependencies (like the IDE would).
  * Outputs are written as json and protobufs
  */
-internal open class IdeResolveDependenciesTask : DefaultTask() {
+internal open class IdeResolveDependenciesTask : DefaultTask(), IdeDependencyResolver.WithBuildDependencies {
+
+    override fun dependencies(project: Project): Iterable<Any> = listOf(
+        project.locateOrRegisterTask<Task>(KotlinMetadataTargetConfigurator.TRANSFORM_ALL_SOURCESETS_DEPENDENCIES_METADATA)
+    )
 
     @TaskAction
     fun resolveDependencies() {