cocos2d · minggo · Jul 24, 2019 · May 10, 2019 · May 17, 2019 · May 17, 2019
diff --git a/.gitignore b/.gitignore
@@ -175,3 +175,10 @@ metal-support*.zip
 **/org.eclipse.buildship.core.prefs
 
 desktop.ini
+# tmp folder for temp usage
+tmp/
+temp/
+
+# external libs zip
+*.zip
+**/simulator/
diff --git a/templates/cpp-template-default/proj.android/app/build.gradle b/templates/cpp-template-default/proj.android/app/build.gradle
@@ -73,16 +73,22 @@ android {
 }
 
 android.applicationVariants.all { variant ->
-    // delete previous files first
-    delete "${buildDir}/intermediates/assets/${variant.dirName}"
+    def project_root_folder = "${projectDir}/../.."
+    def dest_assets_folder = "${projectDir}/assets"
 
-    variant.mergeAssets.doLast {
+    // delete previous files first
+    delete dest_assets_folder
+    def targetName = variant.name.capitalize()
+    def copyTaskName = "copy${targetName}ResourcesToAssets"
+
+    tasks.register(copyTaskName) {
         copy {
             from "${buildDir}/../../../Resources"
             into "${buildDir}/intermediates/assets/${variant.dirName}"
             exclude "**/*.gz"
         }
     }
+    tasks.getByName("pre${targetName}Build").dependsOn copyTaskName
 }
 
 dependencies {

diff --git a/templates/cpp-template-default/proj.android/gradle/wrapper/gradle-wrapper.properties b/templates/cpp-template-default/proj.android/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.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.android/app/build.gradle b/templates/lua-template-default/frameworks/runtime-src/proj.android/app/build.gradle
@@ -30,6 +30,7 @@ android {
         res.srcDir "res"
         jniLibs.srcDir "libs"
         manifest.srcFile "AndroidManifest.xml"
+        assets.srcDir "assets"
     }
 
     externalNativeBuild {
@@ -76,11 +77,19 @@ def getCocosCommandPath() {
         return 'cocos.bat'
     }
     else {
+
+        def env_console_path = System.getenv("COCOS_CONSOLE_ROOT")
+
+        if (env_console_path != null && !env_console_path.trim().isEmpty()) {
+            return new File(env_console_path.trim() + '/cocos').absolutePath
+        }
+
         // on unix like system, can not get environments variables easily
         // so run a shell script to get environment variable sets by cocos2d-x setup.py
         new ByteArrayOutputStream().withStream { os ->
             def result = exec {
-                executable = project.file('get_environment.sh')
+                executable = "/bin/bash"
+                args = [ "-i", project.file('get_environment.sh')]
                 standardOutput = os
             }
             ext.console_path = os.toString().trim()
@@ -122,23 +131,29 @@ def compileLua(srcDir, dstDir, doCompile, is64bit, doEncrypt) {
 }
 
 android.applicationVariants.all { variant ->
+    def project_root_folder = "${projectDir}/../../../.."
+    def dest_assets_folder = "${projectDir}/assets"
+
     // delete previous files first
-    delete "${buildDir}/intermediates/assets/${variant.dirName}"
+    delete dest_assets_folder
 
-    variant.mergeAssets.doLast {
+    def targetName = variant.name.capitalize()
+    def copyTaskName = "copy${targetName}ResourcesToAssets"
+
+    tasks.register(copyTaskName) {
         copy {
-           from "${buildDir}/../../../../../res"
-           into "${buildDir}/intermediates/assets/${variant.dirName}/res"
+           from project_root_folder + "/res"
+           into dest_assets_folder + "/res"
         }
 
         copy {
-            from "${buildDir}/../../../../../src"
-            into "${buildDir}/intermediates/assets/${variant.dirName}/src"
+            from project_root_folder + "/src"
+            into dest_assets_folder + "/src"
         }
 
         // copy {
-        //     from "${buildDir}/../../../../cocos2d-x/cocos/scripting/lua-bindings/script"
-        //     into  "${buildDir}/intermediates/assets/${variant.dirName}/src/cocos"
+        //     from "${projectDir}/../../../cocos2d-x/cocos/scripting/lua-bindings/script"
+        //     into  dest_assets_folder + "/src/cocos"
         // }
 
         // compile & encrypt the scripts if necessary
@@ -182,37 +197,38 @@ android.applicationVariants.all { variant ->
             // invoke cocos command to compile & encrypt the lua files
             switch (buildType) {
                 case -1:
-                    compileLua("${buildDir}/intermediates/assets/${variant.dirName}/src",
-                               "${buildDir}/intermediates/assets/${variant.dirName}/src",
+                    compileLua(dest_assets_folder + "/src",
+                               dest_assets_folder + "/src",
                                false, false, encryptLua)
                     break
                 case 0:
-                    compileLua("${buildDir}/intermediates/assets/${variant.dirName}/src",
-                               "${buildDir}/intermediates/assets/${variant.dirName}/src",
+                    compileLua(dest_assets_folder + "/src",
+                               dest_assets_folder + "/src",
                                true, false, encryptLua)
                     break
                 case 1:
-                    compileLua("${buildDir}/intermediates/assets/${variant.dirName}/src",
-                               "${buildDir}/intermediates/assets/${variant.dirName}/src/64bit",
+                    compileLua(dest_assets_folder + "/src",
+                               dest_assets_folder + "/src/64bit",
                                true, true, encryptLua)
 
                     // remove the lua files in src dir
-                    delete fileTree("${buildDir}/intermediates/assets/${variant.dirName}/src") {
+                    delete fileTree(dest_assets_folder + "/src") {
                         include '**/*.lua'
                     }
-                    delete "${buildDir}/intermediates/assets/${variant.dirName}/src/cocos"
+                    delete dest_assets_folder + "/src/cocos"
                     break
                 case 2:
-                    compileLua("${buildDir}/intermediates/assets/${variant.dirName}/src",
-                               "${buildDir}/intermediates/assets/${variant.dirName}/src/64bit",
+                    compileLua(dest_assets_folder + "/src",
+                               dest_assets_folder + "/src/64bit",
                                true, true, encryptLua)
-                    compileLua("${buildDir}/intermediates/assets/${variant.dirName}/src",
-                               "${buildDir}/intermediates/assets/${variant.dirName}/src",
+                    compileLua(dest_assets_folder + "/src",
+                               dest_assets_folder + "/src",
                                true, false, encryptLua)
                     break
             }
         }
     }
+    tasks.getByName("pre${targetName}Build").dependsOn copyTaskName
 }
 
 dependencies {

diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.android/app/get_environment.sh b/templates/lua-template-default/frameworks/runtime-src/proj.android/app/get_environment.sh
@@ -1,4 +1,11 @@
 #!/bin/bash
 
-source ~/.bash_profile
-echo $COCOS_CONSOLE_ROOT
+if [ -f $HOME/.bashrc ]; then
+    source $HOME/.bashrc
+fi
+
+if [ -f $HOME/.bash_profile ]; then
+    source $HOME/.bash_profile
+fi
+
+echo $COCOS_CONSOLE_ROOT
diff --git a/...late-default/frameworks/runtime-src/proj.android/gradle/wrapper/gradle-wrapper.properties b/...late-default/frameworks/runtime-src/proj.android/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.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
diff --git a/tests/cpp-empty-test/proj.android/app/build.gradle b/tests/cpp-empty-test/proj.android/app/build.gradle
@@ -31,7 +31,7 @@ android {
         java.srcDir "src"
         res.srcDir "res"
         manifest.srcFile "AndroidManifest.xml"
-        assets.srcDir "../../Resources"
+        assets.srcDir "assets"
     }
 
     externalNativeBuild {
@@ -74,16 +74,19 @@ android {
 }
 
 android.applicationVariants.all { variant ->
-    // delete previous files first
-    delete "${buildDir}/intermediates/assets/${variant.dirName}"
 
-    variant.mergeAssets.doLast {
+    delete "${projectDir}/assets"
+
+    def targetName = variant.name.capitalize()
+    def copyTaskName = "copy${targetName}ResourcesToAssets"
+    tasks.register(copyTaskName) {
         copy {
-            from "${buildDir}/../../../Resources"
-            into "${buildDir}/intermediates/assets/${variant.dirName}"
+            from "${projectDir}/../../Resources"
+            into "${projectDir}/assets"
             exclude "**/*.gz"
         }
     }
+    tasks.getByName("pre${targetName}Build").dependsOn copyTaskName
 }
 
 dependencies {

diff --git a/tests/cpp-empty-test/proj.android/gradle/wrapper/gradle-wrapper.properties b/tests/cpp-empty-test/proj.android/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.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
diff --git a/tests/cpp-tests/proj.android/app/build.gradle b/tests/cpp-tests/proj.android/app/build.gradle
@@ -30,6 +30,7 @@ android {
         java.srcDir "src"
         res.srcDir "res"
         manifest.srcFile "AndroidManifest.xml"
+        assets.srcDir "assets"
     }
 
     externalNativeBuild {
@@ -72,16 +73,18 @@ android {
 }
 
 android.applicationVariants.all { variant ->
-    // delete previous files first
-    delete "${buildDir}/intermediates/assets/${variant.dirName}"
 
-    variant.mergeAssets.doLast {
+    delete "${projectDir}/assets"
+    def targetName = variant.name.capitalize()
+    def copyTaskName = "copy${targetName}ResourcesToAssets"
+    tasks.register(copyTaskName) {
         copy {
-           from "${buildDir}/../../../Resources"
-           into "${buildDir}/intermediates/assets/${variant.dirName}"
-           exclude "**/*.gz"
+            from "${projectDir}/../../Resources"
+            into "${projectDir}/assets"
+            exclude "**/*.gz"
         }
     }
+    tasks.getByName("pre${targetName}Build").dependsOn copyTaskName
 }
 
 dependencies {

diff --git a/tests/cpp-tests/proj.android/gradle/wrapper/gradle-wrapper.properties b/tests/cpp-tests/proj.android/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.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
diff --git a/tests/lua-empty-test/project/proj.android/app/build.gradle b/tests/lua-empty-test/project/proj.android/app/build.gradle
@@ -30,6 +30,7 @@ android {
         java.srcDir "src"
         res.srcDir "res"
         manifest.srcFile "AndroidManifest.xml"
+        assets.srcDir "assets"
     }
 
     externalNativeBuild {
@@ -76,11 +77,19 @@ def getCocosCommandPath() {
         return 'cocos.bat'
     }
     else {
+
+        def env_console_path = System.getenv("COCOS_CONSOLE_ROOT")
+
+        if (env_console_path != null && !env_console_path.trim().isEmpty()) {
+            return new File(env_console_path.trim() + '/cocos').absolutePath
+        }
+
         // on unix like system, can not get environments variables easily
         // so run a shell script to get environment variable sets by cocos2d-x setup.py
         new ByteArrayOutputStream().withStream { os ->
             def result = exec {
-                executable = project.file('get_environment.sh')
+                executable = "/bin/bash"
+                args = [ "-i", project.file('get_environment.sh')]
                 standardOutput = os
             }
             ext.console_path = os.toString().trim()
@@ -122,23 +131,24 @@ def compileLua(srcDir, dstDir, doCompile, is64bit, doEncrypt) {
 }
 
 android.applicationVariants.all { variant ->
-    // delete previous files first
-    delete "${buildDir}/intermediates/assets/${variant.dirName}"
-
-    variant.mergeAssets.doLast {
+    delete "${projectDir}/assets"
+    def targetName = variant.name.capitalize()
+    def copyTaskName = "copy${targetName}ResourcesToAssets"
+
+    tasks.register(copyTaskName) {
         copy {
-           from "${buildDir}/../../../../res"
-           into "${buildDir}/intermediates/assets/${variant.dirName}/res"
+           from "${projectDir}/../../../res"
+           into "${projectDir}/assets/res"
         }
 
         copy {
-            from "${buildDir}/../../../../src"
-            into "${buildDir}/intermediates/assets/${variant.dirName}/src"
+            from "${projectDir}/../../../src"
+            into "${projectDir}/assets/src"
         }
 
         copy {
-            from "${buildDir}/../../../../../../cocos/scripting/lua-bindings/script"
-            into  "${buildDir}/intermediates/assets/${variant.dirName}/src/cocos"
+            from "${projectDir}/../../../../../cocos/scripting/lua-bindings/script"
+            into  "${projectDir}/assets/src/cocos"
         }
 
         // compile & encrypt the scripts if necessary
@@ -182,37 +192,38 @@ android.applicationVariants.all { variant ->
             // invoke cocos command to compile & encrypt the lua files
             switch (buildType) {
                 case -1:
-                    compileLua("${buildDir}/intermediates/assets/${variant.dirName}/src",
-                               "${buildDir}/intermediates/assets/${variant.dirName}/src",
+                    compileLua("${projectDir}/assets/src",
+                               "${projectDir}/assets/src",
                                false, false, encryptLua)
                     break
                 case 0:
-                    compileLua("${buildDir}/intermediates/assets/${variant.dirName}/src",
-                               "${buildDir}/intermediates/assets/${variant.dirName}/src",
+                    compileLua("${projectDir}/assets/src",
+                               "${projectDir}/assets/src",
                                true, false, encryptLua)
                     break
                 case 1:
-                    compileLua("${buildDir}/intermediates/assets/${variant.dirName}/src",
-                               "${buildDir}/intermediates/assets/${variant.dirName}/src/64bit",
+                    compileLua("${projectDir}/assets/src",
+                               "${projectDir}/assets/src/64bit",
                                true, true, encryptLua)
 
                     // remove the lua files in src dir
-                    delete fileTree("${buildDir}/intermediates/assets/${variant.dirName}/src") {
+                    delete fileTree("${projectDir}/assets/src") {
                         include '**/*.lua'
                     }
-                    delete "${buildDir}/intermediates/assets/${variant.dirName}/src/cocos"
+                    delete "${projectDir}/assets/src/cocos"
                     break
                 case 2:
-                    compileLua("${buildDir}/intermediates/assets/${variant.dirName}/src",
-                               "${buildDir}/intermediates/assets/${variant.dirName}/src/64bit",
+                    compileLua("${projectDir}/assets/src",
+                               "${projectDir}/assets/src/64bit",
                                true, true, encryptLua)
-                    compileLua("${buildDir}/intermediates/assets/${variant.dirName}/src",
-                               "${buildDir}/intermediates/assets/${variant.dirName}/src",
+                    compileLua("${projectDir}/assets/src",
+                               "${projectDir}/assets/src",
                                true, false, encryptLua)
                     break
             }
         }
     }
+    tasks.getByName("pre${targetName}Build").dependsOn copyTaskName
 }
 
 dependencies {

diff --git a/tests/lua-empty-test/project/proj.android/app/get_environment.sh b/tests/lua-empty-test/project/proj.android/app/get_environment.sh
@@ -1,4 +1,11 @@
 #!/bin/bash
 
-source ~/.bash_profile
-echo $COCOS_CONSOLE_ROOT
+if [ -f $HOME/.bashrc ]; then
+    source $HOME/.bashrc
+fi
+
+if [ -f $HOME/.bash_profile ]; then
+    source $HOME/.bash_profile
+fi
+
+echo $COCOS_CONSOLE_ROOT