diff --git a/app/build.gradle b/app/build.gradle index b4499adf6..4c388a221 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -306,7 +306,9 @@ dependencies { implementation Deps.mozilla_feature_downloads implementation Deps.mozilla_browser_domains implementation Deps.mozilla_browser_icons + implementation Deps.mozilla_browser_menu implementation Deps.mozilla_browser_engine_gecko_beta + implementation Deps.mozilla_browser_search implementation Deps.mozilla_browser_session implementation Deps.mozilla_browser_storage_sync implementation Deps.mozilla_browser_toolbar @@ -321,6 +323,7 @@ dependencies { implementation Deps.mozilla_feature_media implementation Deps.mozilla_feature_prompts implementation Deps.mozilla_feature_qr + implementation Deps.mozilla_feature_search implementation Deps.mozilla_feature_session implementation Deps.mozilla_feature_sync implementation Deps.mozilla_feature_toolbar @@ -336,9 +339,11 @@ dependencies { implementation Deps.mozilla_support_ktx implementation Deps.mozilla_support_rustlog + implementation Deps.mozilla_support_utils implementation Deps.mozilla_ui_colors implementation Deps.mozilla_ui_icons + implementation Deps.mozilla_ui_publicsuffixlist implementation Deps.mozilla_lib_crash debugImplementation Deps.leakcanary @@ -352,6 +357,7 @@ dependencies { x86_64Implementation Gecko.geckoview_beta_x86_64 implementation Deps.androidx_legacy + implementation Deps.androidx_paging implementation Deps.androidx_preference implementation Deps.androidx_fragment implementation Deps.androidx_navigation_fragment @@ -363,6 +369,7 @@ dependencies { implementation Deps.androidx_core implementation Deps.androidx_core_ktx implementation Deps.androidx_transition + implementation Deps.androidx_work_ktx implementation Deps.google_material implementation Deps.autodispose diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt index e85d35525..5fda03ea4 100644 --- a/buildSrc/src/main/java/Dependencies.kt +++ b/buildSrc/src/main/java/Dependencies.kt @@ -28,7 +28,9 @@ private object Versions { const val androidx_testing = "1.1.0-alpha08" const val androidx_test_ext = "1.0.0" const val androidx_core = "1.1.0-rc01" + const val androidx_paging = "2.0.0" const val androidx_transition = "1.1.0-rc02" + const val androidx_work = "2.0.1" const val google_material = "1.1.0-alpha07" const val mozilla_android_components = "3.0.0-SNAPSHOT" @@ -129,10 +131,12 @@ object Deps { const val mozilla_lib_crash = "org.mozilla.components:lib-crash:${Versions.mozilla_android_components}" const val mozilla_lib_fetch_httpurlconnection = "org.mozilla.components:lib-fetch-httpurlconnection:${Versions.mozilla_android_components}" + const val mozilla_ui_publicsuffixlist = "org.mozilla.components:lib-publicsuffixlist:${Versions.mozilla_android_components}" const val mozilla_support_base = "org.mozilla.components:support-base:${Versions.mozilla_android_components}" const val mozilla_support_ktx = "org.mozilla.components:support-ktx:${Versions.mozilla_android_components}" const val mozilla_support_rustlog = "org.mozilla.components:support-rustlog:${Versions.mozilla_android_components}" + const val mozilla_support_utils = "org.mozilla.components:support-utils:${Versions.mozilla_android_components}" const val mozilla_support_test = "org.mozilla.components:support-test:${Versions.mozilla_android_components}" const val sentry = "io.sentry:sentry-android:${Versions.sentry}" @@ -151,6 +155,7 @@ object Deps { const val androidx_lifecycle_viewmodel = "androidx.lifecycle:lifecycle-viewmodel-ktx:${Versions.androidx_lifecycle}" const val androidx_lifecycle_runtime = "androidx.lifecycle:lifecycle-runtime-ktx:${Versions.androidx_lifecycle}" const val androidx_lifecycle_viewmodel_ss = "androidx.lifecycle:lifecycle-viewmodel-savedstate:${Versions.androidx_lifecycle_savedstate}" + const val androidx_paging = "androidx.paging:paging-runtime:${Versions.androidx_paging}" const val androidx_preference = "androidx.preference:preference-ktx:${Versions.androidx_preference}" const val androidx_safeargs = "androidx.navigation:navigation-safe-args-gradle-plugin:${Versions.androidx_navigation}" const val androidx_navigation_fragment = "androidx.navigation:navigation-fragment-ktx:${Versions.androidx_navigation}" @@ -159,6 +164,7 @@ object Deps { const val androidx_core = "androidx.core:core:${Versions.androidx_core}" const val androidx_core_ktx = "androidx.core:core-ktx:${Versions.androidx_core}" const val androidx_transition = "androidx.transition:transition:${Versions.androidx_transition}" + const val androidx_work_ktx = "androidx.work:work-runtime-ktx:${Versions.androidx_work}" const val google_material = "com.google.android.material:material:${Versions.google_material}" const val autodispose = "com.uber.autodispose:autodispose:${Versions.autodispose}" diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index f6b961fd5..135367700 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 161f46ad0..e0c4de36d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Wed Feb 06 16:31:29 CST 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-5.5-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip