From 15f217955776fc71eb823fd2c18940af67b553f9 Mon Sep 17 00:00:00 2001 From: Anton Lakotka Date: Fri, 13 Jan 2023 14:02:19 +0100 Subject: [PATCH] [Gradle] prepareKotlinIdeaImportTask should depend on transformation tasks For cases when included build is use, we no longer consumer kotlin project structure from Global storage but consume JAR files as with regular external dependencies. ^KT-49933 --- .../targets/metadata/KotlinMetadataTargetConfigurator.kt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/metadata/KotlinMetadataTargetConfigurator.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/metadata/KotlinMetadataTargetConfigurator.kt index e2358306d39..ffbc8116841 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/metadata/KotlinMetadataTargetConfigurator.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/metadata/KotlinMetadataTargetConfigurator.kt @@ -20,6 +20,8 @@ import org.gradle.api.tasks.bundling.Jar import org.gradle.api.tasks.bundling.Zip import org.jetbrains.kotlin.gradle.dsl.* import org.jetbrains.kotlin.gradle.plugin.* +import org.jetbrains.kotlin.gradle.plugin.ide.Idea222Api +import org.jetbrains.kotlin.gradle.plugin.ide.ideaImportDependsOn import org.jetbrains.kotlin.gradle.plugin.mpp.* import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.* import org.jetbrains.kotlin.gradle.plugin.sources.* @@ -346,6 +348,9 @@ class KotlinMetadataTargetConfigurator : project.locateOrRegisterTask(TRANSFORM_ALL_SOURCESETS_DEPENDENCIES_METADATA).dependsOn(transformationTask) + @OptIn(Idea222Api::class) + project.ideaImportDependsOn(transformationTask) + val artifacts = sourceSet.internal.resolvableMetadataConfiguration.incoming.artifacts // Metadata from visible source sets within dependsOn closure