From 12c3b981c4f9c95f4102a63a6e33b166195b6412 Mon Sep 17 00:00:00 2001 From: Sebastian Sellmair Date: Wed, 9 Aug 2023 11:42:02 +0200 Subject: [PATCH] [Gradle] Do not run 'IdeTransformedMetadataDependencyResolver' on 'single kotlin target' Source Sets This will prevent transformed kotlin-stdlib source sets from being resolved for leaf (e.g. jvmMain) as well as bamboo (jvmBambooMain) source sets. For such source sets only the jvm jar shall be attached ^KT-60901 Verification Pending --- .../kotlin/gradle/plugin/ide/IdeMultiplatformImportFactory.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeMultiplatformImportFactory.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeMultiplatformImportFactory.kt index 6f931e8627c..3da9316884a 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeMultiplatformImportFactory.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeMultiplatformImportFactory.kt @@ -67,7 +67,7 @@ internal fun IdeMultiplatformImport(extension: KotlinProjectExtension): IdeMulti registerDependencyResolver( resolver = IdeTransformedMetadataDependencyResolver, - constraint = !SourceSetConstraint.isLeaf and !SourceSetConstraint.isJvmAndAndroid, + constraint = !SourceSetConstraint.isSingleKotlinTarget and !SourceSetConstraint.isJvmAndAndroid, phase = IdeMultiplatformImport.DependencyResolutionPhase.BinaryDependencyResolution, priority = IdeMultiplatformImport.Priority.normal )