Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix "Android target depends on prerelease versions" #1564

Merged
merged 1 commit into from
Sep 16, 2024
Merged

Fix "Android target depends on prerelease versions" #1564

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion ...rc/main/kotlin/androidx/build/jetbrains/JetbrainsAndroidXRedirectingPublicationHelpers.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,11 +133,21 @@ internal class CustomRootComponent(
fun addUsageFromConfiguration(configuration: Configuration, defaultUsage: KotlinUsageContext) {
val newDependency = customizeDependencyPerConfiguration(configuration)

// Dependencies from metadataApiElements, metadataSourcesElements.
// Includes not only commonMain, but also other non-target sourceSets (skikoMain, webMain)
val metadataDependencies = rootComponent.usages.flatMap { it.dependencies }

// Dependencies from debugApiElements and other Android configurations
val androidDependencies = defaultUsage.dependencies.toSet()

// Intersection of metadataDependencies and androidDependencies gives us commonMain deps
val commonMainDependencies = metadataDependencies.filter { it in androidDependencies }

extraUsages.add(
CustomUsage(
name = configuration.name,
attributes = configuration.attributes,
dependencies = setOf(newDependency) + defaultUsage.dependencies
dependencies = setOf(newDependency) + commonMainDependencies
)
)
}
Expand Down