From 2666a93e6acbbba03d57b4abaa7923e4d4562631 Mon Sep 17 00:00:00 2001
From: Ivan Gavrilovic <gavra@google.com>
Date: Sat, 17 Apr 2021 12:16:17 +0100
Subject: [PATCH] [Gradle] Avoid using dependsOn and add output provider to the
 file collection

---
 .../kotlin/gradle/plugin/mpp/kotlinCompilations.kt       | 2 +-
 .../kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt    | 9 ---------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/kotlinCompilations.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/kotlinCompilations.kt
index e1f89a7b63f..74a98129e2b 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/kotlinCompilations.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/kotlinCompilations.kt
@@ -233,7 +233,7 @@ abstract class AbstractKotlinCompilation<T : KotlinCommonOptions>(
                 // that depends on this module's production part, include the main artifact in the friend artifacts, lazily:
                 files(
                     Callable {
-                        friendArtifactsTaskProvider.get().archivePathCompatible
+                        friendArtifactsTaskProvider.flatMap { it.archiveFile }
                     }
                 )
             } else files()
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
index 0a96eba13e8..ca6eabd9fc9 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
@@ -304,15 +304,6 @@ abstract class AbstractKotlinCompile<T : CommonCompilerArguments>() : AbstractKo
         taskData.compilation.moduleName
     }
 
-    init {
-        if (taskData.compilation is AbstractKotlinCompilation<*> &&
-            (taskData.compilation as AbstractKotlinCompilation<*>).friendArtifactsTask != null) {
-            this@AbstractKotlinCompile.dependsOn(
-                (taskData.compilation as AbstractKotlinCompilation<*>).friendArtifactsTask
-            )
-        }
-    }
-
     @get:Internal // takes part in the compiler arguments
     val friendPaths: FileCollection = project.files(
         project.provider {