From 6a02047162e3d00d686ccc7910d48dd71d5fbc67 Mon Sep 17 00:00:00 2001
From: pppscn <35696959@qq.com>
Date: Fri, 3 Dec 2021 11:48:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E5=8D=87=E7=BA=A7XU?=
 =?UTF-8?q?pdate=E7=BB=84=E4=BB=B6=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle       | 19 ++++++++++++++++---
 app/proguard-rules.pro | 12 +++++++++++-
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 8c6c1a1c..641afb83 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -70,6 +70,18 @@ android {
             }
         }
     }
+    packagingOptions {
+        exclude 'META-INF/DEPENDENCIES.txt'
+        exclude 'META-INF/LICENSE.txt'
+        exclude 'META-INF/NOTICE.txt'
+        exclude 'META-INF/NOTICE'
+        exclude 'META-INF/LICENSE'
+        exclude 'META-INF/DEPENDENCIES'
+        exclude 'META-INF/notice.txt'
+        exclude 'META-INF/license.txt'
+        exclude 'META-INF/dependencies.txt'
+        exclude 'META-INF/LGPL2.1'
+    }
 }
 
 
@@ -117,6 +129,7 @@ dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation 'androidx.appcompat:appcompat:1.3.1'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.2'
+    implementation 'com.google.firebase:firebase-crashlytics-buildtools:2.5.2'
     testImplementation 'junit:junit:4.+'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
@@ -134,9 +147,9 @@ dependencies {
     //implementation 'com.umeng.umsdk:apm:1.4.2' // 错误分析升级为独立SDK，看crash数据请一定集成，可选
 
     //XUpdate
-    implementation 'com.github.xuexiangjys:XUpdate:2.1.0'
-    implementation 'com.github.xuexiangjys.XUpdateAPI:xupdate-easy:1.0.0'
-    implementation 'com.github.xuexiangjys.XUpdateAPI:xupdate-downloader-aria:1.0.0'
+    implementation 'com.github.xuexiangjys:XUpdate:2.1.1'
+    implementation 'com.github.xuexiangjys.XUpdateAPI:xupdate-easy:1.0.1'
+    implementation 'com.github.xuexiangjys.XUpdateAPI:xupdate-downloader-aria:1.0.1'
 
     //EmailKit
     implementation 'com.github.mailhu:emailkit:4.2.2'
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 8618a2fb..c88393ae 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -40,4 +40,14 @@
 
 -keep class com.xuexiang.xupdate.entity.** { *; }
 -keep class com.xuexiang.xupdatedemo.entity.** { *; }
-
+-dontwarn com.arialyy.aria.**
+-keep class com.arialyy.aria.**{*;}
+-keep class **$$DownloadListenerProxy{ *; }
+-keep class **$$UploadListenerProxy{ *; }
+-keep class **$$DownloadGroupListenerProxy{ *; }
+-keep class **$$DGSubListenerProxy{ *; }
+-keepclasseswithmembernames class * {
+    @Download.* <methods>;
+    @Upload.* <methods>;
+    @DownloadGroup.* <methods>;
+}