From 1fb172fc2a6ffee6fc7d409367b17a2192a9ee90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=98=87=E6=B2=90=E7=91=A4=E3=81=AE=E9=89=B2=E9=88=BD?=
 =?UTF-8?q?=E6=B8=8F=E8=AB=BE=E3=81=A5?=
 <51528915+Hny0305Lin@users.noreply.github.com>
Date: Wed, 15 Jun 2022 11:09:34 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0Gradle=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=20Update=20build.gradle?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

更新Gradle配置
---
 build.gradle | 42 +++++++++++++++++++++++++++++++-----------
 1 file changed, 31 insertions(+), 11 deletions(-)

diff --git a/build.gradle b/build.gradle
index 0366c2e9..8e92ca0a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,37 +2,55 @@
 
 buildscript {
     repositories {
+        // 华为开源镜像：https://mirrors.huaweicloud.com
+        maven { url 'https://repo.huaweicloud.com/repository/maven' }
+        maven { url 'https://developer.huawei.com/repo/' }
+
+        // 添加阿里云 maven 地址
         maven {
-            url 'https://maven.aliyun.com/repository/public/'
+            allowInsecureProtocol = true  //这一行
+            url 'http://maven.aliyun.com/nexus/content/groups/public/'
+        }
+        maven {
+            allowInsecureProtocol = true  //这一行
+            url 'http://maven.aliyun.com/nexus/content/repositories/jcenter'
         }
-        google()
-        //jcenter()
-        mavenCentral()
 
-        maven {url 'http://developer.huawei.com/repo/'}
+        maven { url 'https://repo1.maven.org/maven2/' }
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.2'
+        classpath 'com.android.tools.build:gradle:7.0.2'
+        //3.5.2 -> 7.0.2
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
         // Google Firebase cloud messaging
         classpath 'com.google.gms:google-services:4.3.8'
+        //classpath 'com.huawei.agconnect:agcp:1.6.0.300'
         classpath 'com.huawei.agconnect:agcp:1.2.1.301'
+
+        //1.2.1.301 -> 1.6.0.300
     }
 }
 
 allprojects {
     repositories {
+        // 华为开源镜像：https://mirrors.huaweicloud.com
+        maven { url 'https://repo.huaweicloud.com/repository/maven' }
 
+        // 添加阿里云 maven 地址
+        maven {
+            allowInsecureProtocol = true  //这一行
+            url 'http://maven.aliyun.com/nexus/content/groups/public/'
+        }
         maven {
-            url 'https://maven.aliyun.com/repository/public/'
+            allowInsecureProtocol = true  //这一行
+            url 'http://maven.aliyun.com/nexus/content/repositories/jcenter'
         }
+        maven { url 'https://repo1.maven.org/maven2/' }
+        maven { url 'https://developer.huawei.com/repo/' }
         google()
-        //jcenter()
-        mavenCentral()
-        maven { url 'http://developer.huawei.com/repo'}
-        maven { url 'https://jitpack.io' }
     }
 }
 
@@ -61,6 +79,8 @@ ext{
     }
 }
 
+apply plugin: 'com.huawei.agconnect'
+
 task clean(type: Delete) {
     delete rootProject.buildDir
 }

From d3bbe8097de5cad30d7f96dcdf51a85ac6403ecb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=98=87=E6=B2=90=E7=91=A4=E3=81=AE=E9=89=B2=E9=88=BD?=
 =?UTF-8?q?=E6=B8=8F=E8=AB=BE=E3=81=A5?=
 <51528915+Hny0305Lin@users.noreply.github.com>
Date: Wed, 15 Jun 2022 11:10:09 +0800
Subject: [PATCH 2/2] Update gradle-wrapper.properties

---
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 66fb0eae..e350de1d 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-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip