Skip to content

Merge Jetpack Lifecycle 2.11.0-alpha01#2795

Merged
eymar merged 4 commits intojb-mainfrom
integration-copy/lifecycle/f6a3829acf1/to-jb-main
Feb 26, 2026
Merged

Merge Jetpack Lifecycle 2.11.0-alpha01#2795
eymar merged 4 commits intojb-mainfrom
integration-copy/lifecycle/f6a3829acf1/to-jb-main

Conversation

@eymar
Copy link
Member

@eymar eymar commented Feb 25, 2026

GroupId ReleaseVersion ReleaseSHA ReleaseBuildId ReleaseDate
androidx.lifecycle 2.11.0-alpha01 6e23fc0 14906800 2/25/2026

Fixes https://youtrack.jetbrains.com/issue/CMP-9805/Merge-Jetpack-Compose-1.11.0-alpha06

Testing

N/A

Release Notes

N/A

@eymar eymar force-pushed the integration-copy/lifecycle/f6a3829acf1/to-jb-main branch from d226266 to 36b65f1 Compare February 25, 2026 13:44
@eymar eymar requested a review from MatkovIvan February 26, 2026 06:43
@eymar
Copy link
Member Author

eymar commented Feb 26, 2026

Note: k/wasm tests failed with

e: The version of the Kotlin/Wasm standard library (2.3.10-release-465) differs from the version of the compiler (2.3.0).

I don't want to bump Kotlin version here. I already bumped it in #2790 We can't rebase this branch.

So I'd suggest to "mark pipeline as green" and proceed with merging.

import androidx.lifecycle.ViewModelStoreOwner

public actual val ViewModelStoreOwnerHostDefaultKey: HostDefaultKey<ViewModelStoreOwner?> =
object : HostDefaultKey<ViewModelStoreOwner?> {}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's the reason for splitting non-android to desktop and non-jvm here? it looks the same

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

api("org.jetbrains.compose.runtime:runtime:1.8.2")
api("org.jetbrains.compose.runtime:runtime-saveable:1.8.2")
api("org.jetbrains.compose.runtime:runtime:1.11.0-alpha03")
api("org.jetbrains.compose.runtime:runtime-saveable:1.11.0-alpha03")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any reason to do it? Seems incorrect

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

They use new API from compose runtime. So it's expected that the latest compose runtime is needed.
They use project dependency. Since we pin versions here, I decided to pin too.

Copy link
Member

@MatkovIvan MatkovIvan Feb 26, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are no changes in code aside from build.gralde. I don't understand what changes you're talking about.

In general, for such cases we should unpin as well

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a change in navigation 2 library, not lifecycle

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just for history: this change has been removed>

The new runtime is need necessary for lifecycle. We unpinned and changed to project dependency.

@eymar eymar requested a review from MatkovIvan February 26, 2026 15:40
@eymar eymar force-pushed the integration-copy/lifecycle/f6a3829acf1/to-jb-main branch from 100cf47 to 5a1019f Compare February 26, 2026 16:43
@eymar eymar merged commit 50177c8 into jb-main Feb 26, 2026
14 of 17 checks passed
@eymar eymar deleted the integration-copy/lifecycle/f6a3829acf1/to-jb-main branch February 26, 2026 16:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants