CfW: Prevent UnpackSkikoWasmRuntime task execution when it's not needed #4824
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
eymar
changed the title
terrakok
reviewed
May 17, 2024
Comment on lines
31
to
41
| project.configurations.matching { | ||
| val isWasmOrJs = it.name.contains("js", true) || | ||
| it.name.contains("wasm", true) | ||
|
|
||
| it.isCanBeResolved && isWasmOrJs | ||
| }.all { | ||
| val match = it.incoming.artifacts.resolvedArtifacts.get().any { | ||
| it.id.componentIdentifier.toString().contains("org.jetbrains.compose.ui") | ||
| } | ||
|
|
||
| dependsOnComposeUi = dependsOnComposeUi || match |
There was a problem hiding this comment.
I'd ask use explicit parameters instead of 'it'
terrakok
approved these changes
May 17, 2024
igordmn
reviewed
May 17, 2024
...lugins/compose/src/main/kotlin/org/jetbrains/compose/web/internal/configureWebApplication.kt
Outdated
Show resolved
Hide resolved
igordmn
approved these changes
May 17, 2024
igordmn
approved these changes
May 17, 2024
eymar
added a commit
that referenced
this pull request
May 17, 2024
…ed (#4824) Fixes: #4823 In #4796 we intentionally started to configure the web app for all k/js and k/wasm targets. The configuration involves adding a dependency on skiko-wasm runtime and unpacking it. Some projects don't need skiko-wasm-runtime (like those based on compose.html or just compose.runtime). **Solution:** We check if there is a dependency on org.jetbrains.compose.ui libraries (including transitive dependencies). If we find it, then we enable skikoUnpack task. Otherwise it's disabled. ## Testing - Build the gradle plugin locally (with this change) - Used it in our html landing example: https://github.com/JetBrains/compose-multiplatform/blob/master/examples/html/landing - Run `./gradlew jsBrowserDistribution`, check `.../compose-multiplatform/examples/html/landing/build/dist/js/productionExecutable` and see NO skiko.* files added there - Then add `implementation(compose.foundation)` dependency in build.gradle.jts and run `./gradlew clean jsBrowserDistribution` again - the build/dist contains skiko.* now (cherry picked from commit 30164c5)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes: #4823
In #4796 we intentionally started to configure the web app for all k/js and k/wasm targets. The configuration involves adding a dependency on skiko-wasm runtime and unpacking it.
Some projects don't need skiko-wasm-runtime (like those based on compose.html or just compose.runtime).
Solution:
We check if there is a dependency on org.jetbrains.compose.ui libraries (including transitive dependencies). If we find it, then we enable skikoUnpack task. Otherwise it's disabled.
Testing
./gradlew jsBrowserDistribution, check.../compose-multiplatform/examples/html/landing/build/dist/js/productionExecutableand see NO skiko.* files added thereimplementation(compose.foundation)dependency in build.gradle.jts and run./gradlew clean jsBrowserDistributionagain - the build/dist contains skiko.* now