Upgrade Gradle to 5.4.1, gradle plugin to 3.5.1 and fix various errors

wordpress-mobile · Oct 7, 2019 · d7117dd · d7117dd
1 parent 00acdb8
commit d7117dd
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 19 deletions.
diff --git a/WordPress/build.gradle b/WordPress/build.gradle
@@ -182,13 +182,16 @@ dependencies {
         exclude group: 'com.android.support', module: 'support-core-utils'
     })
 
+    implementation 'com.android.volley:volley:1.1.1'
     implementation 'com.google.firebase:firebase-messaging:17.0.0'
     implementation 'com.google.android.gms:play-services-auth:15.0.1'
     implementation 'com.google.android.gms:play-services-places:15.0.1'
     implementation 'com.android.installreferrer:installreferrer:1.0'
     implementation 'com.github.chrisbanes.photoview:library:1.2.4'
     implementation 'org.greenrobot:eventbus:3.1.1'
-    implementation 'com.automattic:rest:1.0.7'
+    implementation ('com.automattic:rest:1.0.7') {
+        exclude group: 'com.mcxiaoke.volley'
+    }
     implementation 'org.wordpress:graphview:3.4.0'
     implementation 'org.wordpress:persistentedittext:1.0.2'
     implementation 'org.wordpress:emailchecker2:1.1.0'
@@ -260,7 +263,9 @@ dependencies {
     implementation ('com.github.indexos.media-for-mobile:android:43a9026f0973a2f0a74fa813132f6a16f7499c3a')
 
     implementation project(path:':libs:utils:WordPressUtils')
-    implementation project(path:':libs:networking:WordPressNetworking')
+    implementation (project(path:':libs:networking:WordPressNetworking')) {
+        exclude group: "com.android.volley"
+    }
     implementation project(path:':libs:analytics:WordPressAnalytics')
     implementation project(path:':libs:editor:WordPressEditor')
     implementation (project(path:':libs:login:WordPressLoginFlow')) {

diff --git a/build.gradle b/build.gradle
@@ -9,14 +9,14 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.2'
+        classpath 'com.android.tools.build:gradle:3.5.1'
         classpath 'com.automattic.android:fetchstyle:1.1'
         classpath "org.jetbrains.kotlin:kotlin-allopen:$kotlin_version"
     }
 }
 
 plugins {
-    id 'com.gradle.build-scan' version '1.16'
+    id 'com.gradle.build-scan' version '2.0.2'
 }
 
 apply plugin: 'com.automattic.android.fetchstyle'
@@ -106,5 +106,5 @@ buildScan {
 
 ext {
     daggerVersion = '2.22.1'
-    fluxCVersion = '1.5.0-beta-3'
+    fluxCVersion = '8b3544fe2ce66a50031c2044bf0ea1216972e6bb'
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Jan 22 14:59:58 GMT 2019
+#Mon Sep 30 15:10:36 EDT 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
diff --git a/libs/analytics/WordPressAnalytics/build.gradle b/libs/analytics/WordPressAnalytics/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.2'
+        classpath 'com.android.tools.build:gradle:3.5.1'
         classpath 'com.novoda:bintray-release:0.8.1'
     }
 }

diff --git a/libs/editor/WordPressEditor/build.gradle b/libs/editor/WordPressEditor/build.gradle
@@ -9,7 +9,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.2'
+        classpath 'com.android.tools.build:gradle:3.5.1'
     }
 }
 
@@ -69,7 +69,7 @@ dependencies {
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'com.google.android.material:material:1.0.0'
     implementation 'org.apache.commons:commons-lang3:3.5'
-    implementation 'com.mcxiaoke.volley:library:1.0.18'
+    implementation 'com.android.volley:volley:1.1.1'
     implementation 'org.wordpress:utils:1.22'
 
     api ("com.github.wordpress-mobile.WordPress-Aztec-Android:aztec:$aztecVersion") {
@@ -81,15 +81,15 @@ dependencies {
     if (rootProject.ext.has("buildGutenbergFromSource") && rootProject.ext.buildGutenbergFromSource) {
         implementation (project(':react-native-gutenberg-bridge')) {
             exclude group: 'com.squareup.okhttp3'
-            exclude group: "com.mcxiaoke.volley"
+            exclude group: "com.android.volley"
             exclude group: 'com.google.code.findbugs'
         }
     } else {
         implementation (waitJitpack('com.github.wordpress-mobile', 'gutenberg-mobile', submoduleGitHash('../../../', 'libs/gutenberg-mobile'))) {
             // Inheriting RN's okhttp version can interfere with FluxC SSL handling
             // See https://github.com/wordpress-mobile/WordPress-Android/issues/9032 and https://github.com/wordpress-mobile/WordPress-FluxC-Android/issues/919
             exclude group: 'com.squareup.okhttp3'
-            exclude group: "com.mcxiaoke.volley"
+            exclude group: "com.android.volley"
             exclude group: 'com.google.code.findbugs'
         }
     }

diff --git a/libs/editor/example/build.gradle b/libs/editor/example/build.gradle
@@ -44,7 +44,7 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.0.2'
     implementation project(":WordPressEditor")
     implementation ('org.wordpress:utils:1.22')
-    implementation 'com.mcxiaoke.volley:library:1.0.18'
+    implementation 'com.android.volley:volley:1.1.1'
 
     // Test libraries
     testImplementation 'junit:junit:4.11'

diff --git a/libs/login/WordPressLoginFlow/build.gradle b/libs/login/WordPressLoginFlow/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.2'
+        classpath 'com.android.tools.build:gradle:3.5.1'
     }
 }
 
@@ -32,7 +32,7 @@ android {
 
 dependencies {
     implementation ('org.wordpress:utils:1.20.3') {
-        exclude group: "com.mcxiaoke.volley"
+        exclude group: "com.android.volley"
     }
 
     implementation 'androidx.appcompat:appcompat:1.0.2'

diff --git a/libs/networking/WordPressNetworking/build.gradle b/libs/networking/WordPressNetworking/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.2'
+        classpath 'com.android.tools.build:gradle:3.5.1'
     }
 }
 
@@ -29,8 +29,12 @@ android {
 }
 
 dependencies {
+    implementation 'com.android.volley:volley:1.1.1'
+
     implementation 'org.wordpress:utils:1.18.1'
-    implementation 'com.automattic:rest:1.0.7'
+    implementation ('com.automattic:rest:1.0.7') {
+        exclude group: 'com.mcxiaoke.volley'
+    }
 
     lintChecks 'org.wordpress:lint:1.0.1'
 }

diff --git a/libs/utils/WordPressUtils/build.gradle b/libs/utils/WordPressUtils/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.2'
+        classpath 'com.android.tools.build:gradle:3.5.1'
         classpath 'com.novoda:bintray-release:0.8.1'
     }
 }
@@ -19,7 +19,7 @@ repositories {
 
 dependencies {
     implementation 'org.apache.commons:commons-text:1.1'
-    implementation 'com.mcxiaoke.volley:library:1.0.18'
+    implementation 'com.android.volley:volley:1.1.1'
     implementation 'com.google.android.material:material:1.0.0'
     implementation 'androidx.recyclerview:recyclerview:1.0.0'
     implementation 'org.greenrobot:eventbus:3.0.0'