diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index d757f3d33..80ff78bad 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/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
diff --git a/package.json b/package.json
index 445c413c5..dec18456c 100644
--- a/package.json
+++ b/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": "21"
 }
diff --git a/test-app/app/build.gradle b/test-app/app/build.gradle
index f6531ebb2..6d61d85db 100644
--- a/test-app/app/build.gradle
+++ b/test-app/app/build.gradle
@@ -778,6 +778,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
@@ -812,9 +815,6 @@ task buildMetadata(type: BuildToolTask) {
             generatedClasses.each { out.println it }
         }
 
-        workingDir "$BUILD_TOOLS_PATH"
-        main "-jar"
-
         setOutputs outLogger
 
         def paramz = new ArrayList<String>()
@@ -840,13 +840,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")
 
diff --git a/test-app/build.gradle b/test-app/build.gradle
index ef989912a..f3248ffff 100644
--- a/test-app/build.gradle
+++ b/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"
     }
 }
diff --git a/test-app/gradle/wrapper/gradle-wrapper.properties b/test-app/gradle/wrapper/gradle-wrapper.properties
index ad462fc1d..31e9eaa61 100644
--- a/test-app/gradle/wrapper/gradle-wrapper.properties
+++ b/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