From 9d747bbbcd3aa0762a17e954d4ec48d0f65baa7e Mon Sep 17 00:00:00 2001
From: Kun Zhang <zhangkun@google.com>
Date: Thu, 18 Aug 2016 13:06:18 -0700
Subject: [PATCH] build: upgrade to protobuf-gradle-plugin 0.8.0

---
 README.md                                    | 2 +-
 android-interop-testing/build.gradle         | 2 +-
 build.gradle                                 | 2 +-
 examples/android/helloworld/app/build.gradle | 5 -----
 examples/android/helloworld/build.gradle     | 2 +-
 examples/android/routeguide/app/build.gradle | 5 -----
 examples/android/routeguide/build.gradle     | 2 +-
 examples/build.gradle                        | 2 +-
 8 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/README.md b/README.md
index 318a299f45..ee2a466cfd 100644
--- a/README.md
+++ b/README.md
@@ -119,7 +119,7 @@ buildscript {
   dependencies {
     // ASSUMES GRADLE 2.12 OR HIGHER. Use plugin version 0.7.5 with earlier
     // gradle versions
-    classpath 'com.google.protobuf:protobuf-gradle-plugin:0.7.7'
+    classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.0'
   }
 }
 
diff --git a/android-interop-testing/build.gradle b/android-interop-testing/build.gradle
index 4d0bcfc8c3..182b55e914 100644
--- a/android-interop-testing/build.gradle
+++ b/android-interop-testing/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:1.5.0'
-        classpath "com.google.protobuf:protobuf-gradle-plugin:0.7.7"
+        classpath "com.google.protobuf:protobuf-gradle-plugin:0.8.0"
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/build.gradle b/build.gradle
index 89f4f74f90..58be5c9398 100644
--- a/build.gradle
+++ b/build.gradle
@@ -154,7 +154,7 @@ subprojects {
                 // swap to ${protobufVersion} after versions align again
                 protobuf_lite: "com.google.protobuf:protobuf-lite:3.0.1",
                 protobuf_nano: "com.google.protobuf.nano:protobuf-javanano:${protobufNanoVersion}",
-                protobuf_plugin: 'com.google.protobuf:protobuf-gradle-plugin:0.7.7',
+                protobuf_plugin: 'com.google.protobuf:protobuf-gradle-plugin:0.8.0',
                 protobuf_util: "com.google.protobuf:protobuf-java-util:${protobufVersion}",
 
                 netty: 'io.netty:netty-codec-http2:[4.1.4.Final]',
diff --git a/examples/android/helloworld/app/build.gradle b/examples/android/helloworld/app/build.gradle
index 43a0fd5cd6..8a413428f7 100644
--- a/examples/android/helloworld/app/build.gradle
+++ b/examples/android/helloworld/app/build.gradle
@@ -39,11 +39,6 @@ protobuf {
     }
     generateProtoTasks {
         all().each { task ->
-            task.builtins {
-                // Javanano is installed by default, but needs to be removed to use protobuf lite..
-                remove javanano
-            }
-
             task.plugins {
                 javalite {}
                 grpc {
diff --git a/examples/android/helloworld/build.gradle b/examples/android/helloworld/build.gradle
index 493f43970b..fb848656bc 100644
--- a/examples/android/helloworld/build.gradle
+++ b/examples/android/helloworld/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:1.5.0'
-        classpath "com.google.protobuf:protobuf-gradle-plugin:0.7.7"
+        classpath "com.google.protobuf:protobuf-gradle-plugin:0.8.0"
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/examples/android/routeguide/app/build.gradle b/examples/android/routeguide/app/build.gradle
index 364cc7db72..77a8c79343 100644
--- a/examples/android/routeguide/app/build.gradle
+++ b/examples/android/routeguide/app/build.gradle
@@ -37,11 +37,6 @@ protobuf {
     }
     generateProtoTasks {
         all().each { task ->
-            task.builtins {
-                // Javanano is installed by default, but needs to be removed to use protobuf lite..
-                remove javanano
-            }
-
             task.plugins {
                 javalite {}
                 grpc {
diff --git a/examples/android/routeguide/build.gradle b/examples/android/routeguide/build.gradle
index 187d26b0eb..1489334776 100644
--- a/examples/android/routeguide/build.gradle
+++ b/examples/android/routeguide/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:2.1.2'
-        classpath "com.google.protobuf:protobuf-gradle-plugin:0.7.7"
+        classpath "com.google.protobuf:protobuf-gradle-plugin:0.8.0"
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/examples/build.gradle b/examples/build.gradle
index e8add04e63..30d76d0ac4 100644
--- a/examples/build.gradle
+++ b/examples/build.gradle
@@ -8,7 +8,7 @@ buildscript {
   dependencies {
     // ASSUMES GRADLE 2.12 OR HIGHER. Use plugin version 0.7.5 with earlier
     // gradle versions
-    classpath 'com.google.protobuf:protobuf-gradle-plugin:0.7.7'
+    classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.0'
   }
 }