From 5c612078e53de50cf38c81477ed0d4de2ea1a69c Mon Sep 17 00:00:00 2001
From: Anton Lakotka <anton.lakotka@jetbrains.com>
Date: Thu, 24 Mar 2022 10:05:46 +0100
Subject: [PATCH] [Gradle] Fix compileCommonMainKotlinMetadata task circular
 dependency

It's getRefinesMetadataPaths should not include its own metadata Paths
So it should use `refinesClosure` instead.

Was introduced by refactoring changes in:
1a5fc84080d86116ead7d141450ae18b663a4caf
---
 .../jetbrains/kotlin/gradle/tasks/KotlinCompileCommon.kt    | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinCompileCommon.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinCompileCommon.kt
index 51f94ee7cc6..c32ae92ba3d 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinCompileCommon.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinCompileCommon.kt
@@ -35,10 +35,8 @@ import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation
 import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet
 import org.jetbrains.kotlin.gradle.plugin.KotlinTarget
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinCommonCompilation
+import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.*
 import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.AbstractKotlinFragmentMetadataCompilationData
-import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.KotlinCompilationData
-import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.KotlinMetadataCompilationData
-import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.withRefinesClosure
 import org.jetbrains.kotlin.gradle.plugin.sources.dependsOnClosure
 import org.jetbrains.kotlin.gradle.utils.propertyWithConvention
 import java.io.File
@@ -74,7 +72,7 @@ abstract class KotlinCompileCommon @Inject constructor(
                     is AbstractKotlinFragmentMetadataCompilationData -> {
                         val fragment = compilation.fragment
                         project.files(
-                            fragment.withRefinesClosure.map {
+                            fragment.refinesClosure.map {
                                 val compilation = compilation.metadataCompilationRegistry.getForFragmentOrNull(it)
                                     ?: return@map project.files()
                                 compilation.output.classesDirs