Merge navigation-ktx extensions into the main library [184292145]

Fixed

Bug

Status Update

No update yet.

Description

au...@google.com

created issue #1

Apr 1, 2021 09:46PM

Merge navigation-ktx extensions into the main library. In particular this will help avoid having duplicate file names such as androidx/navigation/NavGraph.kt

Comments

il...@google.com <il...@google.com> Apr 1, 2021 09:58PM

Assigned to jb...@google.com.

ap...@google.com <ap...@google.com> #2Apr 5, 2021 06:32PM

Project: platform/frameworks/support
Branch: androidx-master-dev

commit b90079595f33f58fece04026a97faa0d243acdb1
Author: Yuichi Araki <yaraki@google.com>
Date: Wed Sep 18 16:55:49 2019

Change the way to detect mismatch between POJO and query

This fixes cursor mismatch warnings with expandProjection.

Bug: 140759491
Test: QueryMethodProcessorTest
Change-Id: I7659002e5e0d1ef60fc1af2a625c0c36da0664d8

M room/compiler/src/main/kotlin/androidx/room/processor/QueryMethodProcessor.kt
M room/compiler/src/main/kotlin/androidx/room/solver/TypeAdapterStore.kt
M room/compiler/src/main/kotlin/androidx/room/solver/query/result/PojoRowAdapter.kt
M room/compiler/src/test/kotlin/androidx/room/processor/QueryMethodProcessorTest.kt
M room/compiler/src/test/kotlin/androidx/room/testing/TestProcessor.kt

https://android-review.googlesource.com/1123258

https://goto.google.com/android-sha1/b90079595f33f58fece04026a97faa0d243acdb1

ap...@google.com <ap...@google.com> #3Apr 5, 2021 09:24PM

The following changes were cherrypicked through Coastguard (

https://android-build.googleplex.com/coastguard/)
Release Track: (

https://android-build.googleplex.com/coastguard/dashboard/6093116828680192/#/cherrypickHistory/all)
Created: 2019-10-14 17:23:42.610596+00:00
Changes: aosp/1123258

ap...@google.com <ap...@google.com> #4Apr 5, 2021 09:49PM

Project: platform/frameworks/support
Branch: androidx-master-dev

commit bdde5a1a970ddc9007b28de4aa29d60ffa588f08
Author: Yigit Boyar <yboyar@google.com>
Date: Thu Apr 16 16:47:05 2020

Re-factor how errors are dismissed when query is re-written

This CL changes how we handle errors/warnings if query is
re-written.
There was a bug in expandProjection where we would report warnings
for things that Room already fixes automatically (

b/140759491

).
The solution to that problem (I7659002e5e0d1ef60fc1af2a625c0c36da0664d8)
solved it by deferring validating of columns until after re-write
decision is made. Unfortunately, this required changing PojoRowAdapter
to have a dummy mapping until it is validating, make it hard to use
as it does have a non-null mapping which is not useful.

This CL partially reverts that change and instead rely on the log
deferring logic we have in Context. This way, we don't need to break
the stability of PojoRowAdapter while still having the ability to
drop warnings that room fixes. This will also play nicer when we
have different query re-writing options that can use more information
about the query results.

Bug: 153387066
Bug: 140759491
Test: existing tests pass
Change-Id: I2ec967c763d33d7a3ff02c1a13c6953b460d1e5f

M room/compiler/src/main/kotlin/androidx/room/log/RLog.kt
M room/compiler/src/main/kotlin/androidx/room/processor/QueryMethodProcessor.kt
M room/compiler/src/main/kotlin/androidx/room/solver/TypeAdapterStore.kt
M room/compiler/src/main/kotlin/androidx/room/solver/query/result/PojoRowAdapter.kt

https://android-review.googlesource.com/1288456

ap...@google.com <ap...@google.com> #5Apr 5, 2021 09:51PM

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

ap...@google.com <ap...@google.com> #6Apr 5, 2021 11:34PM

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

ap...@google.com <ap...@google.com> #7Apr 7, 2021 05:35PM

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

jb...@google.com <jb...@google.com> #8Apr 7, 2021 05:40PM

Marked as fixed.

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> #9Apr 13, 2021 12:29AM

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