From ebd2f2d2f73dc51c47b3434c13fd366559c4fd9a Mon Sep 17 00:00:00 2001
From: Eric Anderson <ejona@google.com>
Date: Thu, 6 Apr 2017 10:51:03 -0700
Subject: [PATCH] android: Bump android build plugin version to 2.3.1

This cleans up some deprecation warnings from Gradle and cuts full build
time in half.
---
 android-interop-testing/app/build.gradle     | 2 +-
 android-interop-testing/build.gradle         | 2 +-
 examples/android/helloworld/app/build.gradle | 2 +-
 examples/android/helloworld/build.gradle     | 2 +-
 examples/android/routeguide/app/build.gradle | 2 +-
 examples/android/routeguide/build.gradle     | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/android-interop-testing/app/build.gradle b/android-interop-testing/app/build.gradle
index ea96c0587a..7e4e1e10c6 100644
--- a/android-interop-testing/app/build.gradle
+++ b/android-interop-testing/app/build.gradle
@@ -3,7 +3,7 @@ apply plugin: 'com.google.protobuf'
 
 android {
     compileSdkVersion 22
-    buildToolsVersion '22.0.1'
+    buildToolsVersion '25.0.2'
 
     defaultConfig {
         applicationId "io.grpc.android.integrationtest"
diff --git a/android-interop-testing/build.gradle b/android-interop-testing/build.gradle
index 6aa55c2e0b..1f9628fb58 100644
--- a/android-interop-testing/build.gradle
+++ b/android-interop-testing/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.0'
+        classpath 'com.android.tools.build:gradle:2.3.1'
         classpath "com.google.protobuf:protobuf-gradle-plugin:0.8.0"
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/examples/android/helloworld/app/build.gradle b/examples/android/helloworld/app/build.gradle
index 898bed124d..2f6da698c3 100644
--- a/examples/android/helloworld/app/build.gradle
+++ b/examples/android/helloworld/app/build.gradle
@@ -3,7 +3,7 @@ apply plugin: 'com.google.protobuf'
 
 android {
     compileSdkVersion 22
-    buildToolsVersion "22.0.1"
+    buildToolsVersion "25.0.2"
 
     defaultConfig {
         applicationId "io.grpc.android.helloworldexample"
diff --git a/examples/android/helloworld/build.gradle b/examples/android/helloworld/build.gradle
index d5cf08626b..e649ff1639 100644
--- a/examples/android/helloworld/build.gradle
+++ b/examples/android/helloworld/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.0'
+        classpath 'com.android.tools.build:gradle:2.3.1'
         classpath "com.google.protobuf:protobuf-gradle-plugin:0.8.0"
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/examples/android/routeguide/app/build.gradle b/examples/android/routeguide/app/build.gradle
index eadac70177..b369d07868 100644
--- a/examples/android/routeguide/app/build.gradle
+++ b/examples/android/routeguide/app/build.gradle
@@ -3,7 +3,7 @@ apply plugin: 'com.google.protobuf'
 
 android {
     compileSdkVersion 23
-    buildToolsVersion "24.0.0"
+    buildToolsVersion "25.0.2"
 
     defaultConfig {
     applicationId "io.grpc.routeguideexample"
diff --git a/examples/android/routeguide/build.gradle b/examples/android/routeguide/build.gradle
index a29e50ef8c..569d26b08d 100644
--- a/examples/android/routeguide/build.gradle
+++ b/examples/android/routeguide/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.0'
+        classpath 'com.android.tools.build:gradle:2.3.1'
         classpath "com.google.protobuf:protobuf-gradle-plugin:0.8.0"
 
         // NOTE: Do not place your application dependencies here; they belong