From 70bc7b39b7658158fe78e5bcd145f1153513e959 Mon Sep 17 00:00:00 2001
From: Joe Bowser <bowserj@apache.org>
Date: Mon, 7 Dec 2015 15:03:02 -0800
Subject: [PATCH] CB-9479: Fixing the conditionals again, we should be more
 vigilant on the gradle versions.

---
 bin/templates/project/build.gradle | 18 ++++--------------
 framework/build.gradle             |  2 +-
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/bin/templates/project/build.gradle b/bin/templates/project/build.gradle
index f9561bb9..f540f693 100644
--- a/bin/templates/project/build.gradle
+++ b/bin/templates/project/build.gradle
@@ -30,20 +30,10 @@ buildscript {
     // installed version of Gradle. This dependency is documented at
     // http://tools.android.com/tech-docs/new-build-system/version-compatibility
     // and https://issues.apache.org/jira/browse/CB-8143
-    if (gradle.gradleVersion >= "2.2") {
-        dependencies {
-            classpath 'com.android.tools.build:gradle:1.0.0+'
-        }
-    } else if (gradle.gradleVersion >= "2.1") {
-        dependencies {
-            classpath 'com.android.tools.build:gradle:0.14.0+'
-        }
-    } else {
-        dependencies {
-            classpath 'com.android.tools.build:gradle:0.12.0+'
-        }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:1.5.0'
     }
-}
+   }
 
 // Allow plugins to declare Maven dependencies via build-extras.gradle.
 repositories {
@@ -51,7 +41,7 @@ repositories {
 }
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '2.2.1'
+    gradleVersion = '2.8'
 }
 
 // Configuration properties. Set these via environment variables, build-extras.gradle, or gradle.properties.
diff --git a/framework/build.gradle b/framework/build.gradle
index e4c182ed..f1c6682d 100644
--- a/framework/build.gradle
+++ b/framework/build.gradle
@@ -24,7 +24,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.0.0+'
+        classpath 'com.android.tools.build:gradle:1.5.0'
     }
 
 }