build: upgrade to protobuf-gradle-plugin 0.8.0

qingfeng0820 · Aug 18, 2016 · 9d747bb · 9d747bb
1 parent 9ef13a4
commit 9d747bb
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 16 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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'
   }
 }