azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Gradle] Fix compileCommonMainKotlinMetadata task circular dependency

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

Was introduced by refactoring changes in:
1a5fc84080
This commit is contained in:
Anton Lakotka
2022-03-24 10:05:46 +01:00
committed by Space
parent 6117eace9d
commit 5c612078e5
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinCompileCommon.kt
+2 -4
View File
@@ -35,10 +35,8 @@ import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation
import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet
import org.jetbrains.kotlin.gradle.plugin.KotlinTarget import org.jetbrains.kotlin.gradle.plugin.KotlinTarget
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinCommonCompilation 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.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.plugin.sources.dependsOnClosure
import org.jetbrains.kotlin.gradle.utils.propertyWithConvention import org.jetbrains.kotlin.gradle.utils.propertyWithConvention
import java.io.File import java.io.File
@@ -74,7 +72,7 @@ abstract class KotlinCompileCommon @Inject constructor(
is AbstractKotlinFragmentMetadataCompilationData -> { is AbstractKotlinFragmentMetadataCompilationData -> {
val fragment = compilation.fragment val fragment = compilation.fragment
project.files( project.files(
fragment.withRefinesClosure.map { fragment.refinesClosure.map {
val compilation = compilation.metadataCompilationRegistry.getForFragmentOrNull(it) val compilation = compilation.metadataCompilationRegistry.getForFragmentOrNull(it)
?: return@map project.files() ?: return@map project.files()
compilation.output.classesDirs compilation.output.classesDirs