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

[Gradle] Source Dependency Resolver shouldn't check whether project...

Browse Source 
...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
This commit is contained in:
Anton Lakotka
2023-01-05 13:37:05 +01:00
committed by Space Team
parent ac429b6997
commit 89acfd0a98
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/dependencyResolvers/IdeVisibleMultiplatformSourceDependencyResolver.kt
+2 -3
View File
@@ -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.IdeDependencyResolver
import org.jetbrains.kotlin.gradle.plugin.ide.IdeaKotlinProjectCoordinates import org.jetbrains.kotlin.gradle.plugin.ide.IdeaKotlinProjectCoordinates
import org.jetbrains.kotlin.gradle.plugin.mpp.MetadataDependencyResolution import org.jetbrains.kotlin.gradle.plugin.mpp.MetadataDependencyResolution
import org.jetbrains.kotlin.gradle.plugin.mpp.projectIdOrNull
import org.jetbrains.kotlin.gradle.plugin.sources.DefaultKotlinSourceSet import org.jetbrains.kotlin.gradle.plugin.sources.DefaultKotlinSourceSet
internal object IdeVisibleMultiplatformSourceDependencyResolver : IdeDependencyResolver { internal object IdeVisibleMultiplatformSourceDependencyResolver : IdeDependencyResolver {
@@ -25,9 +24,9 @@ internal object IdeVisibleMultiplatformSourceDependencyResolver : IdeDependencyR
} }
private fun resolveSourceDependencies( private fun resolveSourceDependencies(
resolution: MetadataDependencyResolution.ChooseVisibleSourceSets, resolution: MetadataDependencyResolution.ChooseVisibleSourceSets
): Iterable<IdeaKotlinDependency> { ): Iterable<IdeaKotlinDependency> {
val projectComponentIdentifier = resolution.dependency.projectIdOrNull ?: return emptyList() val projectComponentIdentifier = resolution.dependency.id as? ProjectComponentIdentifier ?: return emptyList()
return resolution.allVisibleSourceSetNames.map { visibleSourceSetName -> return resolution.allVisibleSourceSetNames.map { visibleSourceSetName ->
IdeaKotlinSourceDependency( IdeaKotlinSourceDependency(
type = IdeaKotlinSourceDependency.Type.Regular, type = IdeaKotlinSourceDependency.Type.Regular,