Closes mozilla-mobile#2683. Update Gradle to 5.4.1

dector · Jun 12, 2019 · 8bca526 · 8bca526
1 parent f108822
commit 8bca526
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -298,7 +298,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
@@ -313,6 +315,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
@@ -328,9 +331,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
@@ -344,6 +349,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

diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt
@@ -27,6 +27,7 @@ private object Versions {
     const val androidx_lifecycle_savedstate = "1.0.0-alpha01"
     const val androidx_testing = "1.1.0-alpha08"
     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 google_material = "1.1.0-alpha07"
 
@@ -127,10 +128,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 sentry = "io.sentry:sentry-android:${Versions.sentry}"
     const val leakcanary = "com.squareup.leakcanary:leakcanary-android:${Versions.leakcanary}"
@@ -148,6 +151,7 @@ object Deps {
     const val androidx_lifecycle_viewmodel_ktx = "androidx.lifecycle:lifecycle-viewmodel-ktx:${Versions.androidx_lifecycle}"
     const val androidx_lifecycle_runtime = "androidx.lifecycle:lifecycle-runtime:${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:${Versions.androidx_navigation}"

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git 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.4.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip