mirror of https://github.com/grpc/grpc-java.git
parent
d1411b205c
commit
b009e92156
|
|
@ -118,7 +118,7 @@ subprojects {
|
||||||
libraries = [
|
libraries = [
|
||||||
android_annotations: "com.google.android:annotations:4.1.1.4",
|
android_annotations: "com.google.android:annotations:4.1.1.4",
|
||||||
animalsniffer_annotations: "org.codehaus.mojo:animal-sniffer-annotations:1.17",
|
animalsniffer_annotations: "org.codehaus.mojo:animal-sniffer-annotations:1.17",
|
||||||
errorprone: "com.google.errorprone:error_prone_annotations:2.3.2",
|
errorprone: "com.google.errorprone:error_prone_annotations:2.3.3",
|
||||||
gson: "com.google.code.gson:gson:2.8.5",
|
gson: "com.google.code.gson:gson:2.8.5",
|
||||||
guava: "com.google.guava:guava:${guavaVersion}",
|
guava: "com.google.guava:guava:${guavaVersion}",
|
||||||
hpack: 'com.twitter:hpack:0.10.1',
|
hpack: 'com.twitter:hpack:0.10.1',
|
||||||
|
|
@ -134,7 +134,7 @@ subprojects {
|
||||||
opencensus_impl: "io.opencensus:opencensus-impl:${opencensusVersion}",
|
opencensus_impl: "io.opencensus:opencensus-impl:${opencensusVersion}",
|
||||||
opencensus_impl_lite: "io.opencensus:opencensus-impl-lite:${opencensusVersion}",
|
opencensus_impl_lite: "io.opencensus:opencensus-impl-lite:${opencensusVersion}",
|
||||||
instrumentation_api: 'com.google.instrumentation:instrumentation-api:0.4.3',
|
instrumentation_api: 'com.google.instrumentation:instrumentation-api:0.4.3',
|
||||||
perfmark: 'io.perfmark:perfmark-api:0.17.0',
|
perfmark: 'io.perfmark:perfmark-api:0.19.0',
|
||||||
pgv: 'io.envoyproxy.protoc-gen-validate:pgv-java-stub:0.2.0',
|
pgv: 'io.envoyproxy.protoc-gen-validate:pgv-java-stub:0.2.0',
|
||||||
protobuf: "com.google.protobuf:protobuf-java:${protobufVersion}",
|
protobuf: "com.google.protobuf:protobuf-java:${protobufVersion}",
|
||||||
protobuf_lite: "com.google.protobuf:protobuf-lite:3.0.1",
|
protobuf_lite: "com.google.protobuf:protobuf-lite:3.0.1",
|
||||||
|
|
|
||||||
|
|
@ -62,6 +62,11 @@
|
||||||
<artifactId>protobuf-java-util</artifactId>
|
<artifactId>protobuf-java-util</artifactId>
|
||||||
<version>${protobuf.version}</version>
|
<version>${protobuf.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>com.google.errorprone</groupId>
|
||||||
|
<artifactId>error_prone_annotations</artifactId>
|
||||||
|
<version>2.3.3</version> <!-- prefer to use 2.3.3 or later -->
|
||||||
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>junit</groupId>
|
<groupId>junit</groupId>
|
||||||
<artifactId>junit</artifactId>
|
<artifactId>junit</artifactId>
|
||||||
|
|
|
||||||
|
|
@ -18,6 +18,8 @@ dependencies {
|
||||||
compile (libraries.protobuf_util) {
|
compile (libraries.protobuf_util) {
|
||||||
// prefer 26.0-android from libraries instead of 20.0
|
// prefer 26.0-android from libraries instead of 20.0
|
||||||
exclude group: 'com.google.guava', module: 'guava'
|
exclude group: 'com.google.guava', module: 'guava'
|
||||||
|
// prefer 2.3.3 from libraries instead of 2.3.2
|
||||||
|
exclude group: 'com.google.errorprone', module: 'error_prone_annotations'
|
||||||
}
|
}
|
||||||
compileOnly libraries.javax_annotation
|
compileOnly libraries.javax_annotation
|
||||||
testCompile libraries.truth,
|
testCompile libraries.truth,
|
||||||
|
|
|
||||||
|
|
@ -436,9 +436,9 @@ def io_opencensus_grpc_metrics():
|
||||||
def io_perfmark():
|
def io_perfmark():
|
||||||
jvm_maven_import_external(
|
jvm_maven_import_external(
|
||||||
name = "io_perfmark_perfmark_api",
|
name = "io_perfmark_perfmark_api",
|
||||||
artifact = "io.perfmark:perfmark-api:0.17.0",
|
artifact = "io.perfmark:perfmark-api:0.19.0",
|
||||||
server_urls = ["http://central.maven.org/maven2"],
|
server_urls = ["http://central.maven.org/maven2"],
|
||||||
artifact_sha256 = "816c11409b8a0c6c9ce1cda14bed526e7b4da0e772da67c5b7b88eefd41520f9",
|
artifact_sha256 = "b734ba2149712409a44eabdb799f64768578fee0defe1418bb108fe32ea43e1a",
|
||||||
licenses = ["notice"], # Apache 2.0
|
licenses = ["notice"], # Apache 2.0
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -25,6 +25,8 @@ dependencies {
|
||||||
compile (libraries.protobuf_util) {
|
compile (libraries.protobuf_util) {
|
||||||
// prefer 26.0-android from libraries instead of 20.0
|
// prefer 26.0-android from libraries instead of 20.0
|
||||||
exclude group: 'com.google.guava', module: 'guava'
|
exclude group: 'com.google.guava', module: 'guava'
|
||||||
|
// prefer 2.3.3 from libraries instead of 2.3.2
|
||||||
|
exclude group: 'com.google.errorprone', module: 'error_prone_annotations'
|
||||||
}
|
}
|
||||||
|
|
||||||
compileOnly libraries.javax_annotation
|
compileOnly libraries.javax_annotation
|
||||||
|
|
|
||||||
|
|
@ -32,6 +32,8 @@ dependencies {
|
||||||
compile (libraries.protobuf_util) {
|
compile (libraries.protobuf_util) {
|
||||||
// prefer 26.0-android from libraries instead of 20.0
|
// prefer 26.0-android from libraries instead of 20.0
|
||||||
exclude group: 'com.google.guava', module: 'guava'
|
exclude group: 'com.google.guava', module: 'guava'
|
||||||
|
// prefer 2.3.3 from libraries instead of 2.3.2
|
||||||
|
exclude group: 'com.google.errorprone', module: 'error_prone_annotations'
|
||||||
}
|
}
|
||||||
|
|
||||||
testCompile project(':grpc-core').sourceSets.test.output
|
testCompile project(':grpc-core').sourceSets.test.output
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue