From 8f6a15e33eb88d0f8d71e59496f6b23b85d584dc Mon Sep 17 00:00:00 2001 From: Sebastian Sellmair Date: Mon, 23 Jan 2023 13:35:03 +0100 Subject: [PATCH] [Gradle] MetadataDependencyTransformationTask: Declare dependency to 'hostSpecificMetadataConfiguration's ^KT-56111 Verification Pending --- .../mpp/MetadataDependencyTransformationTask.kt | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/MetadataDependencyTransformationTask.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/MetadataDependencyTransformationTask.kt index 8f070ef3fa2..6b225b4f716 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/MetadataDependencyTransformationTask.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/MetadataDependencyTransformationTask.kt @@ -21,7 +21,6 @@ import org.jetbrains.kotlin.gradle.dsl.kotlinExtension import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet import org.jetbrains.kotlin.gradle.plugin.sources.KotlinDependencyScope.* import org.jetbrains.kotlin.gradle.plugin.sources.internal -import org.jetbrains.kotlin.gradle.targets.metadata.KotlinMetadataTargetConfigurator import org.jetbrains.kotlin.gradle.targets.metadata.dependsOnClosureWithInterCompilationDependencies import org.jetbrains.kotlin.gradle.tasks.dependsOn import org.jetbrains.kotlin.gradle.tasks.locateOrRegisterTask @@ -75,6 +74,17 @@ open class MetadataDependencyTransformationTask @get:NormalizeLineEndings internal val configurationToResolve: FileCollection = kotlinSourceSet.internal.resolvableMetadataConfiguration + @Suppress("unused") // Gradle input + @get:InputFiles + @get:PathSensitive(PathSensitivity.RELATIVE) + @get:IgnoreEmptyDirectories + @get:NormalizeLineEndings + protected val hostSpecificMetadataConfigurationsToResolve: FileCollection = project.filesProvider { + kotlinSourceSet.internal.compilations.mapNotNull { compilation -> + compilation.internal.configurations.hostSpecificMetadataConfiguration + } + } + @Transient // Only needed for configuring task inputs private val participatingSourceSetsLazy: Lazy>? = lazy { kotlinSourceSet.internal.withDependsOnClosure.toMutableSet().apply {