From a6f30b6977156df4bb2e3a488178ac05a96f0671 Mon Sep 17 00:00:00 2001
From: Chris Brody <chris.brody@gmail.com>
Date: Sat, 9 Feb 2019 19:35:46 -0500
Subject: [PATCH] Android tools 3.3 & Gradle 4.10.3 update (#642)

Gradle 4.10.1 or higher is needed for Android Studio 3.3.0 ref:
- https://developer.android.com/studio/releases/gradle-plugin#3-3-0

Resolves #634 (Update Gradle classpath for Android Studio 3.3)
Resolves #596 (Support gradle 4.9+)
---
 bin/templates/cordova/lib/builders/ProjectBuilder.js | 2 +-
 bin/templates/project/app/build.gradle               | 4 ++--
 bin/templates/project/build.gradle                   | 2 +-
 framework/build.gradle                               | 2 +-
 test/build.gradle                                    | 2 +-
 test/wrapper.gradle                                  | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/bin/templates/cordova/lib/builders/ProjectBuilder.js b/bin/templates/cordova/lib/builders/ProjectBuilder.js
index c5ad00d3..94e26a0e 100644
--- a/bin/templates/cordova/lib/builders/ProjectBuilder.js
+++ b/bin/templates/cordova/lib/builders/ProjectBuilder.js
@@ -214,7 +214,7 @@ class ProjectBuilder {
                 // If it's not set, do nothing, assuming that we're using a future version of gradle that we don't want to mess with.
                 // For some reason, using ^ and $ don't work.  This does the job, though.
                 var distributionUrlRegex = /distributionUrl.*zip/;
-                var distributionUrl = process.env['CORDOVA_ANDROID_GRADLE_DISTRIBUTION_URL'] || 'https\\://services.gradle.org/distributions/gradle-4.6-all.zip';
+                var distributionUrl = process.env['CORDOVA_ANDROID_GRADLE_DISTRIBUTION_URL'] || 'https\\://services.gradle.org/distributions/gradle-4.10.3-all.zip';
                 var gradleWrapperPropertiesPath = path.join(self.root, 'gradle', 'wrapper', 'gradle-wrapper.properties');
                 shell.chmod('u+w', gradleWrapperPropertiesPath);
                 shell.sed('-i', distributionUrlRegex, 'distributionUrl=' + distributionUrl, gradleWrapperPropertiesPath);
diff --git a/bin/templates/project/app/build.gradle b/bin/templates/project/app/build.gradle
index e4bef9e0..bfad374a 100644
--- a/bin/templates/project/app/build.gradle
+++ b/bin/templates/project/app/build.gradle
@@ -27,7 +27,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.0'
+        classpath 'com.android.tools.build:gradle:3.3.0'
     }
 }
 
@@ -40,7 +40,7 @@ allprojects {
 }
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '4.6.0'
+    gradleVersion = '4.10.3'
 }
 
 // Configuration properties. Set these via environment variables, build-extras.gradle, or gradle.properties.
diff --git a/bin/templates/project/build.gradle b/bin/templates/project/build.gradle
index fb40bb66..bea8a746 100644
--- a/bin/templates/project/build.gradle
+++ b/bin/templates/project/build.gradle
@@ -28,7 +28,7 @@ buildscript {
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
 
-        classpath 'com.android.tools.build:gradle:3.2.0'
+        classpath 'com.android.tools.build:gradle:3.3.0'
     }
 }
 
diff --git a/framework/build.gradle b/framework/build.gradle
index 834617a9..5abb662f 100644
--- a/framework/build.gradle
+++ b/framework/build.gradle
@@ -31,7 +31,7 @@ buildscript {
     dependencies {
         // The gradle plugin and the maven plugin have to be updated after each version of Android
         // studio comes out
-        classpath 'com.android.tools.build:gradle:3.2.0'
+        classpath 'com.android.tools.build:gradle:3.3.0'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
     }
diff --git a/test/build.gradle b/test/build.gradle
index 3687569e..c9bf1e7d 100644
--- a/test/build.gradle
+++ b/test/build.gradle
@@ -28,7 +28,7 @@ buildscript {
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
 
-        classpath 'com.android.tools.build:gradle:3.2.0'
+        classpath 'com.android.tools.build:gradle:3.3.0'
     }
 }
 
diff --git a/test/wrapper.gradle b/test/wrapper.gradle
index 7d2683f8..371d53b6 100644
--- a/test/wrapper.gradle
+++ b/test/wrapper.gradle
@@ -1,3 +1,3 @@
 wrapper {
-    gradleVersion = '4.6'
+    gradleVersion = '4.10.3'
 }