Fixed
Status Update
Comments
il...@google.com <il...@google.com>
ap...@google.com <ap...@google.com> #2
Project: platform/frameworks/support
Branch: androidx-main
commit 38fff3658db785c775d5a2a8eca8fba1a4ea4542
Author: Aurimas Liutikas <aurimas@google.com>
Date: Thu Apr 01 15:43:54 2021
Merge navigation ktx and main library colliding files
Relnote: "Move several navigation extension functions from the ktx
modules into the main libraries"
Bug: 184292145
Test: building docs with gradle 7.0 does not warn about duplicate
navigation files
Change-Id: I4d1436efc57697f431adf6885539b2f703a9a19e
M compose/runtime/runtime/api/public_plus_experimental_1.0.0-beta05.txt
A navigation/navigation-common-ktx/api/current.ignore
M navigation/navigation-common-ktx/api/current.txt
M navigation/navigation-common-ktx/api/public_plus_experimental_current.txt
A navigation/navigation-common-ktx/api/restricted_current.ignore
M navigation/navigation-common-ktx/api/restricted_current.txt
D navigation/navigation-common-ktx/src/main/java/androidx/navigation/NavGraph.kt
D navigation/navigation-common-ktx/src/main/java/androidx/navigation/NavigatorProvider.kt
M navigation/navigation-common/api/current.txt
M navigation/navigation-common/api/public_plus_experimental_current.txt
M navigation/navigation-common/api/restricted_current.txt
M navigation/navigation-common/src/main/java/androidx/navigation/NavGraph.kt
M navigation/navigation-common/src/main/java/androidx/navigation/NavigatorProvider.kt
A navigation/navigation-runtime-ktx/api/current.ignore
M navigation/navigation-runtime-ktx/api/current.txt
M navigation/navigation-runtime-ktx/api/public_plus_experimental_current.txt
A navigation/navigation-runtime-ktx/api/restricted_current.ignore
M navigation/navigation-runtime-ktx/api/restricted_current.txt
D navigation/navigation-runtime-ktx/src/main/java/androidx/navigation/NavController.kt
D navigation/navigation-runtime-ktx/src/main/java/androidx/navigation/NavHost.kt
M navigation/navigation-runtime/api/current.txt
M navigation/navigation-runtime/api/public_plus_experimental_current.txt
M navigation/navigation-runtime/api/restricted_current.txt
M navigation/navigation-runtime/src/main/java/androidx/navigation/NavController.kt
M navigation/navigation-runtime/src/main/java/androidx/navigation/NavHost.kt
A navigation/navigation-ui-ktx/api/current.ignore
M navigation/navigation-ui-ktx/api/current.txt
M navigation/navigation-ui-ktx/api/public_plus_experimental_current.txt
A navigation/navigation-ui-ktx/api/restricted_current.ignore
M navigation/navigation-ui-ktx/api/restricted_current.txt
D navigation/navigation-ui-ktx/src/main/java/androidx/navigation/ui/AppBarConfiguration.kt
M navigation/navigation-ui/api/current.txt
M navigation/navigation-ui/api/public_plus_experimental_current.txt
M navigation/navigation-ui/api/restricted_current.txt
M navigation/navigation-ui/src/main/java/androidx/navigation/ui/AppBarConfiguration.kt
https://android-review.googlesource.com/1662940
Branch: androidx-main
commit 38fff3658db785c775d5a2a8eca8fba1a4ea4542
Author: Aurimas Liutikas <aurimas@google.com>
Date: Thu Apr 01 15:43:54 2021
Merge navigation ktx and main library colliding files
Relnote: "Move several navigation extension functions from the ktx
modules into the main libraries"
Bug: 184292145
Test: building docs with gradle 7.0 does not warn about duplicate
navigation files
Change-Id: I4d1436efc57697f431adf6885539b2f703a9a19e
M compose/runtime/runtime/api/public_plus_experimental_1.0.0-beta05.txt
A navigation/navigation-common-ktx/api/current.ignore
M navigation/navigation-common-ktx/api/current.txt
M navigation/navigation-common-ktx/api/public_plus_experimental_current.txt
A navigation/navigation-common-ktx/api/restricted_current.ignore
M navigation/navigation-common-ktx/api/restricted_current.txt
D navigation/navigation-common-ktx/src/main/java/androidx/navigation/NavGraph.kt
D navigation/navigation-common-ktx/src/main/java/androidx/navigation/NavigatorProvider.kt
M navigation/navigation-common/api/current.txt
M navigation/navigation-common/api/public_plus_experimental_current.txt
M navigation/navigation-common/api/restricted_current.txt
M navigation/navigation-common/src/main/java/androidx/navigation/NavGraph.kt
M navigation/navigation-common/src/main/java/androidx/navigation/NavigatorProvider.kt
A navigation/navigation-runtime-ktx/api/current.ignore
M navigation/navigation-runtime-ktx/api/current.txt
M navigation/navigation-runtime-ktx/api/public_plus_experimental_current.txt
A navigation/navigation-runtime-ktx/api/restricted_current.ignore
M navigation/navigation-runtime-ktx/api/restricted_current.txt
D navigation/navigation-runtime-ktx/src/main/java/androidx/navigation/NavController.kt
D navigation/navigation-runtime-ktx/src/main/java/androidx/navigation/NavHost.kt
M navigation/navigation-runtime/api/current.txt
M navigation/navigation-runtime/api/public_plus_experimental_current.txt
M navigation/navigation-runtime/api/restricted_current.txt
M navigation/navigation-runtime/src/main/java/androidx/navigation/NavController.kt
M navigation/navigation-runtime/src/main/java/androidx/navigation/NavHost.kt
A navigation/navigation-ui-ktx/api/current.ignore
M navigation/navigation-ui-ktx/api/current.txt
M navigation/navigation-ui-ktx/api/public_plus_experimental_current.txt
A navigation/navigation-ui-ktx/api/restricted_current.ignore
M navigation/navigation-ui-ktx/api/restricted_current.txt
D navigation/navigation-ui-ktx/src/main/java/androidx/navigation/ui/AppBarConfiguration.kt
M navigation/navigation-ui/api/current.txt
M navigation/navigation-ui/api/public_plus_experimental_current.txt
M navigation/navigation-ui/api/restricted_current.txt
M navigation/navigation-ui/src/main/java/androidx/navigation/ui/AppBarConfiguration.kt
ap...@google.com <ap...@google.com> #3
Project: platform/frameworks/support
Branch: androidx-main
commit 69c7fbc075fe8e5a163fe5312b289b692b9aecd4
Author: Jeremy Woods <jbwoods@google.com>
Date: Thu Apr 01 17:36:53 2021
Merge nav-common-ktx into nav-common
RelNote: "Navigation extention functions are now part of the main
navigaiton library"
Bug: 184292145
Test: ./gradlew checkApi
Change-Id: I1d5f0672e5a21f334b50603f9f72842a4e006805
D navigation/navigation-common-ktx/api/api_lint.ignore
M navigation/navigation-common-ktx/api/current.ignore
M navigation/navigation-common-ktx/api/current.txt
M navigation/navigation-common-ktx/api/public_plus_experimental_current.txt
M navigation/navigation-common-ktx/api/restricted_current.ignore
M navigation/navigation-common-ktx/api/restricted_current.txt
M navigation/navigation-common-ktx/build.gradle
D navigation/navigation-common-ktx/src/test/java/androidx/navigation/NavigatorProviderTest.kt
M navigation/navigation-common/api/api_lint.ignore
M navigation/navigation-common/api/current.txt
M navigation/navigation-common/api/public_plus_experimental_current.txt
M navigation/navigation-common/api/restricted_current.txt
M navigation/navigation-common/src/androidTest/java/androidx/navigation/NavDeepLinkBuilderTest.kt
M navigation/navigation-common/src/androidTest/java/androidx/navigation/NavDestinationBuilderTest.kt
M navigation/navigation-common/src/androidTest/java/androidx/navigation/NavGraphBuilderTest.kt
M navigation/navigation-common/src/androidTest/java/androidx/navigation/NavGraphTest.kt
M navigation/navigation-common/src/androidTest/java/androidx/navigation/NavOptionsBuilderTest.kt
M navigation/navigation-common/src/main/java/androidx/navigation/NavArgsLazy.kt
M navigation/navigation-common/src/main/java/androidx/navigation/NavDeepLinkDslBuilder.kt
M navigation/navigation-common/src/main/java/androidx/navigation/NavDestinationBuilder.kt
M navigation/navigation-common/src/main/java/androidx/navigation/NavGraphBuilder.kt
M navigation/navigation-common/src/main/java/androidx/navigation/NavOptionsBuilder.kt
M navigation/navigation-common/src/test/java/androidx/navigation/NavigatorProviderTest.kt
https://android-review.googlesource.com/1664702
Branch: androidx-main
commit 69c7fbc075fe8e5a163fe5312b289b692b9aecd4
Author: Jeremy Woods <jbwoods@google.com>
Date: Thu Apr 01 17:36:53 2021
Merge nav-common-ktx into nav-common
RelNote: "Navigation extention functions are now part of the main
navigaiton library"
Bug: 184292145
Test: ./gradlew checkApi
Change-Id: I1d5f0672e5a21f334b50603f9f72842a4e006805
D navigation/navigation-common-ktx/api/api_lint.ignore
M navigation/navigation-common-ktx/api/current.ignore
M navigation/navigation-common-ktx/api/current.txt
M navigation/navigation-common-ktx/api/public_plus_experimental_current.txt
M navigation/navigation-common-ktx/api/restricted_current.ignore
M navigation/navigation-common-ktx/api/restricted_current.txt
M navigation/navigation-common-ktx/build.gradle
D navigation/navigation-common-ktx/src/test/java/androidx/navigation/NavigatorProviderTest.kt
M navigation/navigation-common/api/api_lint.ignore
M navigation/navigation-common/api/current.txt
M navigation/navigation-common/api/public_plus_experimental_current.txt
M navigation/navigation-common/api/restricted_current.txt
M navigation/navigation-common/src/androidTest/java/androidx/navigation/NavDeepLinkBuilderTest.kt
M navigation/navigation-common/src/androidTest/java/androidx/navigation/NavDestinationBuilderTest.kt
M navigation/navigation-common/src/androidTest/java/androidx/navigation/NavGraphBuilderTest.kt
M navigation/navigation-common/src/androidTest/java/androidx/navigation/NavGraphTest.kt
M navigation/navigation-common/src/androidTest/java/androidx/navigation/NavOptionsBuilderTest.kt
M navigation/navigation-common/src/main/java/androidx/navigation/NavArgsLazy.kt
M navigation/navigation-common/src/main/java/androidx/navigation/NavDeepLinkDslBuilder.kt
M navigation/navigation-common/src/main/java/androidx/navigation/NavDestinationBuilder.kt
M navigation/navigation-common/src/main/java/androidx/navigation/NavGraphBuilder.kt
M navigation/navigation-common/src/main/java/androidx/navigation/NavOptionsBuilder.kt
M navigation/navigation-common/src/test/java/androidx/navigation/NavigatorProviderTest.kt
ap...@google.com <ap...@google.com> #4
Project: platform/frameworks/support
Branch: androidx-main
commit 96b48e348f476b6ad475bbb28edd908bc98f73b9
Author: Jeremy Woods <jbwoods@google.com>
Date: Thu Apr 01 18:06:14 2021
Merge nav-runtime-ktx into nav-runtime
RelNote: "Navigation extention functions are now part of the main
navigaiton library"
Bug: 184292145
Test: ./gradlew checkApi
Change-Id: I58879edf69670e69a337393f7e3d5dfe12c14acd
D navigation/navigation-runtime-ktx/api/api_lint.ignore
M navigation/navigation-runtime-ktx/api/current.ignore
M navigation/navigation-runtime-ktx/api/current.txt
M navigation/navigation-runtime-ktx/api/public_plus_experimental_current.txt
M navigation/navigation-runtime-ktx/api/restricted_current.ignore
M navigation/navigation-runtime-ktx/api/restricted_current.txt
M navigation/navigation-runtime-ktx/build.gradle
M navigation/navigation-runtime-ktx/src/androidTest/AndroidManifest.xml
D navigation/navigation-runtime-ktx/src/androidTest/java/androidx/navigation/NavControllerTest.kt
M navigation/navigation-runtime/api/api_lint.ignore
M navigation/navigation-runtime/api/current.txt
M navigation/navigation-runtime/api/public_plus_experimental_current.txt
M navigation/navigation-runtime/api/restricted_current.txt
M navigation/navigation-runtime/src/androidTest/AndroidManifest.xml
M navigation/navigation-runtime/src/androidTest/java/androidx/navigation/ActivityNavigatorDestinationBuilderTest.kt
M navigation/navigation-runtime/src/androidTest/java/androidx/navigation/ActivityNavigatorExtrasTest.kt
M navigation/navigation-runtime/src/androidTest/java/androidx/navigation/ActivityTest.kt
M navigation/navigation-runtime/src/androidTest/java/androidx/navigation/NavControllerTest.kt
M navigation/navigation-runtime/src/androidTest/java/androidx/navigation/NavHostTest.kt
M navigation/navigation-runtime/src/androidTest/java/androidx/navigation/ViewTest.kt
M navigation/navigation-runtime/src/main/java/androidx/navigation/Activity.kt
M navigation/navigation-runtime/src/main/java/androidx/navigation/ActivityNavArgsLazy.kt
M navigation/navigation-runtime/src/main/java/androidx/navigation/ActivityNavigatorDestinationBuilder.kt
M navigation/navigation-runtime/src/main/java/androidx/navigation/ActivityNavigatorExtras.kt
M navigation/navigation-runtime/src/main/java/androidx/navigation/View.kt
https://android-review.googlesource.com/1664703
Branch: androidx-main
commit 96b48e348f476b6ad475bbb28edd908bc98f73b9
Author: Jeremy Woods <jbwoods@google.com>
Date: Thu Apr 01 18:06:14 2021
Merge nav-runtime-ktx into nav-runtime
RelNote: "Navigation extention functions are now part of the main
navigaiton library"
Bug: 184292145
Test: ./gradlew checkApi
Change-Id: I58879edf69670e69a337393f7e3d5dfe12c14acd
D navigation/navigation-runtime-ktx/api/api_lint.ignore
M navigation/navigation-runtime-ktx/api/current.ignore
M navigation/navigation-runtime-ktx/api/current.txt
M navigation/navigation-runtime-ktx/api/public_plus_experimental_current.txt
M navigation/navigation-runtime-ktx/api/restricted_current.ignore
M navigation/navigation-runtime-ktx/api/restricted_current.txt
M navigation/navigation-runtime-ktx/build.gradle
M navigation/navigation-runtime-ktx/src/androidTest/AndroidManifest.xml
D navigation/navigation-runtime-ktx/src/androidTest/java/androidx/navigation/NavControllerTest.kt
M navigation/navigation-runtime/api/api_lint.ignore
M navigation/navigation-runtime/api/current.txt
M navigation/navigation-runtime/api/public_plus_experimental_current.txt
M navigation/navigation-runtime/api/restricted_current.txt
M navigation/navigation-runtime/src/androidTest/AndroidManifest.xml
M navigation/navigation-runtime/src/androidTest/java/androidx/navigation/ActivityNavigatorDestinationBuilderTest.kt
M navigation/navigation-runtime/src/androidTest/java/androidx/navigation/ActivityNavigatorExtrasTest.kt
M navigation/navigation-runtime/src/androidTest/java/androidx/navigation/ActivityTest.kt
M navigation/navigation-runtime/src/androidTest/java/androidx/navigation/NavControllerTest.kt
M navigation/navigation-runtime/src/androidTest/java/androidx/navigation/NavHostTest.kt
M navigation/navigation-runtime/src/androidTest/java/androidx/navigation/ViewTest.kt
M navigation/navigation-runtime/src/main/java/androidx/navigation/Activity.kt
M navigation/navigation-runtime/src/main/java/androidx/navigation/ActivityNavArgsLazy.kt
M navigation/navigation-runtime/src/main/java/androidx/navigation/ActivityNavigatorDestinationBuilder.kt
M navigation/navigation-runtime/src/main/java/androidx/navigation/ActivityNavigatorExtras.kt
M navigation/navigation-runtime/src/main/java/androidx/navigation/View.kt
ap...@google.com <ap...@google.com> #5
Project: platform/frameworks/support
Branch: androidx-main
commit 2884daea717a59402fbaa827a70c312cbef42616
Author: Jeremy Woods <jbwoods@google.com>
Date: Thu Apr 01 19:10:52 2021
Merge nav-fragment-ktx into nav-fragment
RelNote: "Navigation extention functions are now part of the main
navigaiton library"
Bug: 184292145
Test: ./gradlew checkApi
Change-Id: Ib8e326fef9ba0fbd8763fe9b483054eb3bbe83fd
A navigation/navigation-fragment-ktx/api/current.ignore
M navigation/navigation-fragment-ktx/api/current.txt
M navigation/navigation-fragment-ktx/api/public_plus_experimental_current.txt
A navigation/navigation-fragment-ktx/api/restricted_current.ignore
M navigation/navigation-fragment-ktx/api/restricted_current.txt
M navigation/navigation-fragment-ktx/build.gradle
M navigation/navigation-fragment-ktx/src/androidTest/AndroidManifest.xml
D navigation/navigation-fragment-ktx/src/androidTest/java/androidx/navigation/fragment/FragmentNavigatorExtrasTest.kt
M navigation/navigation-fragment/api/api_lint.ignore
M navigation/navigation-fragment/api/current.txt
M navigation/navigation-fragment/api/public_plus_experimental_current.txt
M navigation/navigation-fragment/api/restricted_current.txt
M navigation/navigation-fragment/build.gradle
M navigation/navigation-fragment/src/androidTest/AndroidManifest.xml
M navigation/navigation-fragment/src/androidTest/java/androidx/navigation/fragment/BaseNavControllerTest.kt
M navigation/navigation-fragment/src/androidTest/java/androidx/navigation/fragment/DialogFragmentNavigatorDestinationBuilderTest.kt
M navigation/navigation-fragment/src/androidTest/java/androidx/navigation/fragment/FragmentNavigatorDestinationBuilderTest.kt
M navigation/navigation-fragment/src/androidTest/java/androidx/navigation/fragment/FragmentNavigatorExtrasTest.kt
M navigation/navigation-fragment/src/androidTest/java/androidx/navigation/fragment/FragmentTest.kt
M navigation/navigation-fragment/src/androidTest/java/androidx/navigation/fragment/ImmediateNavigationTest.kt
M navigation/navigation-fragment/src/androidTest/java/androidx/navigation/fragment/MultiNavHostFragmentTest.kt
M navigation/navigation-fragment/src/androidTest/java/androidx/navigation/fragment/NavGraphViewModelLazyTest.kt
M navigation/navigation-fragment/src/androidTest/res/layout/activity_nav_graph.xml
M navigation/navigation-fragment/src/androidTest/res/navigation/test_graph.xml
M navigation/navigation-fragment/src/androidTest/res/navigation/vm_graph.xml
M navigation/navigation-fragment/src/main/java/androidx/navigation/NavGraphViewModelLazy.kt
M navigation/navigation-fragment/src/main/java/androidx/navigation/fragment/DialogFragmentNavigatorDestinationBuilder.kt
M navigation/navigation-fragment/src/main/java/androidx/navigation/fragment/Fragment.kt
M navigation/navigation-fragment/src/main/java/androidx/navigation/fragment/FragmentNavArgsLazy.kt
M navigation/navigation-fragment/src/main/java/androidx/navigation/fragment/FragmentNavigatorDestinationBuilder.kt
M navigation/navigation-fragment/src/main/java/androidx/navigation/fragment/FragmentNavigatorExtras.kt
https://android-review.googlesource.com/1664704
Branch: androidx-main
commit 2884daea717a59402fbaa827a70c312cbef42616
Author: Jeremy Woods <jbwoods@google.com>
Date: Thu Apr 01 19:10:52 2021
Merge nav-fragment-ktx into nav-fragment
RelNote: "Navigation extention functions are now part of the main
navigaiton library"
Bug: 184292145
Test: ./gradlew checkApi
Change-Id: Ib8e326fef9ba0fbd8763fe9b483054eb3bbe83fd
A navigation/navigation-fragment-ktx/api/current.ignore
M navigation/navigation-fragment-ktx/api/current.txt
M navigation/navigation-fragment-ktx/api/public_plus_experimental_current.txt
A navigation/navigation-fragment-ktx/api/restricted_current.ignore
M navigation/navigation-fragment-ktx/api/restricted_current.txt
M navigation/navigation-fragment-ktx/build.gradle
M navigation/navigation-fragment-ktx/src/androidTest/AndroidManifest.xml
D navigation/navigation-fragment-ktx/src/androidTest/java/androidx/navigation/fragment/FragmentNavigatorExtrasTest.kt
M navigation/navigation-fragment/api/api_lint.ignore
M navigation/navigation-fragment/api/current.txt
M navigation/navigation-fragment/api/public_plus_experimental_current.txt
M navigation/navigation-fragment/api/restricted_current.txt
M navigation/navigation-fragment/build.gradle
M navigation/navigation-fragment/src/androidTest/AndroidManifest.xml
M navigation/navigation-fragment/src/androidTest/java/androidx/navigation/fragment/BaseNavControllerTest.kt
M navigation/navigation-fragment/src/androidTest/java/androidx/navigation/fragment/DialogFragmentNavigatorDestinationBuilderTest.kt
M navigation/navigation-fragment/src/androidTest/java/androidx/navigation/fragment/FragmentNavigatorDestinationBuilderTest.kt
M navigation/navigation-fragment/src/androidTest/java/androidx/navigation/fragment/FragmentNavigatorExtrasTest.kt
M navigation/navigation-fragment/src/androidTest/java/androidx/navigation/fragment/FragmentTest.kt
M navigation/navigation-fragment/src/androidTest/java/androidx/navigation/fragment/ImmediateNavigationTest.kt
M navigation/navigation-fragment/src/androidTest/java/androidx/navigation/fragment/MultiNavHostFragmentTest.kt
M navigation/navigation-fragment/src/androidTest/java/androidx/navigation/fragment/NavGraphViewModelLazyTest.kt
M navigation/navigation-fragment/src/androidTest/res/layout/activity_nav_graph.xml
M navigation/navigation-fragment/src/androidTest/res/navigation/test_graph.xml
M navigation/navigation-fragment/src/androidTest/res/navigation/vm_graph.xml
M navigation/navigation-fragment/src/main/java/androidx/navigation/NavGraphViewModelLazy.kt
M navigation/navigation-fragment/src/main/java/androidx/navigation/fragment/DialogFragmentNavigatorDestinationBuilder.kt
M navigation/navigation-fragment/src/main/java/androidx/navigation/fragment/Fragment.kt
M navigation/navigation-fragment/src/main/java/androidx/navigation/fragment/FragmentNavArgsLazy.kt
M navigation/navigation-fragment/src/main/java/androidx/navigation/fragment/FragmentNavigatorDestinationBuilder.kt
M navigation/navigation-fragment/src/main/java/androidx/navigation/fragment/FragmentNavigatorExtras.kt
ap...@google.com <ap...@google.com> #6
Project: platform/frameworks/support
Branch: androidx-main
commit 6e98ee5331ebbfb883e82c69359c524446aa2dac
Author: Jeremy Woods <jbwoods@google.com>
Date: Thu Apr 01 19:22:19 2021
Merge nav-ui-ktx into nav-ui
RelNote: "Navigation extention functions are now part of the main
navigation library"
Bug: 184292145
Test: ./gradlew checkApi
Change-Id: Ic609052a5acd3493398ca672f180b031299a772c
M navigation/navigation-ui-ktx/api/current.ignore
M navigation/navigation-ui-ktx/api/current.txt
M navigation/navigation-ui-ktx/api/public_plus_experimental_current.txt
M navigation/navigation-ui-ktx/api/restricted_current.ignore
M navigation/navigation-ui-ktx/api/restricted_current.txt
M navigation/navigation-ui-ktx/build.gradle
M navigation/navigation-ui/api/current.txt
M navigation/navigation-ui/api/public_plus_experimental_current.txt
M navigation/navigation-ui/api/restricted_current.txt
M navigation/navigation-ui/src/main/java/androidx/navigation/ui/Activity.kt
M navigation/navigation-ui/src/main/java/androidx/navigation/ui/BottomNavigationView.kt
M navigation/navigation-ui/src/main/java/androidx/navigation/ui/CollapsingToolbarLayout.kt
M navigation/navigation-ui/src/main/java/androidx/navigation/ui/MenuItem.kt
M navigation/navigation-ui/src/main/java/androidx/navigation/ui/NavController.kt
M navigation/navigation-ui/src/main/java/androidx/navigation/ui/NavigationView.kt
M navigation/navigation-ui/src/main/java/androidx/navigation/ui/Toolbar.kt
https://android-review.googlesource.com/1664705
Branch: androidx-main
commit 6e98ee5331ebbfb883e82c69359c524446aa2dac
Author: Jeremy Woods <jbwoods@google.com>
Date: Thu Apr 01 19:22:19 2021
Merge nav-ui-ktx into nav-ui
RelNote: "Navigation extention functions are now part of the main
navigation library"
Bug: 184292145
Test: ./gradlew checkApi
Change-Id: Ic609052a5acd3493398ca672f180b031299a772c
M navigation/navigation-ui-ktx/api/current.ignore
M navigation/navigation-ui-ktx/api/current.txt
M navigation/navigation-ui-ktx/api/public_plus_experimental_current.txt
M navigation/navigation-ui-ktx/api/restricted_current.ignore
M navigation/navigation-ui-ktx/api/restricted_current.txt
M navigation/navigation-ui-ktx/build.gradle
M navigation/navigation-ui/api/current.txt
M navigation/navigation-ui/api/public_plus_experimental_current.txt
M navigation/navigation-ui/api/restricted_current.txt
M navigation/navigation-ui/src/main/java/androidx/navigation/ui/Activity.kt
M navigation/navigation-ui/src/main/java/androidx/navigation/ui/BottomNavigationView.kt
M navigation/navigation-ui/src/main/java/androidx/navigation/ui/CollapsingToolbarLayout.kt
M navigation/navigation-ui/src/main/java/androidx/navigation/ui/MenuItem.kt
M navigation/navigation-ui/src/main/java/androidx/navigation/ui/NavController.kt
M navigation/navigation-ui/src/main/java/androidx/navigation/ui/NavigationView.kt
M navigation/navigation-ui/src/main/java/androidx/navigation/ui/Toolbar.kt
ap...@google.com <ap...@google.com> #7
Project: platform/frameworks/support
Branch: androidx-main
commit 14523ed2d56ff087d163a65f9a9b689f1228044c
Author: Jeremy Woods <jbwoods@google.com>
Date: Wed Apr 07 09:22:44 2021
Depend on base navigation modules instead of ktx
Since all of navigation is now in kotlin, and the -ktx modules have also
been merged into the base library, everything we need is inside of the
base modules so we can now depend directly on those.
RelNote: "You can now depend directly on the Navigation base modules for
all navigation APIs including method extensions."
Test: ./gradlew bOS
Bug: 184292145
Change-Id: If8f79fdd84ccc6f5cf628b74478754909ac65e45
M navigation/navigation-dynamic-features-fragment/build.gradle
M navigation/navigation-dynamic-features-runtime/build.gradle
M navigation/navigation-fragment/build.gradle
M navigation/navigation-runtime/build.gradle
https://android-review.googlesource.com/1666184
Branch: androidx-main
commit 14523ed2d56ff087d163a65f9a9b689f1228044c
Author: Jeremy Woods <jbwoods@google.com>
Date: Wed Apr 07 09:22:44 2021
Depend on base navigation modules instead of ktx
Since all of navigation is now in kotlin, and the -ktx modules have also
been merged into the base library, everything we need is inside of the
base modules so we can now depend directly on those.
RelNote: "You can now depend directly on the Navigation base modules for
all navigation APIs including method extensions."
Test: ./gradlew bOS
Bug: 184292145
Change-Id: If8f79fdd84ccc6f5cf628b74478754909ac65e45
M navigation/navigation-dynamic-features-fragment/build.gradle
M navigation/navigation-dynamic-features-runtime/build.gradle
M navigation/navigation-fragment/build.gradle
M navigation/navigation-runtime/build.gradle
jb...@google.com <jb...@google.com> #8
Starting with the Navigation 2.4.0-alpha01
release, all of the -ktx
artifacts are now empty, with the functionality moved to the main artifacts.
Depending on the -ktx
artifacts still works, but depending directly on the main artifacts would be preferred.
ap...@google.com <ap...@google.com> #9
Project: platform/frameworks/support
Branch: androidx-main
commit 2a78a49583442afe6872e72d1b822b0f4244ddb7
Author: Jeremy Woods <jbwoods@google.com>
Date: Mon Apr 12 10:57:31 2021
Making truth, testing, and utils depend on base modules
Since all of navigation is now in kotlin and the -ktx modules are empty,
we should switch all modules to depend directly on the base module.
Also changed all the modules that use internal-testutils-navigation to
exclude navigation-common base module instead of the ktx.
RelNote: "The Navigation Testing and Navigation Test modules now depend
on the base Navigation modules instead of the empty -ktx modules."
Test: all tests pass
Bug: 184292145
Change-Id: I1b5f5cdb63ae1912cbd9ffb0dbbdc44664fd179a
M hilt/hilt-navigation-fragment/build.gradle
M navigation/integration-tests/testapp/build.gradle
M navigation/navigation-compose/build.gradle
M navigation/navigation-fragment/build.gradle
M navigation/navigation-runtime-truth/build.gradle
M navigation/navigation-testing/build.gradle
M navigation/navigation-ui/build.gradle
M testutils/testutils-navigation/build.gradle
https://android-review.googlesource.com/1673529
Branch: androidx-main
commit 2a78a49583442afe6872e72d1b822b0f4244ddb7
Author: Jeremy Woods <jbwoods@google.com>
Date: Mon Apr 12 10:57:31 2021
Making truth, testing, and utils depend on base modules
Since all of navigation is now in kotlin and the -ktx modules are empty,
we should switch all modules to depend directly on the base module.
Also changed all the modules that use internal-testutils-navigation to
exclude navigation-common base module instead of the ktx.
RelNote: "The Navigation Testing and Navigation Test modules now depend
on the base Navigation modules instead of the empty -ktx modules."
Test: all tests pass
Bug: 184292145
Change-Id: I1b5f5cdb63ae1912cbd9ffb0dbbdc44664fd179a
M hilt/hilt-navigation-fragment/build.gradle
M navigation/integration-tests/testapp/build.gradle
M navigation/navigation-compose/build.gradle
M navigation/navigation-fragment/build.gradle
M navigation/navigation-runtime-truth/build.gradle
M navigation/navigation-testing/build.gradle
M navigation/navigation-ui/build.gradle
M testutils/testutils-navigation/build.gradle
Description
Merge navigation-ktx extensions into the main library. In particular this will help avoid having duplicate file names such as
androidx/navigation/NavGraph.kt