chore(example): Upgrade AGP to 4.1.1 on samples

shwenzhang · Nov 13, 2020 · 9e16dee · 9e16dee
1 parent 85101f4
commit 9e16dee
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 42 deletions.
diff --git a/AndResGuard-example/app/build.gradle b/AndResGuard-example/app/build.gradle
@@ -1,18 +1,15 @@
 apply plugin: 'AndResGuard'
 apply plugin: 'com.android.application'
-apply plugin: 'io.fabric'
 
 buildscript {
   repositories {
     mavenLocal()
     google()
     jcenter()
-    maven { url 'https://maven.fabric.io/public' }
   }
   dependencies {
     // The Fabric Gradle plugin uses an open ended version to react
     // quickly to Android tooling updates
-    classpath 'io.fabric.tools:gradle:latest.integration'
     classpath("com.tencent.mm:AndResGuard-gradle-plugin:${ANDRESGUARD_VERSION}") { changing = true }
   }
 }
@@ -51,12 +48,6 @@ repositories {
   maven { url 'https://maven.fabric.io/public' }
 }
 
-crashlytics {
-  enableNdk true
-  androidNdkOut 'src/main/obj'
-  androidNdkLibsOut 'src/main/libs'
-}
-
 
 android {
   compileSdkVersion 30

diff --git a/AndResGuard-example/app1/build.gradle b/AndResGuard-example/app1/build.gradle
@@ -1,18 +1,13 @@
 apply plugin: 'AndResGuard'
 apply plugin: 'com.android.application'
-apply plugin: 'io.fabric'
 
 buildscript {
   repositories {
     mavenLocal()
     jcenter()
     google()
-    maven { url 'https://maven.fabric.io/public' }
   }
   dependencies {
-    // The Fabric Gradle plugin uses an open ended version to react
-    // quickly to Android tooling updates
-    classpath 'io.fabric.tools:gradle:latest.integration'
     classpath("com.tencent.mm:AndResGuard-gradle-plugin:${ANDRESGUARD_VERSION}") {
       changing = true
     }
@@ -31,7 +26,8 @@ andResGuard {
                //https://docs.fabric.io/android/crashlytics/build-tools.html
                "R.string.com.crashlytics.*",
                "R.id.*",
-               "R.drawable.a",]
+               "R.drawable.*",
+               "R.layout.*"]
   compressFilePattern = ["*.png",
                          "*.jpg",
                          "*.jpeg",
@@ -48,13 +44,6 @@ repositories {
   maven { url 'https://maven.fabric.io/public' }
 }
 
-crashlytics {
-  enableNdk true
-  androidNdkOut 'src/main/obj'
-  androidNdkLibsOut 'src/main/libs'
-}
-
-
 android {
   compileSdkVersion 26
   buildToolsVersion '29.0.2'
@@ -143,8 +132,4 @@ dependencies {
   implementation('com.crashlytics.sdk.android:crashlytics-ndk:1.1.6@aar') {
     transitive = true
   }
-  // NDK Kit
-  implementation('com.crashlytics.sdk.android:crashlytics-ndk:1.1.6@aar') {
-    transitive = true
-  }
 }
diff --git a/AndResGuard-example/app2/build.gradle b/AndResGuard-example/app2/build.gradle
@@ -1,18 +1,13 @@
 apply plugin: 'AndResGuard'
 apply plugin: 'com.android.application'
-apply plugin: 'io.fabric'
 
 buildscript {
   repositories {
     mavenLocal()
     jcenter()
     google()
-    maven { url 'https://maven.fabric.io/public' }
   }
   dependencies {
-    // The Fabric Gradle plugin uses an open ended version to react
-    // quickly to Android tooling updates
-    classpath 'io.fabric.tools:gradle:latest.integration'
     classpath("com.tencent.mm:AndResGuard-gradle-plugin:${ANDRESGUARD_VERSION}") {
       changing = true
     }
@@ -47,13 +42,6 @@ repositories {
   maven { url 'https://maven.fabric.io/public' }
 }
 
-crashlytics {
-  enableNdk true
-  androidNdkOut 'src/main/obj'
-  androidNdkLibsOut 'src/main/libs'
-}
-
-
 android {
   compileSdkVersion 26
   buildToolsVersion '29.0.2'

diff --git a/AndResGuard-example/build.gradle b/AndResGuard-example/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     jcenter()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:4.0.0'
+    classpath 'com.android.tools.build:gradle:4.1.1'
     // NOTE: Do not place your application dependencies here; they belong
     // in the individual module build.gradle files
   }

diff --git a/AndResGuard-example/gradle.properties b/AndResGuard-example/gradle.properties
@@ -16,5 +16,5 @@
 org.gradle.jvmargs=-Xmx2584M
 org.gradle.parallel=true
 org.gradle.daemon=true
-ANDRESGUARD_VERSION=1.2.19-debug
-ANDRESGUARD_SEVENZIP_VERSION=1.2.18
+ANDRESGUARD_VERSION=1.2.20
+ANDRESGUARD_SEVENZIP_VERSION=1.2.20
diff --git a/AndResGuard-example/gradle/wrapper/gradle-wrapper.properties b/AndResGuard-example/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.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-all.zip