mirror of https://github.com/grpc/grpc-java.git
build: upgrade to protobuf-gradle-plugin 0.8.0
This commit is contained in:
parent
9ef13a4725
commit
9d747bbbcd
|
@ -119,7 +119,7 @@ buildscript {
|
||||||
dependencies {
|
dependencies {
|
||||||
// ASSUMES GRADLE 2.12 OR HIGHER. Use plugin version 0.7.5 with earlier
|
// ASSUMES GRADLE 2.12 OR HIGHER. Use plugin version 0.7.5 with earlier
|
||||||
// gradle versions
|
// gradle versions
|
||||||
classpath 'com.google.protobuf:protobuf-gradle-plugin:0.7.7'
|
classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.0'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -6,7 +6,7 @@ buildscript {
|
||||||
}
|
}
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath 'com.android.tools.build:gradle:1.5.0'
|
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
|
// NOTE: Do not place your application dependencies here; they belong
|
||||||
// in the individual module build.gradle files
|
// in the individual module build.gradle files
|
||||||
|
|
|
@ -154,7 +154,7 @@ subprojects {
|
||||||
// swap to ${protobufVersion} after versions align again
|
// swap to ${protobufVersion} after versions align again
|
||||||
protobuf_lite: "com.google.protobuf:protobuf-lite:3.0.1",
|
protobuf_lite: "com.google.protobuf:protobuf-lite:3.0.1",
|
||||||
protobuf_nano: "com.google.protobuf.nano:protobuf-javanano:${protobufNanoVersion}",
|
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}",
|
protobuf_util: "com.google.protobuf:protobuf-java-util:${protobufVersion}",
|
||||||
|
|
||||||
netty: 'io.netty:netty-codec-http2:[4.1.4.Final]',
|
netty: 'io.netty:netty-codec-http2:[4.1.4.Final]',
|
||||||
|
|
|
@ -39,11 +39,6 @@ protobuf {
|
||||||
}
|
}
|
||||||
generateProtoTasks {
|
generateProtoTasks {
|
||||||
all().each { task ->
|
all().each { task ->
|
||||||
task.builtins {
|
|
||||||
// Javanano is installed by default, but needs to be removed to use protobuf lite..
|
|
||||||
remove javanano
|
|
||||||
}
|
|
||||||
|
|
||||||
task.plugins {
|
task.plugins {
|
||||||
javalite {}
|
javalite {}
|
||||||
grpc {
|
grpc {
|
||||||
|
|
|
@ -6,7 +6,7 @@ buildscript {
|
||||||
}
|
}
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath 'com.android.tools.build:gradle:1.5.0'
|
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
|
// NOTE: Do not place your application dependencies here; they belong
|
||||||
// in the individual module build.gradle files
|
// in the individual module build.gradle files
|
||||||
|
|
|
@ -37,11 +37,6 @@ protobuf {
|
||||||
}
|
}
|
||||||
generateProtoTasks {
|
generateProtoTasks {
|
||||||
all().each { task ->
|
all().each { task ->
|
||||||
task.builtins {
|
|
||||||
// Javanano is installed by default, but needs to be removed to use protobuf lite..
|
|
||||||
remove javanano
|
|
||||||
}
|
|
||||||
|
|
||||||
task.plugins {
|
task.plugins {
|
||||||
javalite {}
|
javalite {}
|
||||||
grpc {
|
grpc {
|
||||||
|
|
|
@ -6,7 +6,7 @@ buildscript {
|
||||||
}
|
}
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath 'com.android.tools.build:gradle:2.1.2'
|
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
|
// NOTE: Do not place your application dependencies here; they belong
|
||||||
// in the individual module build.gradle files
|
// in the individual module build.gradle files
|
||||||
|
|
|
@ -8,7 +8,7 @@ buildscript {
|
||||||
dependencies {
|
dependencies {
|
||||||
// ASSUMES GRADLE 2.12 OR HIGHER. Use plugin version 0.7.5 with earlier
|
// ASSUMES GRADLE 2.12 OR HIGHER. Use plugin version 0.7.5 with earlier
|
||||||
// gradle versions
|
// gradle versions
|
||||||
classpath 'com.google.protobuf:protobuf-gradle-plugin:0.7.7'
|
classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.0'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue