From 0ec0074ed5571e7278f1ed0ac2b89745642a818d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=8A=B2=E9=B9=8F?= <jingpeng.wang@outlook.com>
Date: Wed, 3 Jun 2020 11:51:21 +0800
Subject: [PATCH] android: update project & dependencies

---
 doric-android/app/build.gradle                         |  6 +++---
 doric-android/build.gradle                             |  2 +-
 doric-android/devkit/build.gradle                      | 10 +++++-----
 doric-android/doric/build.gradle                       | 10 ++++++----
 doric-android/gradle/wrapper/gradle-wrapper.properties |  2 +-
 5 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/doric-android/app/build.gradle b/doric-android/app/build.gradle
index bdf78695..aee1eded 100644
--- a/doric-android/app/build.gradle
+++ b/doric-android/app/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 29
-    buildToolsVersion '29.0.2'
+    buildToolsVersion '29.0.3'
     defaultConfig {
         applicationId "pub.doric.demo"
         minSdkVersion 16
@@ -27,7 +27,7 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation "com.google.android.material:material:1.0.0"
+    implementation "com.google.android.material:material:1.1.0"
     implementation "pub.doric:core:${rootProject.ext.Version}"
     implementation "pub.doric:devkit:${rootProject.ext.Version}"
     implementation 'com.github.penfeizhou.android.animation:glide-plugin:2.2.0'
@@ -36,5 +36,5 @@ dependencies {
     annotationProcessor 'com.github.bumptech.glide:compiler:4.11.0'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
 
-    debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.2'
+    debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.3'
 }
diff --git a/doric-android/build.gradle b/doric-android/build.gradle
index ae0fb4e5..36108bf2 100644
--- a/doric-android/build.gradle
+++ b/doric-android/build.gradle
@@ -7,7 +7,7 @@ buildscript {
 
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.3'
+        classpath 'com.android.tools.build:gradle:4.0.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/doric-android/devkit/build.gradle b/doric-android/devkit/build.gradle
index aebec30e..fdf6d80b 100644
--- a/doric-android/devkit/build.gradle
+++ b/doric-android/devkit/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion 29
-    buildToolsVersion "29.0.2"
+    buildToolsVersion "29.0.3"
 
 
     defaultConfig {
@@ -29,14 +29,14 @@ dependencies {
 
     implementation "pub.doric:core:${rootProject.ext.Version}"
     implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation "com.google.android.material:material:1.0.0"
+    implementation "com.google.android.material:material:1.1.0"
     implementation 'com.squareup.okhttp3:okhttp:3.12.1'
     implementation 'com.google.code.gson:gson:2.8.5'
-    api 'org.greenrobot:eventbus:3.1.1'
-    testImplementation 'junit:junit:4.12'
+    api 'org.greenrobot:eventbus:3.2.0'
+    testImplementation 'junit:junit:4.13'
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
-    implementation 'com.google.zxing:core:3.3.0'
+    implementation 'com.google.zxing:core:3.4.0'
     implementation 'com.google.zxing:android-core:3.3.0'
 
 }
diff --git a/doric-android/doric/build.gradle b/doric-android/doric/build.gradle
index cb5b3f2e..cb00e2bc 100644
--- a/doric-android/doric/build.gradle
+++ b/doric-android/doric/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion 29
-    buildToolsVersion '29.0.2'
+    buildToolsVersion '29.0.3'
 
     defaultConfig {
         minSdkVersion 16
@@ -46,20 +46,22 @@ dependencies {
     }
     implementation 'com.github.bumptech.glide:glide:4.8.0'
     implementation 'jp.wasabeef:glide-transformations:4.0.1'
-    implementation "com.google.android.material:material:1.0.0"
+    implementation "com.google.android.material:material:1.1.0"
 
-    def nav_version = "2.1.0"
+    def nav_version = "2.2.2"
 
     implementation "androidx.navigation:navigation-fragment:$nav_version"
     implementation "androidx.navigation:navigation-ui:$nav_version"
 
     implementation "com.qmuiteam:qmui:1.4.0"
 
-    testImplementation 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.13'
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
 
     implementation 'com.facebook.yoga.android:yoga-layout:1.16.0'
+    implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0'
+    implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.0.0'
 }
 
 if (new File('scripts/upload.gradle').exists()) {
diff --git a/doric-android/gradle/wrapper/gradle-wrapper.properties b/doric-android/gradle/wrapper/gradle-wrapper.properties
index e4bd82f6..3128e4ff 100644
--- a/doric-android/gradle/wrapper/gradle-wrapper.properties
+++ b/doric-android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-all.zip