commit cb8728e40a71286d3bf6e571631a26be5f39548f
author Max Nash <maxwelln@google.com> Fri Jun 19 11:21:06 2015 -0700
committer Trevor Johns <trevorjohns@google.com> Wed Jul 01 22:56:12 2015 +0000
tree e2605d6b44ada198257fe9ae17db79fb74df5d4d
parent 3ec609a48ae275393f578b0da0d6ec69885e874a

Bumping the sample gradle build tools to 1.2.0

This fixes some build flakiness: see
http://stackoverflow.com/questions/29026024/errorexecution-failed-for-task-projectnamemergedebugresources-crunching

Change-Id: I92fd6dc7abfcdca4106c54b001c8e5f232bfb446
Tested: Built all samples.
(cherry picked from commit cfd648e7aae892c2e0d65923f105041f3362529b)

templates/Wear/Wearable/build.gradle.ftl

diff --git a/templates/Wear/Wearable/build.gradle.ftl b/templates/Wear/Wearable/build.gradle.ftl
index bee7408..f0cd928 100644
--- a/templates/Wear/Wearable/build.gradle.ftl
+++ b/templates/Wear/Wearable/build.gradle.ftl
@@ -19,7 +19,7 @@
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.1.0'
+        classpath 'com.android.tools.build:gradle:1.2.0'
     }
 }
 

templates/WearPlusShared/Shared/build.gradle.ftl

diff --git a/templates/WearPlusShared/Shared/build.gradle.ftl b/templates/WearPlusShared/Shared/build.gradle.ftl
index 7e9a3aa..235be3d 100644
--- a/templates/WearPlusShared/Shared/build.gradle.ftl
+++ b/templates/WearPlusShared/Shared/build.gradle.ftl
@@ -19,7 +19,7 @@
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.1.0'
+        classpath 'com.android.tools.build:gradle:1.2.0'
     }
 }
 

templates/WearPlusShared/Wearable/build.gradle.ftl

diff --git a/templates/WearPlusShared/Wearable/build.gradle.ftl b/templates/WearPlusShared/Wearable/build.gradle.ftl
index 68bdf64..6c04aa9 100644
--- a/templates/WearPlusShared/Wearable/build.gradle.ftl
+++ b/templates/WearPlusShared/Wearable/build.gradle.ftl
@@ -19,7 +19,7 @@
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.1.0'
+        classpath 'com.android.tools.build:gradle:1.2.0'
     }
 }
 

templates/WearPlusShared/_MODULE_/build.gradle.ftl

diff --git a/templates/WearPlusShared/_MODULE_/build.gradle.ftl b/templates/WearPlusShared/_MODULE_/build.gradle.ftl
index 1254113..fa9e81e 100644
--- a/templates/WearPlusShared/_MODULE_/build.gradle.ftl
+++ b/templates/WearPlusShared/_MODULE_/build.gradle.ftl
@@ -19,7 +19,7 @@
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.1.0'
+        classpath 'com.android.tools.build:gradle:1.2.0'
     }
 }
 

templates/base-application/_MODULE_/build.gradle.ftl

diff --git a/templates/base-application/_MODULE_/build.gradle.ftl b/templates/base-application/_MODULE_/build.gradle.ftl
index 9f98c82..7dc30cd 100644
--- a/templates/base-application/_MODULE_/build.gradle.ftl
+++ b/templates/base-application/_MODULE_/build.gradle.ftl
@@ -19,7 +19,7 @@
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.1.0'
+        classpath 'com.android.tools.build:gradle:1.2.0'
     }
 }
 

templates/base/_MODULE_/build.gradle.ftl

diff --git a/templates/base/_MODULE_/build.gradle.ftl b/templates/base/_MODULE_/build.gradle.ftl
index 6488647..6440990 100644
--- a/templates/base/_MODULE_/build.gradle.ftl
+++ b/templates/base/_MODULE_/build.gradle.ftl
@@ -19,7 +19,7 @@
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.1.0'
+        classpath 'com.android.tools.build:gradle:1.2.0'
     }
 }
 

templates/create/_MODULE_/build.gradle.ftl

diff --git a/templates/create/_MODULE_/build.gradle.ftl b/templates/create/_MODULE_/build.gradle.ftl
index 6884324..0d38d43 100644
--- a/templates/create/_MODULE_/build.gradle.ftl
+++ b/templates/create/_MODULE_/build.gradle.ftl
@@ -25,7 +25,7 @@
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.1.0'
+        classpath 'com.android.tools.build:gradle:1.2.0'
     }
 }