Skip to content

Commit 6b80ffc

Browse files
authored
Copy Jetpack Navigation 2.10.0-alpha03 (JetBrains#3002)
| GroupId | ReleaseVersion | ReleaseSHA | ReleaseBuildId | ReleaseDate | | --- | --- | --- | --- | --- | | androidx.navigation | 2.10.0-alpha03 | 35ca96c | 15216918 | 4/22/2026 | | | | **df4b49eda6f6834b6bc4c8aa30a581fa577a511e** | 15216785 | 4/22/2026 | Note: For convenience, it was merged from df4b49e, as there is [no diff between df4b49..35ca96](https://android.googlesource.com/platform/frameworks/support/+log/df4b49eda6f6834b6bc4c8aa30a581fa577a511e..35ca96cc1f129a6cc9d6650029cd6155668f4e7a/navigation) Fixes https://youtrack.jetbrains.com/issue/CMP-10100/Merge-Jetpack-Compose-1.11.0 ## Release Notes N/A
2 parents 2f18465 + c7551a8 commit 6b80ffc

57 files changed

Lines changed: 761 additions & 395 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ artifactRedirection.version.androidx.collection=1.5.0
142142
artifactRedirection.version.androidx.annotation=1.9.1
143143
artifactRedirection.version.androidx.graphics=1.1.0-alpha01
144144
artifactRedirection.version.androidx.lifecycle=2.11.0-beta01
145-
artifactRedirection.version.androidx.navigation=2.10.0-alpha01
145+
artifactRedirection.version.androidx.navigation=2.10.0-alpha03
146146
artifactRedirection.version.androidx.navigation3=1.1.0-rc01
147147
artifactRedirection.version.androidx.navigationevent=1.1.0-alpha01
148148
artifactRedirection.version.androidx.performance=1.0.0-alpha01

navigation/OWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ clarafok@google.com
44
ilake@google.com
55
danysantiago@google.com
66

7-
per-file settings.gradle = dustinlam@google.com, rahulrav@google.com
7+
per-file settings.gradle = rahulrav@google.com

navigation/integration-tests/testapp/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ dependencies {
2525
implementation(project(":navigation:navigation-fragment"))
2626
implementation(project(":navigation:navigation-runtime"))
2727
implementation(project(":navigation:navigation-ui"))
28-
implementation(project(":activity:activity"))
28+
implementation("androidx.activity:activity:1.12.1")
2929
implementation("androidx.appcompat:appcompat:1.1.0")
3030
implementation("androidx.cardview:cardview:1.0.0")
3131
implementation("androidx.constraintlayout:constraintlayout:2.0.1")

navigation/integration-tests/testapp/lint-baseline.xml

Lines changed: 0 additions & 40 deletions
This file was deleted.

navigation/integration-tests/testapp/src/main/res/anim/nav_default_enter_anim.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@
1515
limitations under the License.
1616
-->
1717

18-
<set xmlns:android="http://schemas.android.com/apk/res/android">
18+
<set xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
1919
<translate android:fromXDelta="100%"
2020
android:toXDelta="0%"
21-
android:duration="@integer/config_navAnimTime"/>
21+
android:duration="@integer/config_navAnimTime"
22+
tools:ignore="PrivateResource"/>
2223
</set>

navigation/integration-tests/testapp/src/main/res/anim/nav_default_exit_anim.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@
1515
limitations under the License.
1616
-->
1717

18-
<set xmlns:android="http://schemas.android.com/apk/res/android">
19-
<translate android:duration="@integer/config_navAnimTime"/>
18+
<set xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
19+
<translate android:duration="@integer/config_navAnimTime" tools:ignore="PrivateResource"/>
2020
</set>

navigation/integration-tests/testapp/src/main/res/anim/nav_default_pop_enter_anim.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@
1515
limitations under the License.
1616
-->
1717

18-
<set xmlns:android="http://schemas.android.com/apk/res/android">
19-
<translate android:duration="@integer/config_navAnimTime"/>
18+
<set xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
19+
<translate android:duration="@integer/config_navAnimTime" tools:ignore="PrivateResource"/>
2020
</set>

navigation/integration-tests/testapp/src/main/res/anim/nav_default_pop_exit_anim.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@
1515
limitations under the License.
1616
-->
1717

18-
<set xmlns:android="http://schemas.android.com/apk/res/android">
18+
<set xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
1919
<translate android:fromXDelta="0%"
2020
android:toXDelta="100%"
21-
android:duration="@integer/config_navAnimTime"/>
21+
android:duration="@integer/config_navAnimTime"
22+
tools:ignore="PrivateResource"/>
2223
</set>

navigation/navigation-common/bcv/native/current.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// Klib ABI Dump
2-
// Targets: [iosArm64, iosSimulatorArm64, linuxArm64, linuxX64, macosArm64]
2+
// Targets: [iosArm64, iosSimulatorArm64, linuxArm64, linuxX64, macosArm64, tvosArm64, tvosSimulatorArm64, watchosArm32, watchosArm64, watchosDeviceArm64, watchosSimulatorArm64]
33
// Rendering settings:
44
// - Signature version: 2
55
// - Show manifest properties: true

navigation/navigation-common/build.gradle

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,11 @@ androidXMultiplatform {
4646
}
4747
}
4848
desktop()
49-
mac()
5049
linux()
51-
ios()
50+
mac()
5251
watchos()
5352
tvos()
53+
ios()
5454
js()
5555
wasmJs()
5656

@@ -63,11 +63,11 @@ androidXMultiplatform {
6363

6464
commonMain.dependencies {
6565
api("androidx.annotation:annotation:1.9.1")
66-
api("androidx.lifecycle:lifecycle-common:2.9.2")
67-
api("androidx.lifecycle:lifecycle-runtime:2.9.2")
68-
api("androidx.lifecycle:lifecycle-viewmodel:2.9.2")
69-
api("androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.2")
70-
api("org.jetbrains.androidx.savedstate:savedstate:1.3.0")
66+
api(project(":lifecycle:lifecycle-common"))
67+
api(project(":lifecycle:lifecycle-runtime"))
68+
api(project(":lifecycle:lifecycle-viewmodel"))
69+
api(project(":lifecycle:lifecycle-viewmodel-savedstate"))
70+
api(project(":savedstate:savedstate"))
7171
implementation("androidx.collection:collection:1.5.0")
7272
implementation(libs.kotlinSerializationCore)
7373
}
@@ -79,8 +79,6 @@ androidXMultiplatform {
7979
}
8080

8181
androidMain.dependencies {
82-
api(project(":lifecycle:lifecycle-runtime"))
83-
api(project(":lifecycle:lifecycle-viewmodel"))
8482
api(project(":savedstate:savedstate-ktx"))
8583
implementation("androidx.core:core-ktx:1.1.0")
8684
implementation("androidx.profileinstaller:profileinstaller:1.4.0")

0 commit comments

Comments
 (0)