support agp7.0

AndResGuard-cli/build.gradle

@@ -6,9 +6,9 @@ version rootProject.ext.VERSION_NAME
 group rootProject.ext.GROUP
 
 dependencies {
-  compile fileTree(dir: 'libs', include: ['*.jar'])
+  implementation fileTree(dir: 'libs', include: ['*.jar'])
   //compile group: 'com.tencent.mm', name: 'AndResGuard-core', version: version
-  compile project(':AndResGuard-core')
+  implementation project(':AndResGuard-core')
 }
 
 sourceSets {

AndResGuard-core/build.gradle

@@ -7,9 +7,9 @@ group rootProject.ext.GROUP
 
 [compileJava, compileTestJava, javadoc]*.options*.encoding = 'UTF-8'
 dependencies {
-  compile fileTree(dir: 'libs', include: ['*.jar'])
-  compile 'com.android.tools.build:gradle:4.1.2'
-  compile 'commons-io:commons-io:2.6'
+  implementation fileTree(dir: 'libs', include: ['*.jar'])
+  implementation 'com.android.tools.build:gradle:7.0.3'
+  implementation 'commons-io:commons-io:2.6'
 }
 
 sourceSets {
@@ -22,4 +22,4 @@ sourceSets {
 [compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
 
 apply from: rootProject.file('gradle/java-artifacts.gradle')
-apply from: rootProject.file('gradle/gradle-mvn-push.gradle')
+//apply from: rootProject.file('gradle/gradle-mvn-push.gradle')

AndResGuard-example/build.gradle

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

AndResGuard-gradle-plugin/build.gradle

@@ -4,16 +4,16 @@ version rootProject.ext.VERSION_NAME
 group rootProject.ext.GROUP
 
 dependencies {
-  compile gradleApi()
-  compile localGroovy()
+  implementation gradleApi()
+  implementation localGroovy()
   //compile group: 'com.tencent.mm', name: 'AndResGuard-core', version: version
-  compile 'com.google.gradle:osdetector-gradle-plugin:1.6.0'
-  compile project(':AndResGuard-core')
+  implementation 'com.google.gradle:osdetector-gradle-plugin:1.6.0'
+  implementation project(':AndResGuard-core')
 }
 
 repositories {
   mavenCentral()
 }
 
-apply from: rootProject.file('gradle/java-artifacts.gradle')
-apply from: rootProject.file('gradle/gradle-mvn-push.gradle')
+//apply from: rootProject.file('gradle/java-artifacts.gradle')
+//apply from: rootProject.file('gradle/gradle-mvn-push.gradle')

AndResGuard-gradle-plugin/src/main/groovy/com/tencent/gradle/AndResGuardTask.groovy

@@ -7,6 +7,7 @@ import com.tencent.mm.resourceproguard.Main
 import org.gradle.api.DefaultTask
 import org.gradle.api.GradleException
 import org.gradle.api.provider.Property
+import org.gradle.api.tasks.Internal
 import org.gradle.api.tasks.TaskAction
 
 /**
@@ -15,8 +16,14 @@ import org.gradle.api.tasks.TaskAction
  * @author Sim Sun (sunsj1231@gmail.com)
  */
 class AndResGuardTask extends DefaultTask {
+
+  @Internal
   AndResGuardExtension configuration
+
+  @Internal
   def android
+
+  @Internal
   def buildConfigs = []
 
   AndResGuardTask() {
@@ -92,6 +99,7 @@ class AndResGuardTask extends DefaultTask {
     return "${file.parent}/AndResGuard_${fileName}/"
   }
 
+  @Internal
   def getZipAlignPath() {
     return "${android.getSdkDirectory().getAbsolutePath()}/build-tools/${android.buildToolsVersion}/zipalign"
   }

SevenZip/build.gradle

@@ -1,5 +1,5 @@
 //apply plugin: 'com.google.osdetector'
-apply plugin: 'maven'
+//apply plugin: 'maven'
 apply plugin: 'maven-publish'
 apply plugin: 'java'
 
@@ -50,4 +50,4 @@ publishing {
   }
 }
 
-apply from: rootProject.file('gradle/gradle-mvn-push.gradle')
+//apply from: rootProject.file('gradle/gradle-mvn-push.gradle')

build.gradle

@@ -1,20 +1,22 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
   repositories {
+    mavenLocal()
+    maven { url "https://plugins.gradle.org/m2/" }
     google()
-    jcenter()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:4.1.2'
-    classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
-    classpath 'com.ofg:uptodate-gradle-plugin:1.6.2'
+    classpath 'com.android.tools.build:gradle:7.0.3'
+//    classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
+//    classpath 'com.ofg:uptodate-gradle-plugin:1.6.2'
   }
 }
 
 allprojects {
   repositories {
+    mavenLocal()
+    maven { url "https://plugins.gradle.org/m2/" }
     google()
-    jcenter()
   }
   tasks.withType(JavaCompile) {
     sourceCompatibility = rootProject.ext.javaVersion

gradle.properties

@@ -12,4 +12,4 @@
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
-ANDRESGUARD_VESSION=1.2.21
+ANDRESGUARD_VESSION=1.2.22

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-4.10.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-all.zip