Merge branch 'master' of http://zhi-edu.com:3000/lan/zedu_client

build/jsb-link/frameworks/runtime-src/proj.android-studio/app/build.gradle

@@ -166,7 +166,7 @@ android.applicationVariants.all { variant ->
         }
     }
     def outputFileDir = "D:\\zedu_jxb\\build\\${variant.name}"
-    //variant.getPackageApplicationProvider().get().outputDirectory = new File(outputFileDir)
+    variant.getPackageApplicationProvider().get().outputDirectory = new File(outputFileDir)
     variant.outputs.all { output ->
         if (variant.name == "debug") {
             outputFileName = "${variant.name}.apk"

build/jsb-link/frameworks/runtime-src/proj.android-studio/build.gradle

@@ -15,7 +15,7 @@ buildscript {
         maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.2'
+        classpath 'com.android.tools.build:gradle:4.1.1'
         classpath 'io.github.rockerhieu:versionberg:1.0.2'
     }
 }