Skip to content

Merge Jetpack Compose 1.11.0-alpha06#2790

Merged
Oleksandr Karpovich (eymar) merged 8 commits into
jb-mainfrom
integration-copy/compose/f6a3829acf1/to-jb-main
Feb 26, 2026
Merged

Merge Jetpack Compose 1.11.0-alpha06#2790
Oleksandr Karpovich (eymar) merged 8 commits into
jb-mainfrom
integration-copy/compose/f6a3829acf1/to-jb-main

Conversation

@eymar

@eymar Oleksandr Karpovich (eymar) commented Feb 25, 2026

Copy link
Copy Markdown
Member
GroupId ReleaseVersion ReleaseSHA ReleaseBuildId ReleaseDate
androidx.compose.animation 14886741 2/25/2026
1.11.0-alpha06 6e23fc0 14906800 2/25/2026
androidx.compose.foundation 14886741 2/25/2026
1.11.0-alpha06 6e23fc0 14906800 2/25/2026
androidx.compose.material 1.11.0-alpha06 6e23fc0 14906800 2/25/2026
androidx.compose.runtime 14886741 2/25/2026
1.11.0-alpha06 6e23fc0 14906800 2/25/2026
14906084 2/25/2026
androidx.compose.ui 14886741 2/25/2026
1.11.0-alpha06 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


import androidx.compose.runtime.Composable

// TODO(b/352352908): Remove once this API will be available in common

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Please make sure that using NavigationEvent here is trackable

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

I'm not sure I got you. What do you mean by "trackable"?

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

We have bug on YT or Google tracker to remove this expect/actual

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Here the change is in commonMain (from upstream).
I added a TODO in nonAndroid main.

@@ -19,8 +19,7 @@ package androidx.compose.ui.graphics
import androidx.compose.runtime.Immutable
import androidx.compose.runtime.Stable

// TODO mark internal once https://youtrack.jetbrains.com/issue/KT-36695 is fixed
/* internal */ expect class NativeColorFilter
internal expect class NativeColorFilter

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Please add a YT task for actual adoption (assigned to me)

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

I guess no YT task neded. I added internal in skikoMain.

@@ -619,6 +619,8 @@ actual value class Key(val keyCode: Long) {

/** Numeric keypad Insert Key. */
actual val NumPadInsert = Key(KeyEvent.VK_INSERT, KEY_LOCATION_NUMPAD)
actual val SystemHome: Key = Key(-1000000184)
actual val NumPadDelete: Key = Key(KeyEvent.VK_DELETE, KEY_LOCATION_NUMPAD)

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Please keep them sorted like on commonMain, it's really hard to track the match otherwise

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

I fixed this particular case (SystemHome). But in general they are not ordered the same way as in expect.

Comment thread gradle/libs.versions.toml
@@ -33,7 +33,7 @@ builder = "8.6.0-alpha05"
byteBuddy = "1.14.9"
asm = "9.7"
cmake = "3.22.1"
composeCompilerPlugin = "2.3.0"
composeCompilerPlugin = "2.3.10"

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Is it compatible with 2.3.0 this time?

@eymar Oleksandr Karpovich (eymar) Feb 26, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

No :(

only k/wasm is affected though

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Add "Release Notes" then

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Is it trackable on KT side? Do we expect a compatibility fix in 2.3.20?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Added the release note.

I discussed this with k/wasm folks once again:
Their pace of development would drastically slow down if they enforce such limits on stlib changes.
(somewhat okayish for Beta)

@eymar Oleksandr Karpovich (eymar) merged commit 95bedd9 into jb-main Feb 26, 2026
26 checks passed
@eymar Oleksandr Karpovich (eymar) deleted the integration-copy/compose/f6a3829acf1/to-jb-main branch February 26, 2026 16:44
* * `SafeContentRulers`
*/
@ExperimentalComposeUiApi
var ComposeUiFlags.areWindowInsetsRulersEnabled by SkikoComposeUiFlags::isDialogAnimationEnabled

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Incorrect mapping, it redirects to isDialogAnimationEnabled now

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