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

[Gradle] IdePlatformCinteropDependencyResolver: Properly list build dependencies

Browse Source 
^KT-56337 Verification Pending
This commit is contained in:
Sebastian Sellmair
2023-02-01 09:56:15 +01:00
committed by Space Team
parent bc98c47caa
commit ead2354fb7
1 changed files with 12 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/IdePlatformCinteropDependencyResolver.kt
+12 -3
View File
@@ -5,19 +5,28 @@
package org.jetbrains.kotlin.gradle.plugin.ide.dependencyResolvers package org.jetbrains.kotlin.gradle.plugin.ide.dependencyResolvers
import org.gradle.api.Project
import org.jetbrains.kotlin.gradle.dsl.kotlinExtension
import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinDependency import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinDependency
import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet 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.IdeMultiplatformImport
import org.jetbrains.kotlin.gradle.plugin.sources.DefaultKotlinSourceSet import org.jetbrains.kotlin.gradle.plugin.sources.DefaultKotlinSourceSet
import org.jetbrains.kotlin.gradle.targets.native.internal.getPlatformCinteropDependenciesOrEmpty import org.jetbrains.kotlin.gradle.targets.native.internal.getPlatformCinteropDependenciesOrEmpty
internal object IdePlatformCinteropDependencyResolver : IdeDependencyResolver { internal object IdePlatformCinteropDependencyResolver : IdeDependencyResolver, IdeDependencyResolver.WithBuildDependencies {
override fun resolve(sourceSet: KotlinSourceSet): Set<IdeaKotlinDependency> { override fun resolve(sourceSet: KotlinSourceSet): Set<IdeaKotlinDependency> {
if (sourceSet !is DefaultKotlinSourceSet) return emptySet() if (sourceSet !is DefaultKotlinSourceSet) return emptySet()
val project = sourceSet.project val project = sourceSet.project
val cinteropFiles = project.getPlatformCinteropDependenciesOrEmpty(sourceSet) val cinteropFiles = project.getPlatformCinteropDependenciesOrEmpty(sourceSet)
return project.resolveCInteropDependencies(cinteropFiles) return project.resolveCInteropDependencies(cinteropFiles)
} }
override fun dependencies(project: Project): Iterable<Any> {
return project.kotlinExtension.sourceSets.mapNotNull { sourceSet ->
if (sourceSet !is DefaultKotlinSourceSet) return@mapNotNull null
if (!IdeMultiplatformImport.SourceSetConstraint.isNative(sourceSet)) return@mapNotNull null
project.getPlatformCinteropDependenciesOrEmpty(sourceSet)
}
}
} }