Merge branch 'master' into rel-1.3.6

app/build.gradle

@@ -87,11 +87,12 @@ android {
     // 命名生成的apk
     applicationVariants.all { variant ->
         if (variant.buildType.name != "debug") {
-            variant.getPackageApplicationProvider()
-                    .get()
-                    .outputScope
-                    .apkDatas
-                    .forEach { apkData -> apkData.outputFileName = "SmartCanteen" + "_v" + variant.versionName + ".apk" }
+            variant.getVariantData()
+                    .getPublicVariantPropertiesApi()
+                    .getOutputs()
+                    .forEach { output ->
+                        output.apkData.outputFileName = "SmartCanteen" + "_v" + variant.versionName + ".apk"
+                    }
         }
     }
     lintOptions {

build.gradle

@@ -9,7 +9,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.3'
+        classpath 'com.android.tools.build:gradle:4.0.0'
     }
 }
 

daemon/build.gradle

@@ -55,15 +55,15 @@ android {
         if (variant.buildType.name != "debug") {
             String targetDir = findAppAssetsDir()
             if (!targetDir.isEmpty()) {
-                variant.getPackageApplicationProvider()
-                        .get()
+                variant.getPackageApplication()
                         .outputDirectory = new File(targetDir)
             }
-            variant.getPackageApplicationProvider()
-                    .get()
-                    .outputScope
-                    .apkDatas
-                    .forEach { apkData -> apkData.outputFileName = signed }
+            variant.getVariantData()
+                    .getPublicVariantPropertiesApi()
+                    .getOutputs()
+                    .forEach { output ->
+                        output.apkData.outputFileName = signed
+                    }
         }
     }
 }