gradle: upgrade plugin to 3.6.0

This is to fix incompatibility with new Gradle 5.6.4:
https://developer.android.com/studio/releases/gradle-plugin#updating-gradle

Signed-off-by: Jakub Sokołowski <jakub@status.im>

android/gradle.properties

@@ -27,7 +27,8 @@ compileSdkVersion=29
 targetSdkVersion=29
 buildToolsVersion=29.0.2
 supportLibVersion=28.0.0
-gradlePluginVersion=3.4.1
+# This should match version from nix/mobile/android/maven-and-npm-deps/maven/default.nix
+gradlePluginVersion=3.6.0
 
 android.useAndroidX=true
 android.enableJetifier=true

nix/mobile/android/maven-and-npm-deps/maven/default.nix

@@ -10,7 +10,9 @@ let
     let
       srcs = import ./maven-sources.nix { };
       system = if stdenv.isDarwin then "osx" else "linux";
-      aapt2NativePkg = "https://dl.google.com/dl/android/maven2/com/android/tools/build/aapt2/3.4.1-5326820/aapt2-3.4.1-5326820-${system}";
+      # Warning: This must be the same as gradlePluginVersion android/gradle.properties
+      version = "3.6.0-6040484";
+      aapt2NativePkg = "https://dl.google.com/dl/android/maven2/com/android/tools/build/aapt2/${version}/aapt2-${version}-${system}";
     in srcs // (if !stdenv.isLinux then { } else {
       # On Linux, we need to patch the interpreter in Java packages that contain native executables to use Nix's interpreter instead
       "${aapt2NativePkg}" = srcs."${aapt2NativePkg}" // {