兼容AGP7.0+

build.gradle

@@ -1,6 +1,6 @@
 ext {
     compileSdkVersion = 27
-    buildToolsVersion = "27.0.3"
+    buildToolsVersion = "28.0.3"
     minSdkVersion = 14
     targetSdkVersion = 26
 }
@@ -12,7 +12,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:3.0.1"
+        classpath "com.android.tools.build:gradle:3.2.1"
     }
 }
 

cli/build.gradle

@@ -12,8 +12,8 @@ sourceCompatibility = 1.7
 targetCompatibility = 1.7
 
 dependencies {
-    compile project(":common")
-    compile 'com.android.tools.build:apksig:2.3.3'
+    implementation project(":common")
+    implementation 'com.android.tools.build:apksig:2.3.3'
 }
 
 //mainClassName = 'com.mcxiaoke.packer.cli.Main'

common/build.gradle

@@ -12,11 +12,11 @@ targetCompatibility = 1.7
 
 dependencies {
     // JUnit and Mockito
-    testCompile "junit:junit:4.12"
-    testCompile "org.mockito:mockito-core:1.10.19"
-    testCompile "commons-io:commons-io:2.5"
-    testCompile 'com.android.tools.build:apksig:2.3.3'
-    testCompile "com.mcxiaoke.next:core:1.5.0"
+    testImplementation "junit:junit:4.12"
+    testImplementation "org.mockito:mockito-core:1.10.19"
+    testImplementation "commons-io:commons-io:2.5"
+    testImplementation 'com.android.tools.build:apksig:2.3.3'
+    testImplementation "com.mcxiaoke.next:core:1.5.0"
 }
 
 test {

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Tue Dec 16 11:37:35 CST 2014
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-bin.zip

plugin/build.gradle

@@ -16,12 +16,12 @@ repositories {
 }
 
 dependencies {
-    compile localGroovy()
-    compile gradleApi()
-    compile project(':common')
-    compile project(':cli')
-    compile 'com.android.tools.build:gradle:2.3.3'
-    compile 'com.android.tools.build:apksig:2.3.3'
+    implementation localGroovy()
+    implementation gradleApi()
+    implementation project(':common')
+    implementation project(':cli')
+    implementation 'com.android.tools.build:gradle:2.3.3'
+    implementation 'com.android.tools.build:apksig:2.3.3'
 }
 
 apply from: '../gradle-mvn-push.gradle'

plugin/src/main/groovy/com/mcxiaoke/packer/ng/GradlePlugin.groovy

@@ -18,7 +18,7 @@ class GradlePlugin implements Plugin<Project> {
             throw new PluginException(
                     "'com.android.application' plugin must be applied", null)
         }
-        project.configurations.create(PLUGIN_NAME).extendsFrom(project.configurations.compile)
+        project.configurations.create(PLUGIN_NAME).extendsFrom(project.configurations.implementation)
         project.extensions.create(PLUGIN_NAME, GradleExtension)
         project.afterEvaluate {
             project.android.applicationVariants.all { BaseVariant variant ->

plugin/src/main/groovy/com/mcxiaoke/packer/ng/GradleTask.groovy

@@ -7,6 +7,7 @@ import groovy.text.SimpleTemplateEngine
 import groovy.text.Template
 import org.gradle.api.DefaultTask
 import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.Internal
 import org.gradle.api.tasks.TaskAction
 
 import java.text.SimpleDateFormat
@@ -28,6 +29,7 @@ class GradleTask extends DefaultTask {
         description = 'generate APK with channel info'
     }
 
+    @Internal
     Template getNameTemplate() {
         String format
         String propValue = project.findProperty(Const.PROP_FORMAT)
@@ -43,6 +45,7 @@ class GradleTask extends DefaultTask {
         return engine.createTemplate(format)
     }
 
+    @Internal
     File getOriginalApk() {
         variant.outputs.each { ot ->
             logger.info("Output APK: ${ot.name},${ot.outputFile}")
@@ -54,6 +57,7 @@ class GradleTask extends DefaultTask {
         return file
     }
 
+    @Internal
     File getOutputRoot() {
         File outputDir
         String propValue = project.findProperty(Const.PROP_OUTPUT)
@@ -72,6 +76,7 @@ class GradleTask extends DefaultTask {
         return outputDir
     }
 
+    @Internal
     File getVariantOutput() {
         File outputDir = getOutputRoot()
         String flavorName = variant.flavorName
@@ -87,6 +92,7 @@ class GradleTask extends DefaultTask {
         return outputDir
     }
 
+    @Internal
     Set<String> getChannels() {
         // -P channels=ch1,ch2,ch3
         // -P [email protected]