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

since these are in public API (:/) we need to do this in 1.2

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

since it is already marked as deprecated, we can probably do it by now.

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

Opening diff shortly

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

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

commit d576cbdc911cba16638a44fd8223391a90a07ef7
Author: Mike Nakhimovich <digitalbuddha@users.noreply.github.com>
Date: Tue Aug 11 09:30:34 2020

[GH] Hide deprecated internal API.

## Proposed Changes

* `RoomDatabase.java` has protected `mCallbacks` field which is leaking in the API docs, we should @Hide it.

## Testing

Test: Ran unit tests locally

## Issues Fixed

Fixes: 76109329

This is an imported pull request from

https://github.com/androidx/androidx/pull/61.

Resolves #61
Github-Pr-Head-Sha: 6440daa3a63752c7f9d5ba2a390248cd85bc634f
GitOrigin-RevId: fe92d8466a59b44b218b6ca3cbd57dcda17992f7

Change-Id: Id599cdf5b02b32bdae0166266fb7da967598fe92

A room/runtime/api/current.ignore
M room/runtime/api/current.txt
M room/runtime/api/public_plus_experimental_current.txt
M room/runtime/api/restricted_current.txt
M room/runtime/src/main/java/androidx/room/RoomDatabase.java

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

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