From 89acfd0a9821f95d79299f3272f42ea85c537d69 Mon Sep 17 00:00:00 2001 From: Anton Lakotka Date: Thu, 5 Jan 2023 13:37:05 +0100 Subject: [PATCH] [Gradle] Source Dependency Resolver shouldn't check whether project... ...dependency is in current build or not. Because for IDE import it matters that it is a source dependency. While for CLI it is not since included builds will produce an actual klib that will be transformed --- .../IdeVisibleMultiplatformSourceDependencyResolver.kt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/dependencyResolvers/IdeVisibleMultiplatformSourceDependencyResolver.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/dependencyResolvers/IdeVisibleMultiplatformSourceDependencyResolver.kt index 51a1b621541..8ed0c919c02 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/dependencyResolvers/IdeVisibleMultiplatformSourceDependencyResolver.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/dependencyResolvers/IdeVisibleMultiplatformSourceDependencyResolver.kt @@ -13,7 +13,6 @@ import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet import org.jetbrains.kotlin.gradle.plugin.ide.IdeDependencyResolver import org.jetbrains.kotlin.gradle.plugin.ide.IdeaKotlinProjectCoordinates import org.jetbrains.kotlin.gradle.plugin.mpp.MetadataDependencyResolution -import org.jetbrains.kotlin.gradle.plugin.mpp.projectIdOrNull import org.jetbrains.kotlin.gradle.plugin.sources.DefaultKotlinSourceSet internal object IdeVisibleMultiplatformSourceDependencyResolver : IdeDependencyResolver { @@ -25,9 +24,9 @@ internal object IdeVisibleMultiplatformSourceDependencyResolver : IdeDependencyR } private fun resolveSourceDependencies( - resolution: MetadataDependencyResolution.ChooseVisibleSourceSets, + resolution: MetadataDependencyResolution.ChooseVisibleSourceSets ): Iterable { - val projectComponentIdentifier = resolution.dependency.projectIdOrNull ?: return emptyList() + val projectComponentIdentifier = resolution.dependency.id as? ProjectComponentIdentifier ?: return emptyList() return resolution.allVisibleSourceSetNames.map { visibleSourceSetName -> IdeaKotlinSourceDependency( type = IdeaKotlinSourceDependency.Type.Regular,