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

[Gradle] TCS:Gradle Sync: Initial support for multiplatform composite builds

Browse Source 
KT-52172
This commit is contained in:
Sebastian Sellmair
2022-12-08 14:36:15 +01:00
committed by Space Team
parent d4177f167b
commit 90f8edbe80
2 changed files with 5 additions and 2 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/IdeTransformedMetadataDependencyResolver.kt
+2
View File
@@ -5,6 +5,7 @@
package org.jetbrains.kotlin.gradle.plugin.ide.dependencyResolvers package org.jetbrains.kotlin.gradle.plugin.ide.dependencyResolvers
import org.gradle.api.artifacts.component.ProjectComponentIdentifier
import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinBinaryCoordinates import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinBinaryCoordinates
import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinDependency import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinDependency
import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinResolvedBinaryDependency import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinResolvedBinaryDependency
@@ -20,6 +21,7 @@ import org.jetbrains.kotlin.tooling.core.mutableExtrasOf
internal object IdeTransformedMetadataDependencyResolver : IdeDependencyResolver { internal object IdeTransformedMetadataDependencyResolver : IdeDependencyResolver {
override fun resolve(sourceSet: KotlinSourceSet): Set<IdeaKotlinDependency> = override fun resolve(sourceSet: KotlinSourceSet): Set<IdeaKotlinDependency> =
sourceSet.resolveMetadata<ChooseVisibleSourceSets>() sourceSet.resolveMetadata<ChooseVisibleSourceSets>()
.filter { resolution -> resolution.dependency.id !is ProjectComponentIdentifier }
.flatMap { resolution -> resolve(sourceSet, resolution) } .flatMap { resolution -> resolve(sourceSet, resolution) }
.toSet() .toSet()
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/dependencyResolvers/IdeVisibleMultiplatformSourceDependencyResolver.kt
+3 -2
View File
@@ -5,6 +5,7 @@
package org.jetbrains.kotlin.gradle.plugin.ide.dependencyResolvers package org.jetbrains.kotlin.gradle.plugin.ide.dependencyResolvers
import org.gradle.api.artifacts.component.ProjectComponentIdentifier
import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinDependency import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinDependency
import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinSourceCoordinates import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinSourceCoordinates
import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinSourceDependency import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinSourceDependency
@@ -25,12 +26,12 @@ internal object IdeVisibleMultiplatformSourceDependencyResolver : IdeDependencyR
private fun resolveSourceDependencies( private fun resolveSourceDependencies(
resolution: MetadataDependencyResolution.ChooseVisibleSourceSets resolution: MetadataDependencyResolution.ChooseVisibleSourceSets
): Iterable<IdeaKotlinDependency> { ): Iterable<IdeaKotlinDependency> {
val project = resolution.projectDependency ?: 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,
coordinates = IdeaKotlinSourceCoordinates( coordinates = IdeaKotlinSourceCoordinates(
project = IdeaKotlinProjectCoordinates(project), project = IdeaKotlinProjectCoordinates(projectComponentIdentifier),
sourceSetName = visibleSourceSetName sourceSetName = visibleSourceSetName
) )
) )