feat(android): update AGP to 7.0.4 version

Tencent · Feb 9, 2022 · 8e04792 · 8e04792
1 parent 91e2f6c
commit 8e04792
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 11 deletions.
diff --git a/android/sdk/build.gradle b/android/sdk/build.gradle
@@ -36,7 +36,7 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:4.2.2'
+    classpath 'com.android.tools.build:gradle:7.0.4'
     // NOTE: Do not place your application dependencies here; they belong
     // in the individual module build.gradle files
   }

diff --git a/android/sdk/gradle.properties b/android/sdk/gradle.properties
@@ -16,10 +16,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-android.enableD8=true
-android.enableR8=false
 android.enableJetifier=true
 android.useAndroidX=true
+org.gradle.jvmargs = -Xms1024m -Xmx4096m
 
 #
 # Specifies Android archives base name

diff --git a/android/sdk/gradle/wrapper/gradle-wrapper.properties b/android/sdk/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-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
diff --git a/examples/android-demo/build.gradle b/examples/android-demo/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.2'
+        classpath 'com.android.tools.build:gradle:7.0.4'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }

diff --git a/examples/android-demo/example/build.gradle b/examples/android-demo/example/build.gradle
@@ -70,7 +70,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.1'
+        classpath 'com.android.tools.build:gradle:7.0.4'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
@@ -94,8 +94,13 @@ allprojects {
         }
         google()
         mavenCentral()
-        flatDir {
-            dirs 'libs'
+    }
+}
+
+android {
+    sourceSets {
+        main {
+            jniLibs.srcDirs = ['libs']
         }
     }
 }

diff --git a/examples/android-demo/gradle.properties b/examples/android-demo/gradle.properties
@@ -1,4 +1,3 @@
 android.enableJetifier=true
 android.useAndroidX=true
-android.enableD8=true
-android.enableR8=false
+org.gradle.jvmargs = -Xms1024m -Xmx4096m
diff --git a/examples/android-demo/gradle/wrapper/gradle-wrapper.properties b/examples/android-demo/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-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip