From 00f6d30e081c6a81ad0fb2aeb437f3840a73f39c Mon Sep 17 00:00:00 2001
From: Andrew Grieve <agrieve@chromium.org>
Date: Tue, 16 Sep 2014 13:00:27 -0400
Subject: [PATCH] CB-7512 Change gradle android plugins from 0.10 -> 0.12

---
 bin/templates/cordova/lib/build.js   | 2 +-
 bin/templates/project/build.gradle   | 4 ++--
 bin/templates/project/cordova.gradle | 2 +-
 framework/build.gradle               | 7 ++++++-
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/bin/templates/cordova/lib/build.js b/bin/templates/cordova/lib/build.js
index df2448c0..585b7af6 100644
--- a/bin/templates/cordova/lib/build.js
+++ b/bin/templates/cordova/lib/build.js
@@ -236,7 +236,7 @@ var builders = {
         // Find the recently-generated output APK files
         // Gradle can generate multiple output files; return all of them.
         getOutputFiles: function(build_type) {
-            var binDir = path.join(ROOT, 'build', 'apk');
+            var binDir = path.join(ROOT, 'build', 'outputs', 'apk');
             var candidates = find_files(binDir, function(candidate) {
                 // Need to choose between release and debug .apk.
                 if (build_type === 'debug') {
diff --git a/bin/templates/project/build.gradle b/bin/templates/project/build.gradle
index e3468d85..e76634f6 100644
--- a/bin/templates/project/build.gradle
+++ b/bin/templates/project/build.gradle
@@ -29,7 +29,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.10.+'
+        classpath 'com.android.tools.build:gradle:0.12.0+'
     }
 }
 
@@ -109,7 +109,7 @@ def getProjectList() {
     def matcher = pattern.matcher(manifestFile.getText())
     def projects = []
     while (matcher.find()) {
-      projects.add(":" + matcher.group(2).replace("/",":"))
+        projects.add(":" + matcher.group(2).replace("/",":"))
     }
     return projects
 }
diff --git a/bin/templates/project/cordova.gradle b/bin/templates/project/cordova.gradle
index 6c7d0ab3..ba73c93e 100644
--- a/bin/templates/project/cordova.gradle
+++ b/bin/templates/project/cordova.gradle
@@ -116,5 +116,5 @@ String getAndroidSdkDir() {
 }
 
 cordovaSdkVersion =  getProjectTarget("android-19")
-cordovaBuildToolsVersion = latestBuildToolsAvailable("19.0.0")
+cordovaBuildToolsVersion = latestBuildToolsAvailable("19.1.0")
 
diff --git a/framework/build.gradle b/framework/build.gradle
index 59e1ae75..6ca284d3 100644
--- a/framework/build.gradle
+++ b/framework/build.gradle
@@ -25,7 +25,12 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.10.+'
+        // This should be updated with each cordova-android release.
+        // It can affect things like where the .apk is generated.
+        // It also dictates what the minimum android build-tools version
+        // that you need (Set in bin/templates/project/cordova.gradle).
+        // Be sure to also update the value in bin/templates/project.
+        classpath 'com.android.tools.build:gradle:0.12.+'
     }
 }