Make commonMain dependencies as in AOSP#2749
Conversation
9f6acc2 to
9483d75
Compare
It is a new dependency inside `lifecycle-viewmodel-compose`, `"commonTest".
We removed them from commonMain, but the CMP targets need them
54daa29 to
95decf0
Compare
Ivan Matkov (MatkovIvan)
left a comment
There was a problem hiding this comment.
Please update the release notes wording, instead of "no longer provide" it should clearly state that the state of dependencies was synced with AOSP
| api(project(":navigation3:navigation3-ui")) | ||
| implementation("org.jetbrains.androidx.navigationevent:navigationevent-compose:1.0.0-rc02") | ||
| implementation("androidx.collection:collection:1.5.0") | ||
| implementation("org.jetbrains.androidx.navigationevent:navigationevent-compose:1.0.0-rc02") |
There was a problem hiding this comment.
It was already updated in #2696. Is it accidentally reverted due buildSrc merge?
| implementation("org.jetbrains.androidx.navigationevent:navigationevent-compose:1.0.0-rc02") | |
| implementation("org.jetbrains.androidx.navigationevent:navigationevent-compose:1.0.0") |
There was a problem hiding this comment.
I'll check and return
There was a problem hiding this comment.
Yes, I'll restore in a separate PR.
P.S. I didn't use horizontal scroll when verifing the diff 😅
There was a problem hiding this comment.
It is better to merge this PR first, as it easier to fix conflicts in 2754
| api(project(":compose:ui:ui")) | ||
| api(project(":compose:ui:ui-text")) | ||
| api(project(":compose:ui:ui-unit")) | ||
| implementation("androidx.compose.runtime:runtime:1.10.2") |
There was a problem hiding this comment.
Why this version instead of project dependency?
There was a problem hiding this comment.
Thank you, I made a mistake here. It was an experiment during CI fixing.
Changed to a project dependency.
| // when updating the runtime version please also update the runtime-saveable version | ||
| implementation(project(":compose:runtime:runtime")) | ||
| // We do not publish runtime-retain from the fork (it's KMP-compatible from the start) | ||
| // api(project(":compose:runtime:runtime-retain")) |
There was a problem hiding this comment.
Please restore this comment
There was a problem hiding this comment.
That is on purpose.
- If we decide to keep the comment, we need to add it for every project we don't publish
- But it adds unnecessary merge-conflicts and a "commented" noisy code that lives forever
- We already use approach that some projects are pinned to concrete versions compared to AOSP, it is no different here - we pinned the dependency to an artifact
The idea is to provide actionable points to migrate users projects. If there is no actionable points, we should use
|
|
Added to Release Notes: |
Fixes https://youtrack.jetbrains.com/issue/CMP-9522/Sync-project-dependencies-with-AOSP
This is done to avoid merge conflicts, and moving towards merging
build.gradletojb-mainduring version updates.The state is restored using "Compare before with Local" in IDEA on the 14051d6 commit. It should have the integration branch state (53a7a70) which should be equal to the AOSP state.
Can be reviewed commit by commit for more understanding of the chain of changes.
The Release Notes doesn't mentioned most of the removed
apidependencies because this should not affect user projects. The dependencies are still provided as API via anotherapidependencies.Testing
TeamCity passes
Release Notes
Migration Notes - Multiple Platforms
navigation-runtime,navigation-commonno longer provideandroidx.collectionas anapitransitive dependency. If your project doesn't compile with unresolvedandroidx.collection...classes addimplementation("androidx.collection:collection:1.5.0"). This change is required to avoid differences with the original Jetpack libraries and allow reusing the same code without additional changes needed.