Merge pull request #1612 from rigor789/master

build(deps): upgrade gradle and android plugin to latest stable

Author: Nathanael Anderson

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
+#Tue May 12 20:24:09 CEST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.4-all.zip

package.json

@@ -10,8 +10,8 @@
     "**/*"
   ],
   "gradle": {
-    "version": "5.4.1",
-    "android": "3.5.3"
+    "version": "6.4",
+    "android": "3.6.3"
   },
   "android_ndk_version": "21b"
 }

test-app/app/build.gradle

@@ -781,6 +781,9 @@ task buildMetadata(type: BuildToolTask) {
 
     outputs.files("$METADATA_OUT_PATH/treeNodeStream.dat", "$METADATA_OUT_PATH/treeStringsStream.dat", "$METADATA_OUT_PATH/treeValueStream.dat")
 
+    workingDir "$BUILD_TOOLS_PATH"
+    main "-jar"
+
     doFirst {
         // get compiled classes to pass to metadata generator
         // these need to be called after the classes have compiled
@@ -815,9 +818,6 @@ task buildMetadata(type: BuildToolTask) {
             generatedClasses.each { out.println it }
         }
 
-        workingDir "$BUILD_TOOLS_PATH"
-        main "-jar"
-
         setOutputs outLogger
 
         def paramz = new ArrayList<String>()
@@ -843,13 +843,12 @@ task generateTypescriptDefinitions(type: BuildToolTask) {
     def paramz = new ArrayList<String>()
     def includeDirs = ["com.android.support", "/platforms/" + android.compileSdkVersion]
 
+    workingDir "$BUILD_TOOLS_PATH"
+    main "-jar"
+
     doFirst {
         delete "$TYPINGS_PATH"
 
-        workingDir "$BUILD_TOOLS_PATH"
-
-        main "-jar"
-
         paramz.add("dts-generator.jar")
         paramz.add("-input")
 

test-app/build.gradle

@@ -19,7 +19,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.3'
+        classpath 'com.android.tools.build:gradle:3.6.3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
     }
 }

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

@@ -1,6 +1,6 @@
-#Mon Aug 26 10:52:45 EEST 2019
+#Tue May 12 21:42:57 CEST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.4-all.zip