Merge pull request #1361 from NativeScript/trifonov/gradle-update

Update android gradle to 3.4.0 and gradle to 5.1.1

Author: vtrifonov

gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip

package.json

@@ -10,8 +10,8 @@
     "**/*"
   ],
   "gradle": {
-    "version": "4.10.2",
-    "android": "3.3.2"
+    "version": "5.1.1",
+    "android": "3.4.0"
   },
   "android_ndk_version": "19b"
 }

test-app/app/build.gradle

@@ -509,7 +509,7 @@ afterEvaluate { project ->
             }.artifacts.each {
                 def jar = it.file;
                 if (!jars.contains(jar)) {
-                    jars.push(jar)
+                    jars.add(jar)
                     def destDir = md5(jar.path);
                     def outputDir = new File(Paths.get(extractedDependenciesDir, destDir).normalize().toString())
 
@@ -543,7 +543,7 @@ afterEvaluate { project ->
                             // }
                         }
                     }
-                    allJars.push([file: jar, outputDir: outputDir])
+                    allJars.add([file: jar, outputDir: outputDir])
                 }
             }
         }

test-app/build-tools/android-metadata-generator/build.gradle

@@ -17,7 +17,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.2'
+        classpath 'com.android.tools.build:gradle:3.4.0'
     }
 }
 

test-app/build-tools/static-binding-generator/settings.gradle

@@ -0,0 +1 @@
+// empty file to avoid using settings.gradle file from test-app

test-app/build.gradle

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

test-app/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Thu Sep 27 11:34:03 EEST 2018
+#Tue Apr 30 12:10:15 EEST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip

test-app/runtests.gradle

@@ -28,14 +28,14 @@ def getBuildArguments = { ->
     if (isWinOs) {
         arguments += ["cmd", "/c", "gradlew"]
     } else {
-        arguments.push("./gradlew")
+        arguments.add("./gradlew")
     }
-    arguments.push(":app:installDebug")
+    arguments.add(":app:installDebug")
     if (onlyX86) {
-        arguments.push("-PonlyX86")
+        arguments.add("-PonlyX86")
     }
     if (useCCache) {
-        arguments.push("-PuseCCache")
+        arguments.add("-PuseCCache")
     }
     return arguments
 }

test-app/runtime/build.gradle

@@ -54,15 +54,15 @@ android {
         externalNativeBuild {
             cmake {
                 if (optimized) {
-                    arguments.push("-DOPTIMIZED_BUILD=true")
+                    arguments.add("-DOPTIMIZED_BUILD=true")
                 }
 
                 if (optimizedWithInspector) {
-                    arguments.push("-DOPTIMIZED_WITH_INSPECTOR_BUILD=true")
+                    arguments.add("-DOPTIMIZED_WITH_INSPECTOR_BUILD=true")
                 }
 
                 if (useCCache) {
-                    arguments.push("-DUSE_CCACHE=true")
+                    arguments.add("-DUSE_CCACHE=true")
                 }
 
                 //https://developer.android.com/ndk/guides/cmake.html