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

CfW: rely on exact configuration names to find the dependencies #4828

Merged
merged 1 commit into from
May 17, 2024
Merged

CfW: rely on exact configuration names to find the dependencies #4828

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
28 changes: 16 additions & 12 deletions ...ins/compose/src/main/kotlin/org/jetbrains/compose/web/internal/configureWebApplication.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import org.gradle.api.Project
import org.gradle.api.artifacts.Configuration
import org.gradle.api.artifacts.ResolvedDependency
import org.gradle.api.artifacts.UnresolvedDependency
import org.gradle.api.artifacts.component.ModuleComponentIdentifier
import org.gradle.api.provider.Provider
import org.jetbrains.compose.ComposeBuildConfig
import org.jetbrains.compose.ComposeExtension
Expand All @@ -27,20 +28,23 @@ internal fun Project.configureWeb(
// here we check all dependencies (including transitive)
// If there is compose.ui, then skiko is required!
val shouldRunUnpackSkiko = project.provider {
var dependsOnComposeUi = false
project.configurations.matching { configuration ->
val isWasmOrJs = configuration.name.contains("js", true) ||
configuration.name.contains("wasm", true)

configuration.isCanBeResolved && isWasmOrJs
}.all { configuration ->
val match = configuration.incoming.artifacts.resolvedArtifacts.get().any { artifact ->
artifact.id.componentIdentifier.toString().contains("org.jetbrains.compose.ui:ui:")
webExt.targetsToConfigure(project).any { target ->
val compilation = target.compilations.getByName("main")
val compileConfiguration = compilation.compileDependencyConfigurationName
val runtimeConfiguration = compilation.runtimeDependencyConfigurationName

listOf(compileConfiguration, runtimeConfiguration).mapNotNull { name ->
project.configurations.findByName(name)
}.flatMap { configuration ->
configuration.incoming.resolutionResult.allComponents.map { it.id }
}.any { identifier ->
if (identifier is ModuleComponentIdentifier) {
identifier.group == "org.jetbrains.compose.ui" && identifier.module == "ui"
} else {
false
}
}

dependsOnComposeUi = dependsOnComposeUi || match
}
dependsOnComposeUi
}

// configure only if there is k/wasm or k/js target:
Expand Down
Loading