Merge androidx.navigation 2.10.0 - #3355
Merged
Igor Demin (igordmn) merged 10 commits intoSep 1, 2026
Merged
Conversation
…avigation/ae0d8893eaf/to-jb-main
Igor Demin (igordmn)
marked this pull request as ready for review
August 28, 2026 18:47
…avigation/ae0d8893eaf/to-jb-main # Conflicts: # navigation/navigation-compose/src/commonStubsMain/kotlin/androidx/navigation/compose/DefaultNavTransitions.nonAndroid.kt
Comment on lines
+32
to
+34
| public actual val exitTransition: | ||
| AnimatedContentTransitionScope<NavBackStackEntry>.() -> ExitTransition | ||
| get() = implementedInJetBrainsFork() | ||
| AnimatedContentTransitionScope<NavBackStackEntry>.() -> ExitTransition = | ||
| { ExitTransition.None } |
There was a problem hiding this comment.
Ivan Matkov (@MatkovIvan) I thought the crash is by design in stubs source sets
Author
There was a problem hiding this comment.
No-op is also used in stubs by Google sometimes.
As far as I know we discussed to use crashing as the main approach, but not sure if we discussed to always use it. It is probably fine to use No-op in constants, default interfaces, etc.
Author
There was a problem hiding this comment.
Actually you pointed to a valid mistake. I reset it.
It looks like an old state of pre-#3359
Konstantin (terrakok)
approved these changes
Aug 31, 2026
We already reset them in jb-main, but this branch brought the old wrongly resolved conflicts ``` git checkout --no-overlay 9f64fe7 -- \ 'navigation/**/api/**' \ 'navigation/**/bcv/**' \ 'navigation/**/**StubsMain/**' \ ':(exclude)**/api/desktop/**' \ ':(exclude)**/api/android/**' \ ':(exclude)**/**.klib.api' ```
Ivan Matkov (MatkovIvan)
requested changes
Aug 31, 2026
Ivan Matkov (MatkovIvan)
approved these changes
Aug 31, 2026
Ivan Matkov (MatkovIvan)
approved these changes
Aug 31, 2026
Konstantin (terrakok)
approved these changes
Sep 1, 2026
Igor Demin (igordmn)
deleted the
integration-copy/navigation/ae0d8893eaf/to-jb-main
branch
September 1, 2026 08:54
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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 https://youtrack.jetbrains.com/issue/CMP-10525/Merge-Jetpack-Compose-1.13.0-alpha01
Fixes https://youtrack.jetbrains.com/issue/CMP-9922
Release Notes
N/A