Skip to content
This repository was archived by the owner on Jan 10, 2025. It is now read-only.

Commit 64bd25c

Browse files
ianhanniballakeianhanniballake
committed
Update to Navigation 2.0.0-rc02
As Architecture Components use AndroidX, we can safely switch to Navigation 2.0.0-rc02 Verified with ./run_all_tests.sh
1 parent f5bf21e commit 64bd25c

File tree

11 files changed

+66
-66
lines changed

11 files changed

+66
-66
lines changed

‎BasicRxJavaSample/versions.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ versions.mockito = "2.7.19"
4141
versions.mockito_all = "1.10.19"
4242
versions.mockito_android = "2.22.0"
4343
versions.mockwebserver = "3.8.1"
44-
versions.navigation = "1.0.0-rc02"
44+
versions.navigation = "2.0.0-rc02"
4545
versions.okhttp_logging_interceptor = "3.9.0"
4646
versions.paging = "2.1.0-rc01"
4747
versions.retrofit = "2.3.0"
@@ -155,11 +155,11 @@ work.runtime_ktx = "android.arch.work:work-runtime-ktx:$versions.work"
155155
deps.work = work
156156

157157
def navigation = [:]
158-
navigation.runtime = "android.arch.navigation:navigation-runtime:$versions.navigation"
159-
navigation.runtime_ktx = "android.arch.navigation:navigation-runtime-ktx:$versions.navigation"
160-
navigation.fragment = "android.arch.navigation:navigation-fragment:$versions.navigation"
161-
navigation.fragment_ktx = "android.arch.navigation:navigation-fragment-ktx:$versions.navigation"
162-
navigation.safe_args_plugin = "android.arch.navigation:navigation-safe-args-gradle-plugin:$versions.navigation"
158+
navigation.runtime = "androidx.navigation:navigation-runtime:$versions.navigation"
159+
navigation.runtime_ktx = "androidx.navigation:navigation-runtime-ktx:$versions.navigation"
160+
navigation.fragment = "androidx.navigation:navigation-fragment:$versions.navigation"
161+
navigation.fragment_ktx = "androidx.navigation:navigation-fragment-ktx:$versions.navigation"
162+
navigation.safe_args_plugin = "androidx.navigation:navigation-safe-args-gradle-plugin:$versions.navigation"
163163
deps.navigation = navigation
164164

165165
ext.deps = deps

‎BasicRxJavaSampleKotlin/versions.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ versions.mockito = "2.7.19"
4141
versions.mockito_all = "1.10.19"
4242
versions.mockito_android = "2.22.0"
4343
versions.mockwebserver = "3.8.1"
44-
versions.navigation = "1.0.0-rc02"
44+
versions.navigation = "2.0.0-rc02"
4545
versions.okhttp_logging_interceptor = "3.9.0"
4646
versions.paging = "2.1.0-rc01"
4747
versions.retrofit = "2.3.0"
@@ -155,11 +155,11 @@ work.runtime_ktx = "android.arch.work:work-runtime-ktx:$versions.work"
155155
deps.work = work
156156

157157
def navigation = [:]
158-
navigation.runtime = "android.arch.navigation:navigation-runtime:$versions.navigation"
159-
navigation.runtime_ktx = "android.arch.navigation:navigation-runtime-ktx:$versions.navigation"
160-
navigation.fragment = "android.arch.navigation:navigation-fragment:$versions.navigation"
161-
navigation.fragment_ktx = "android.arch.navigation:navigation-fragment-ktx:$versions.navigation"
162-
navigation.safe_args_plugin = "android.arch.navigation:navigation-safe-args-gradle-plugin:$versions.navigation"
158+
navigation.runtime = "androidx.navigation:navigation-runtime:$versions.navigation"
159+
navigation.runtime_ktx = "androidx.navigation:navigation-runtime-ktx:$versions.navigation"
160+
navigation.fragment = "androidx.navigation:navigation-fragment:$versions.navigation"
161+
navigation.fragment_ktx = "androidx.navigation:navigation-fragment-ktx:$versions.navigation"
162+
navigation.safe_args_plugin = "androidx.navigation:navigation-safe-args-gradle-plugin:$versions.navigation"
163163
deps.navigation = navigation
164164

165165
ext.deps = deps

‎BasicSample/versions.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ versions.mockito = "2.7.19"
4141
versions.mockito_all = "1.10.19"
4242
versions.mockito_android = "2.22.0"
4343
versions.mockwebserver = "3.8.1"
44-
versions.navigation = "1.0.0-rc02"
44+
versions.navigation = "2.0.0-rc02"
4545
versions.okhttp_logging_interceptor = "3.9.0"
4646
versions.paging = "2.1.0-rc01"
4747
versions.retrofit = "2.3.0"
@@ -155,11 +155,11 @@ work.runtime_ktx = "android.arch.work:work-runtime-ktx:$versions.work"
155155
deps.work = work
156156

157157
def navigation = [:]
158-
navigation.runtime = "android.arch.navigation:navigation-runtime:$versions.navigation"
159-
navigation.runtime_ktx = "android.arch.navigation:navigation-runtime-ktx:$versions.navigation"
160-
navigation.fragment = "android.arch.navigation:navigation-fragment:$versions.navigation"
161-
navigation.fragment_ktx = "android.arch.navigation:navigation-fragment-ktx:$versions.navigation"
162-
navigation.safe_args_plugin = "android.arch.navigation:navigation-safe-args-gradle-plugin:$versions.navigation"
158+
navigation.runtime = "androidx.navigation:navigation-runtime:$versions.navigation"
159+
navigation.runtime_ktx = "androidx.navigation:navigation-runtime-ktx:$versions.navigation"
160+
navigation.fragment = "androidx.navigation:navigation-fragment:$versions.navigation"
161+
navigation.fragment_ktx = "androidx.navigation:navigation-fragment-ktx:$versions.navigation"
162+
navigation.safe_args_plugin = "androidx.navigation:navigation-safe-args-gradle-plugin:$versions.navigation"
163163
deps.navigation = navigation
164164

165165
ext.deps = deps

‎GithubBrowserSample/versions.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ versions.mockito = "2.7.19"
4141
versions.mockito_all = "1.10.19"
4242
versions.mockito_android = "2.22.0"
4343
versions.mockwebserver = "3.8.1"
44-
versions.navigation = "1.0.0-rc02"
44+
versions.navigation = "2.0.0-rc02"
4545
versions.okhttp_logging_interceptor = "3.9.0"
4646
versions.paging = "2.1.0-rc01"
4747
versions.retrofit = "2.3.0"
@@ -155,11 +155,11 @@ work.runtime_ktx = "android.arch.work:work-runtime-ktx:$versions.work"
155155
deps.work = work
156156

157157
def navigation = [:]
158-
navigation.runtime = "android.arch.navigation:navigation-runtime:$versions.navigation"
159-
navigation.runtime_ktx = "android.arch.navigation:navigation-runtime-ktx:$versions.navigation"
160-
navigation.fragment = "android.arch.navigation:navigation-fragment:$versions.navigation"
161-
navigation.fragment_ktx = "android.arch.navigation:navigation-fragment-ktx:$versions.navigation"
162-
navigation.safe_args_plugin = "android.arch.navigation:navigation-safe-args-gradle-plugin:$versions.navigation"
158+
navigation.runtime = "androidx.navigation:navigation-runtime:$versions.navigation"
159+
navigation.runtime_ktx = "androidx.navigation:navigation-runtime-ktx:$versions.navigation"
160+
navigation.fragment = "androidx.navigation:navigation-fragment:$versions.navigation"
161+
navigation.fragment_ktx = "androidx.navigation:navigation-fragment-ktx:$versions.navigation"
162+
navigation.safe_args_plugin = "androidx.navigation:navigation-safe-args-gradle-plugin:$versions.navigation"
163163
deps.navigation = navigation
164164

165165
ext.deps = deps

‎NavigationBasicSample/versions.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ versions.mockito = "2.7.19"
4141
versions.mockito_all = "1.10.19"
4242
versions.mockito_android = "2.22.0"
4343
versions.mockwebserver = "3.8.1"
44-
versions.navigation = "1.0.0-rc02"
44+
versions.navigation = "2.0.0-rc02"
4545
versions.okhttp_logging_interceptor = "3.9.0"
4646
versions.paging = "2.1.0-rc01"
4747
versions.retrofit = "2.3.0"
@@ -155,11 +155,11 @@ work.runtime_ktx = "android.arch.work:work-runtime-ktx:$versions.work"
155155
deps.work = work
156156

157157
def navigation = [:]
158-
navigation.runtime = "android.arch.navigation:navigation-runtime:$versions.navigation"
159-
navigation.runtime_ktx = "android.arch.navigation:navigation-runtime-ktx:$versions.navigation"
160-
navigation.fragment = "android.arch.navigation:navigation-fragment:$versions.navigation"
161-
navigation.fragment_ktx = "android.arch.navigation:navigation-fragment-ktx:$versions.navigation"
162-
navigation.safe_args_plugin = "android.arch.navigation:navigation-safe-args-gradle-plugin:$versions.navigation"
158+
navigation.runtime = "androidx.navigation:navigation-runtime:$versions.navigation"
159+
navigation.runtime_ktx = "androidx.navigation:navigation-runtime-ktx:$versions.navigation"
160+
navigation.fragment = "androidx.navigation:navigation-fragment:$versions.navigation"
161+
navigation.fragment_ktx = "androidx.navigation:navigation-fragment-ktx:$versions.navigation"
162+
navigation.safe_args_plugin = "androidx.navigation:navigation-safe-args-gradle-plugin:$versions.navigation"
163163
deps.navigation = navigation
164164

165165
ext.deps = deps

‎PagingSample/versions.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ versions.mockito = "2.7.19"
4141
versions.mockito_all = "1.10.19"
4242
versions.mockito_android = "2.22.0"
4343
versions.mockwebserver = "3.8.1"
44-
versions.navigation = "1.0.0-rc02"
44+
versions.navigation = "2.0.0-rc02"
4545
versions.okhttp_logging_interceptor = "3.9.0"
4646
versions.paging = "2.1.0-rc01"
4747
versions.retrofit = "2.3.0"
@@ -155,11 +155,11 @@ work.runtime_ktx = "android.arch.work:work-runtime-ktx:$versions.work"
155155
deps.work = work
156156

157157
def navigation = [:]
158-
navigation.runtime = "android.arch.navigation:navigation-runtime:$versions.navigation"
159-
navigation.runtime_ktx = "android.arch.navigation:navigation-runtime-ktx:$versions.navigation"
160-
navigation.fragment = "android.arch.navigation:navigation-fragment:$versions.navigation"
161-
navigation.fragment_ktx = "android.arch.navigation:navigation-fragment-ktx:$versions.navigation"
162-
navigation.safe_args_plugin = "android.arch.navigation:navigation-safe-args-gradle-plugin:$versions.navigation"
158+
navigation.runtime = "androidx.navigation:navigation-runtime:$versions.navigation"
159+
navigation.runtime_ktx = "androidx.navigation:navigation-runtime-ktx:$versions.navigation"
160+
navigation.fragment = "androidx.navigation:navigation-fragment:$versions.navigation"
161+
navigation.fragment_ktx = "androidx.navigation:navigation-fragment-ktx:$versions.navigation"
162+
navigation.safe_args_plugin = "androidx.navigation:navigation-safe-args-gradle-plugin:$versions.navigation"
163163
deps.navigation = navigation
164164

165165
ext.deps = deps

‎PagingWithNetworkSample/versions.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ versions.mockito = "2.7.19"
4141
versions.mockito_all = "1.10.19"
4242
versions.mockito_android = "2.22.0"
4343
versions.mockwebserver = "3.8.1"
44-
versions.navigation = "1.0.0-rc02"
44+
versions.navigation = "2.0.0-rc02"
4545
versions.okhttp_logging_interceptor = "3.9.0"
4646
versions.paging = "2.1.0-rc01"
4747
versions.retrofit = "2.3.0"
@@ -155,11 +155,11 @@ work.runtime_ktx = "android.arch.work:work-runtime-ktx:$versions.work"
155155
deps.work = work
156156

157157
def navigation = [:]
158-
navigation.runtime = "android.arch.navigation:navigation-runtime:$versions.navigation"
159-
navigation.runtime_ktx = "android.arch.navigation:navigation-runtime-ktx:$versions.navigation"
160-
navigation.fragment = "android.arch.navigation:navigation-fragment:$versions.navigation"
161-
navigation.fragment_ktx = "android.arch.navigation:navigation-fragment-ktx:$versions.navigation"
162-
navigation.safe_args_plugin = "android.arch.navigation:navigation-safe-args-gradle-plugin:$versions.navigation"
158+
navigation.runtime = "androidx.navigation:navigation-runtime:$versions.navigation"
159+
navigation.runtime_ktx = "androidx.navigation:navigation-runtime-ktx:$versions.navigation"
160+
navigation.fragment = "androidx.navigation:navigation-fragment:$versions.navigation"
161+
navigation.fragment_ktx = "androidx.navigation:navigation-fragment-ktx:$versions.navigation"
162+
navigation.safe_args_plugin = "androidx.navigation:navigation-safe-args-gradle-plugin:$versions.navigation"
163163
deps.navigation = navigation
164164

165165
ext.deps = deps

‎PersistenceContentProviderSample/versions.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ versions.mockito = "2.7.19"
4141
versions.mockito_all = "1.10.19"
4242
versions.mockito_android = "2.22.0"
4343
versions.mockwebserver = "3.8.1"
44-
versions.navigation = "1.0.0-rc02"
44+
versions.navigation = "2.0.0-rc02"
4545
versions.okhttp_logging_interceptor = "3.9.0"
4646
versions.paging = "2.1.0-rc01"
4747
versions.retrofit = "2.3.0"
@@ -155,11 +155,11 @@ work.runtime_ktx = "android.arch.work:work-runtime-ktx:$versions.work"
155155
deps.work = work
156156

157157
def navigation = [:]
158-
navigation.runtime = "android.arch.navigation:navigation-runtime:$versions.navigation"
159-
navigation.runtime_ktx = "android.arch.navigation:navigation-runtime-ktx:$versions.navigation"
160-
navigation.fragment = "android.arch.navigation:navigation-fragment:$versions.navigation"
161-
navigation.fragment_ktx = "android.arch.navigation:navigation-fragment-ktx:$versions.navigation"
162-
navigation.safe_args_plugin = "android.arch.navigation:navigation-safe-args-gradle-plugin:$versions.navigation"
158+
navigation.runtime = "androidx.navigation:navigation-runtime:$versions.navigation"
159+
navigation.runtime_ktx = "androidx.navigation:navigation-runtime-ktx:$versions.navigation"
160+
navigation.fragment = "androidx.navigation:navigation-fragment:$versions.navigation"
161+
navigation.fragment_ktx = "androidx.navigation:navigation-fragment-ktx:$versions.navigation"
162+
navigation.safe_args_plugin = "androidx.navigation:navigation-safe-args-gradle-plugin:$versions.navigation"
163163
deps.navigation = navigation
164164

165165
ext.deps = deps

‎PersistenceMigrationsSample/versions.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ versions.mockito = "2.7.19"
4141
versions.mockito_all = "1.10.19"
4242
versions.mockito_android = "2.22.0"
4343
versions.mockwebserver = "3.8.1"
44-
versions.navigation = "1.0.0-rc02"
44+
versions.navigation = "2.0.0-rc02"
4545
versions.okhttp_logging_interceptor = "3.9.0"
4646
versions.paging = "2.1.0-rc01"
4747
versions.retrofit = "2.3.0"
@@ -155,11 +155,11 @@ work.runtime_ktx = "android.arch.work:work-runtime-ktx:$versions.work"
155155
deps.work = work
156156

157157
def navigation = [:]
158-
navigation.runtime = "android.arch.navigation:navigation-runtime:$versions.navigation"
159-
navigation.runtime_ktx = "android.arch.navigation:navigation-runtime-ktx:$versions.navigation"
160-
navigation.fragment = "android.arch.navigation:navigation-fragment:$versions.navigation"
161-
navigation.fragment_ktx = "android.arch.navigation:navigation-fragment-ktx:$versions.navigation"
162-
navigation.safe_args_plugin = "android.arch.navigation:navigation-safe-args-gradle-plugin:$versions.navigation"
158+
navigation.runtime = "androidx.navigation:navigation-runtime:$versions.navigation"
159+
navigation.runtime_ktx = "androidx.navigation:navigation-runtime-ktx:$versions.navigation"
160+
navigation.fragment = "androidx.navigation:navigation-fragment:$versions.navigation"
161+
navigation.fragment_ktx = "androidx.navigation:navigation-fragment-ktx:$versions.navigation"
162+
navigation.safe_args_plugin = "androidx.navigation:navigation-safe-args-gradle-plugin:$versions.navigation"
163163
deps.navigation = navigation
164164

165165
ext.deps = deps

‎WorkManagerSample/versions.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ versions.mockito = "2.7.19"
4141
versions.mockito_all = "1.10.19"
4242
versions.mockito_android = "2.22.0"
4343
versions.mockwebserver = "3.8.1"
44-
versions.navigation = "1.0.0-rc02"
44+
versions.navigation = "2.0.0-rc02"
4545
versions.okhttp_logging_interceptor = "3.9.0"
4646
versions.paging = "2.1.0-rc01"
4747
versions.retrofit = "2.3.0"
@@ -155,11 +155,11 @@ work.runtime_ktx = "android.arch.work:work-runtime-ktx:$versions.work"
155155
deps.work = work
156156

157157
def navigation = [:]
158-
navigation.runtime = "android.arch.navigation:navigation-runtime:$versions.navigation"
159-
navigation.runtime_ktx = "android.arch.navigation:navigation-runtime-ktx:$versions.navigation"
160-
navigation.fragment = "android.arch.navigation:navigation-fragment:$versions.navigation"
161-
navigation.fragment_ktx = "android.arch.navigation:navigation-fragment-ktx:$versions.navigation"
162-
navigation.safe_args_plugin = "android.arch.navigation:navigation-safe-args-gradle-plugin:$versions.navigation"
158+
navigation.runtime = "androidx.navigation:navigation-runtime:$versions.navigation"
159+
navigation.runtime_ktx = "androidx.navigation:navigation-runtime-ktx:$versions.navigation"
160+
navigation.fragment = "androidx.navigation:navigation-fragment:$versions.navigation"
161+
navigation.fragment_ktx = "androidx.navigation:navigation-fragment-ktx:$versions.navigation"
162+
navigation.safe_args_plugin = "androidx.navigation:navigation-safe-args-gradle-plugin:$versions.navigation"
163163
deps.navigation = navigation
164164

165165
ext.deps = deps

‎versions.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ versions.mockito = "2.7.19"
4141
versions.mockito_all = "1.10.19"
4242
versions.mockito_android = "2.22.0"
4343
versions.mockwebserver = "3.8.1"
44-
versions.navigation = "1.0.0-rc02"
44+
versions.navigation = "2.0.0-rc02"
4545
versions.okhttp_logging_interceptor = "3.9.0"
4646
versions.paging = "2.1.0-rc01"
4747
versions.retrofit = "2.3.0"
@@ -155,11 +155,11 @@ work.runtime_ktx = "android.arch.work:work-runtime-ktx:$versions.work"
155155
deps.work = work
156156

157157
def navigation = [:]
158-
navigation.runtime = "android.arch.navigation:navigation-runtime:$versions.navigation"
159-
navigation.runtime_ktx = "android.arch.navigation:navigation-runtime-ktx:$versions.navigation"
160-
navigation.fragment = "android.arch.navigation:navigation-fragment:$versions.navigation"
161-
navigation.fragment_ktx = "android.arch.navigation:navigation-fragment-ktx:$versions.navigation"
162-
navigation.safe_args_plugin = "android.arch.navigation:navigation-safe-args-gradle-plugin:$versions.navigation"
158+
navigation.runtime = "androidx.navigation:navigation-runtime:$versions.navigation"
159+
navigation.runtime_ktx = "androidx.navigation:navigation-runtime-ktx:$versions.navigation"
160+
navigation.fragment = "androidx.navigation:navigation-fragment:$versions.navigation"
161+
navigation.fragment_ktx = "androidx.navigation:navigation-fragment-ktx:$versions.navigation"
162+
navigation.safe_args_plugin = "androidx.navigation:navigation-safe-args-gradle-plugin:$versions.navigation"
163163
deps.navigation = navigation
164164

165165
ext.deps = deps

0 commit comments

Comments
 (0)