Skip to content

Commit e54049e

Browse files
pcjpcj
committed
Upgrade grpc-java to v1.0.1.
1 parent 2b01dfc commit e54049e

File tree

4 files changed

+116
-116
lines changed

4 files changed

+116
-116
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ of this project are to:
4646
| [Go](go) | [go_proto_compile](go#go_proto_compile) | [go_proto_library](go#go_proto_library) | [v1.0.0](https://github.com/grpc/grpc-go/releases/tag/v1.0.0) |
4747
| [Go (gogo)](gogo) | [gogo_proto_compile](gogo#gogo_proto_compile) | [gogo_proto_library](gogo#gogo_proto_library) | [v1.0.0](https://github.com/grpc/grpc-go/releases/tag/v1.0.0) |
4848
| [gRPC gateway](grpc_gateway) | [grpc_gateway_proto_compile](grpc_gateway#grpc_gateway_proto_compile)<br/>[grpc_gateway_swagger_compile](grpc_gateway#grpc_gateway_swagger_compile) | [grpc_gateway_proto_library](grpc_gateway#grpc_gateway_proto_library)<br/>[grpc_gateway_binary](grpc_gateway#grpc_gateway_binary) | [v1.0.0](https://github.com/grpc/grpc-go/releases/tag/v1.0.0) |
49-
| [Java](java) | [java_proto_compile](java#java_proto_compile) | [java_proto_library](java#java_proto_library) | [1.0.0-pre1](https://github.com/grpc/grpc-java/releases/tag/v1.0.0-pre1) |
49+
| [Java](java) | [java_proto_compile](java#java_proto_compile) | [java_proto_library](java#java_proto_library) | [v1.0.1](https://github.com/grpc/grpc-java/releases/tag/v1.0.1) |
5050
| [Node](node) | [node_proto_compile](js#node_proto_compile) | | <sup>4</sup> |
5151
| [Objective-C](objc) | [objc_proto_compile](objc#objc_proto_compile) | [objc_proto_library](objc#objc_proto_library) <sup>5</sup> | <sup>4</sup> |
5252
| [Python](python) | [py_proto_compile](python#py_proto_compile) | | <sup>4</sup> |

‎java/BUILD‎

Lines changed: 12 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -18,46 +18,23 @@ proto_language(
1818
"@io_grpc_grpc_core//jar",
1919
"@io_grpc_grpc_protobuf//jar",
2020
"@io_grpc_grpc_stub//jar",
21+
"@io_grpc_grpc_auth//jar",
22+
"@com_google_auth_google_auth_library_credentials//jar",
2123
],
2224
grpc_runtime_deps = [
23-
# "@io_grpc_grpc_context//jar",
24-
# "@io_grpc_grpc_netty//jar",
25-
# "@io_grpc_grpc_protobuf_lite//jar",
26-
# "@io_netty_netty_buffer//jar",
27-
# "@io_netty_netty_codec//jar",
28-
# "@io_netty_netty_codec_http2//jar",
29-
# "@io_netty_netty_common//jar",
30-
# "@io_netty_netty_handler//jar",
31-
# "@io_netty_netty_resolver//jar",
32-
# "@io_netty_netty_transport//jar",
25+
"@io_grpc_grpc_netty//jar",
26+
"@io_grpc_grpc_context//jar",
27+
"@io_netty_netty_buffer//jar",
28+
"@io_netty_netty_codec//jar",
29+
"@io_netty_netty_codec_http2//jar",
30+
"@io_netty_netty_common//jar",
31+
"@io_netty_netty_handler//jar",
32+
"@io_netty_netty_resolver//jar",
33+
"@io_netty_netty_transport//jar",
34+
"@io_grpc_grpc_protobuf_lite//jar",
3335
],
3436
)
3537

36-
# proto_language(
37-
# name = "grpc-java",
38-
# output_to_jar = True,
39-
# pb_compile_deps = [
40-
# "@com_google_guava_guava//jar",
41-
# "@com_google_protobuf_protobuf_java//jar",
42-
# "@io_grpc_grpc_core//jar",
43-
# "@io_grpc_grpc_protobuf//jar",
44-
# "@io_grpc_grpc_stub//jar",
45-
# ],
46-
# pb_plugin = "//third_party/protoc_gen_grpc_java:protoc_gen_grpc_java_bin",
47-
# pb_runtime_deps = [
48-
# "@io_grpc_grpc_context//jar",
49-
# "@io_grpc_grpc_netty//jar",
50-
# "@io_grpc_grpc_protobuf_lite//jar",
51-
# "@io_netty_netty_buffer//jar",
52-
# "@io_netty_netty_codec//jar",
53-
# "@io_netty_netty_codec_http2//jar",
54-
# "@io_netty_netty_common//jar",
55-
# "@io_netty_netty_handler//jar",
56-
# "@io_netty_netty_resolver//jar",
57-
# "@io_netty_netty_transport//jar",
58-
# ],
59-
# )
60-
6138
java_proto_language_import(
6239
name = "grpc_compiletime_deps",
6340
langs = [":java"],

‎java/rules.bzl‎

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -21,24 +21,26 @@ def java_proto_repositories(lang_requires = [
2121
"io_grpc_grpc_protobuf",
2222
"io_grpc_grpc_protobuf_lite",
2323

24-
# "com_squareup_okhttp_okhttp",
25-
# "com_squareup_okio_okio",
26-
# "io_grpc_grpc_auth",
27-
# "io_grpc_grpc_netty",
28-
# "io_grpc_grpc_okhttp",
29-
# "io_grpc_grpc_protobuf_lite",
30-
# "io_netty_netty_buffer",
31-
# "io_netty_netty_codec",
32-
# "io_netty_netty_codec_http",
33-
# "io_netty_netty_codec_http2",
34-
# "io_netty_netty_common",
35-
# "io_netty_netty_handler",
36-
# "io_netty_netty_resolver",
37-
# "io_netty_netty_transport",
38-
# "com_google_auth_google_auth_library_credentials",
24+
"io_grpc_grpc_netty",
25+
"io_netty_netty_buffer",
26+
"io_netty_netty_codec",
27+
"io_netty_netty_codec_http",
28+
"io_netty_netty_codec_http2",
29+
"io_netty_netty_common",
30+
"io_netty_netty_handler",
31+
"io_netty_netty_resolver",
32+
"io_netty_netty_transport",
33+
34+
"com_google_auth_google_auth_library_credentials",
35+
"io_grpc_grpc_auth",
36+
37+
"com_squareup_okhttp_okhttp",
38+
"com_squareup_okio_okio",
39+
"io_grpc_grpc_okhttp",
3940
], **kwargs):
4041
proto_repositories(lang_requires = lang_requires, **kwargs)
4142

43+
4244
def nano_proto_repositories(
4345
lang_requires = [
4446
"com_google_protobuf_nano_protobuf_javanano",

‎protobuf/internal/repositories.bzl‎

Lines changed: 86 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,10 @@ REPOSITORIES = {
198198
# JAVA
199199
# ****************************************************************
200200

201+
# ######################
202+
# Compile Dependencies #
203+
# ######################
204+
201205
"com_google_code_findbugs_jsr305": {
202206
"kind": "maven_jar",
203207
"name": "com_google_code_findbugs_jsr305",
@@ -219,13 +223,6 @@ REPOSITORIES = {
219223
"sha1": "dce1c939c2c6110ac571d99f8d2a29b19bdad4db",
220224
},
221225

222-
"io_grpc_grpc_context": {
223-
"kind": "maven_jar",
224-
"name": "io_grpc_grpc_context",
225-
"artifact": "io.grpc:grpc-context:jar:1.0.1",
226-
"sha1": "9d308f2b616044ddd380866b4e6c23b5b4020963",
227-
},
228-
229226
"io_grpc_grpc_protobuf": {
230227
"kind": "maven_jar",
231228
"name": "io_grpc_grpc_protobuf",
@@ -261,43 +258,29 @@ REPOSITORIES = {
261258
"sha1": "5fc52c41ef0239d1093a1eb7c3697036183677ce",
262259
},
263260

264-
265-
266-
267-
268-
"com_google_auth_google_auth_library_credentials": {
269-
"kind": "maven_jar",
270-
"name": "com_google_auth_google_auth_library_credentials",
271-
"artifact": "com.google.auth:google-auth-library-credentials:jar:0.4.0",
272-
"sha1": "171da91494a1391aef13b88bd7302b29edb8d3b3",
273-
},
274-
275-
"com_google_protobuf_nano_protobuf_javanano": {
261+
"io_grpc_grpc_stub": {
276262
"kind": "maven_jar",
277-
"name": "com_google_protobuf_nano_protobuf_javanano",
278-
"artifact": "com.google.protobuf.nano:protobuf-javanano:jar:3.0.0-alpha-5",
279-
"sha1": "357e60f95cebb87c72151e49ba1f570d899734f8",
263+
"name": "io_grpc_grpc_stub",
264+
"artifact": "io.grpc:grpc-stub:jar:1.0.1",
265+
"sha1": "a875969bf700b0d25dc8b7febe42bfb253ca5b3b",
280266
},
281267

282-
"com_squareup_okhttp_okhttp": {
268+
"junit_junit_4": {
283269
"kind": "maven_jar",
284-
"name": "com_squareup_okhttp_okhttp",
285-
"artifact": "com.squareup.okhttp:okhttp:jar:2.5.0",
286-
"sha1": "4de2b4ed3445c37ec1720a7d214712e845a24636",
270+
"name": "junit_junit_4",
271+
"artifact": "junit:junit:jar:4.12",
272+
"sha1": "2973d150c0dc1fefe998f834810d68f278ea58ec",
287273
},
288274

289-
"com_squareup_okio_okio": {
290-
"kind": "maven_jar",
291-
"name": "com_squareup_okio_okio",
292-
"artifact": "com.squareup.okio:okio:jar:1.6.0",
293-
"sha1": "98476622f10715998eacf9240d6b479f12c66143",
294-
},
275+
# ######################
276+
# Runtime Dependencies #
277+
# ######################
295278

296-
"io_grpc_grpc_auth": {
279+
"io_grpc_grpc_context": {
297280
"kind": "maven_jar",
298-
"name": "io_grpc_grpc_auth",
299-
"artifact": "io.grpc:grpc-auth:jar:1.0.1",
300-
"sha1": "f0f297a406c45ecc030e2aca69b81a7ed67c3de7",
281+
"name": "io_grpc_grpc_context",
282+
"artifact": "io.grpc:grpc-context:jar:1.0.1",
283+
"sha1": "9d308f2b616044ddd380866b4e6c23b5b4020963",
301284
},
302285

303286
"io_grpc_grpc_netty": {
@@ -307,27 +290,6 @@ REPOSITORIES = {
307290
"sha1": "1e4628b96434fcd6fbe519e7a3dbcc1ec5ac2c14",
308291
},
309292

310-
"io_grpc_grpc_okhttp": {
311-
"kind": "maven_jar",
312-
"name": "io_grpc_grpc_okhttp",
313-
"artifact": "io.grpc:grpc-okhttp:jar:1.0.1",
314-
"sha1": "3cd4e41931268eef7c1ce00a2baecba6e53cb1da",
315-
},
316-
317-
"io_grpc_grpc_protobuf_nano": {
318-
"kind": "maven_jar",
319-
"name": "io_grpc_grpc_protobuf_nano",
320-
"artifact": "io.grpc:grpc-protobuf-nano:jar:1.0.1",
321-
"sha1": "c88ce3b66d21eadcdfecb8326ecd976b2aecbe9f",
322-
},
323-
324-
"io_grpc_grpc_stub": {
325-
"kind": "maven_jar",
326-
"name": "io_grpc_grpc_stub",
327-
"artifact": "io.grpc:grpc-stub:jar:1.0.1",
328-
"sha1": "a875969bf700b0d25dc8b7febe42bfb253ca5b3b",
329-
},
330-
331293
"io_netty_netty_buffer": {
332294
"kind": "maven_jar",
333295
"name": "io_netty_netty_buffer",
@@ -384,11 +346,77 @@ REPOSITORIES = {
384346
"sha1": "2f17fe8c5c3b3f90908ed2d0649631a11beb3904",
385347
},
386348

349+
# ###################
350+
# Nano Dependencies #
351+
# ###################
352+
# Todo: drop these in favor of lite?
353+
354+
"com_google_protobuf_nano_protobuf_javanano": {
355+
"kind": "maven_jar",
356+
"name": "com_google_protobuf_nano_protobuf_javanano",
357+
"artifact": "com.google.protobuf.nano:protobuf-javanano:jar:3.0.0-alpha-5",
358+
"sha1": "357e60f95cebb87c72151e49ba1f570d899734f8",
359+
},
360+
361+
"io_grpc_grpc_protobuf_nano": {
362+
"kind": "maven_jar",
363+
"name": "io_grpc_grpc_protobuf_nano",
364+
"artifact": "io.grpc:grpc-protobuf-nano:jar:1.0.1",
365+
"sha1": "c88ce3b66d21eadcdfecb8326ecd976b2aecbe9f",
366+
},
367+
368+
# ###################
369+
# Auth Dependencies #
370+
# ###################
371+
372+
"com_google_auth_google_auth_library_credentials": {
373+
"kind": "maven_jar",
374+
"name": "com_google_auth_google_auth_library_credentials",
375+
"artifact": "com.google.auth:google-auth-library-credentials:jar:0.4.0",
376+
"sha1": "171da91494a1391aef13b88bd7302b29edb8d3b3",
377+
},
378+
379+
"io_grpc_grpc_auth": {
380+
"kind": "maven_jar",
381+
"name": "io_grpc_grpc_auth",
382+
"artifact": "io.grpc:grpc-auth:jar:1.0.1",
383+
"sha1": "5e1d053277e113ed7b7c71b5c1cbc32a8b4d3a83",
384+
},
385+
386+
# ######################
387+
# Auth? Dependencies #
388+
# ######################
389+
390+
"io_grpc_grpc_okhttp": {
391+
"kind": "maven_jar",
392+
"name": "io_grpc_grpc_okhttp",
393+
"artifact": "io.grpc:grpc-okhttp:jar:1.0.1",
394+
"sha1": "3cd4e41931268eef7c1ce00a2baecba6e53cb1da",
395+
},
396+
397+
"com_squareup_okhttp_okhttp": {
398+
"kind": "maven_jar",
399+
"name": "com_squareup_okhttp_okhttp",
400+
"artifact": "com.squareup.okhttp:okhttp:jar:2.5.0",
401+
"sha1": "4de2b4ed3445c37ec1720a7d214712e845a24636",
402+
},
403+
404+
"com_squareup_okio_okio": {
405+
"kind": "maven_jar",
406+
"name": "com_squareup_okio_okio",
407+
"artifact": "com.squareup.okio:okio:jar:1.6.0",
408+
"sha1": "98476622f10715998eacf9240d6b479f12c66143",
409+
},
410+
411+
# ##################################
412+
# Precompiled Plugins Dependencies #
413+
# ##################################
414+
387415
"protoc_gen_grpc_java_linux_x86_64": {
388416
"kind": "http_file",
389417
"name": "protoc_gen_grpc_java_linux_x86_64",
390418
"url": "http://repo1.maven.org/maven2/io/grpc/protoc-gen-grpc-java/1.0.1/protoc-gen-grpc-java-1.0.1-linux-x86_64.exe",
391-
"sha256": "4245b79757ce78a64dbec6f7facf64e1ff74fee411ce5b090c1114e1b5ec46d7",
419+
"sha256": "00497e9da3b8a068470bdf39b43f25084d9662e1419b01c2b3d9c29292fe0303",
392420
},
393421

394422
"protoc_gen_grpc_java_macosx": {
@@ -398,13 +426,6 @@ REPOSITORIES = {
398426
"sha256": "cb4762ee4bde80fee5a35409474d6f177a2005e76d41590066e09be180af7781",
399427
},
400428

401-
"junit_junit_4": {
402-
"kind": "maven_jar",
403-
"name": "junit_junit_4",
404-
"artifact": "junit:junit:jar:4.12",
405-
"sha1": "2973d150c0dc1fefe998f834810d68f278ea58ec",
406-
},
407-
408429
###:end
409430

410431
}

0 commit comments

Comments
 (0)