From 4ce2419d9f45c6050644fdd9c8cb5facbfa7aa03 Mon Sep 17 00:00:00 2001
From: pppscn <35696959@qq.com>
Date: Sun, 30 Jan 2022 14:23:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9AGitHub=20Action=20?=
 =?UTF-8?q?=E6=89=93=E5=8C=85=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/SmsForwarder.yml       | 23 ++----------
 app/proguard-rules.pro                   | 48 +++++++++++++++++-------
 build.gradle                             |  2 +-
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 4 files changed, 39 insertions(+), 36 deletions(-)

diff --git a/.github/workflows/SmsForwarder.yml b/.github/workflows/SmsForwarder.yml
index 71115cb8..4e057bf0 100644
--- a/.github/workflows/SmsForwarder.yml
+++ b/.github/workflows/SmsForwarder.yml
@@ -57,19 +57,6 @@ jobs:
           release_name: SmsForwarder ${{ github.ref }}
           draft: false
           prerelease: false
-      # 获取当前日期
-      - name: Get Current Date
-        id: get-date
-        run: echo "::set-output name=date::$(date +'%Y%m%d')"
-      # 获取apk版本号
-      - name: Get Version Name
-        uses: actions/github-script@v3
-        id: get-version
-        with:
-          script: |
-            const str=process.env.GITHUB_REF;
-            return str.substring(str.indexOf("v")+1);
-          result-encoding: string
       # 存档打包的文件
       - name: Archive production artifacts
         uses: actions/upload-artifact@v2
@@ -77,13 +64,9 @@ jobs:
           name: build
           path: app/build/outputs #将打包之后的文件全部上传（里面会有混淆的map文件）
       # 上传至release的资源
-      - name: Upload Release Asset
-        id: upload-release-asset
-        uses: actions/upload-release-asset@v1
+      - name: Upload release binaries
+        uses: alexellis/upload-assets@0.2.2
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }} # 上传网址，无需改动
-          asset_path: app/build/outputs/apk/release/SmsForwarder_release_${{steps.get-date.outputs.date}}_${{steps.get-version.outputs.result}}.apk # 上传路径
-          asset_name: SmsForwarder_release_${{steps.get-date.outputs.date}}_${{steps.get-version.outputs.result}}.apk # 资源名
-          asset_content_type: application/vnd.android.package-archiv #资源类型
+          asset_paths: '["./app/build/outputs/apk/release/SmsForwarder_release_*"]'
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 41a6b773..110d973b 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -20,20 +20,9 @@
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
 
--keep class com.idormy.sms.forwarder.model.**{*;}
--keep public class com.idormy.sms.forwarder.R$*{
-public static final int *;
-}
-
--keep class com.umeng.** {*;}
--keepclassmembers class * {
-   public <init> (org.json.JSONObject);
-}
--keepclassmembers enum * {
-    public static **[] values();
-    public static ** valueOf(java.lang.String);
-}
+-keep class com.idormy.**{*;}
 
+#emailkit
 -dontwarn com.sun.**
 -dontwarn javax.mail.**
 -dontwarn javax.activation.**
@@ -42,8 +31,8 @@ public static final int *;
 -keep class javax.activation.** { *;}
 -keep class com.smailnet.emailkit.** { *;}
 
+#xupdate
 -keep class com.xuexiang.xupdate.entity.** { *; }
--keep class com.xuexiang.xupdatedemo.entity.** { *; }
 -dontwarn com.arialyy.aria.**
 -keep class com.arialyy.aria.**{*;}
 -keep class **$$DownloadListenerProxy{ *; }
@@ -55,3 +44,34 @@ public static final int *;
     @Upload.* <methods>;
     @DownloadGroup.* <methods>;
 }
+
+#友盟统计SDK
+-dontwarn com.umeng.**
+-dontwarn com.taobao.**
+-dontwarn anet.channel.**
+-dontwarn anetwork.channel.**
+-dontwarn org.android.**
+-dontwarn org.apache.thrift.**
+-dontwarn com.xiaomi.**
+-dontwarn com.huawei.**
+-dontwarn com.meizu.**
+
+-keepattributes *Annotation*
+
+-keep class com.taobao.** {*;}
+-keep class org.android.** {*;}
+-keep class anet.channel.** {*;}
+-keep class com.umeng.** {*;}
+-keep class com.xiaomi.** {*;}
+-keep class com.huawei.** {*;}
+-keep class com.meizu.** {*;}
+-keep class org.apache.thrift.** {*;}
+
+-keep class com.alibaba.sdk.android.** {*;}
+-keep class com.ut.** {*;}
+-keep class com.uc.** {*;}
+-keep class com.ta.** {*;}
+
+-keep public class **.R$* {
+    public static final int *;
+}
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index ce1afdd9..52cc96d2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,7 +10,7 @@ buildscript {
         maven { url 'https://repo1.maven.org/maven2/' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.4'
+        classpath 'com.android.tools.build:gradle:7.1.0'
         classpath 'com.chenenyu:img-optimizer:1.2.0'
     }
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 56338a71..0932b51e 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/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-7.0.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip