Skip to content

Commit 2b01dfc

Browse files
pcjpcj
committed
grpc compiles here (no runtime)
1 parent 314b4da commit 2b01dfc

File tree

3 files changed

+129
-111
lines changed

3 files changed

+129
-111
lines changed

‎java/BUILD‎

Lines changed: 34 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -20,41 +20,43 @@ proto_language(
2020
"@io_grpc_grpc_stub//jar",
2121
],
2222
grpc_runtime_deps = [
23-
"@io_grpc_grpc_netty//jar",
24-
"@io_grpc_grpc_protobuf_lite//jar",
25-
"@io_netty_netty_buffer//jar",
26-
"@io_netty_netty_codec//jar",
27-
"@io_netty_netty_codec_http2//jar",
28-
"@io_netty_netty_common//jar",
29-
"@io_netty_netty_handler//jar",
30-
"@io_netty_netty_resolver//jar",
31-
"@io_netty_netty_transport//jar",
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",
3233
],
3334
)
3435

35-
proto_language(
36-
name = "grpc-java",
37-
output_to_jar = True,
38-
pb_compile_deps = [
39-
"@com_google_guava_guava//jar",
40-
"@com_google_protobuf_protobuf_java//jar",
41-
"@io_grpc_grpc_core//jar",
42-
"@io_grpc_grpc_protobuf//jar",
43-
"@io_grpc_grpc_stub//jar",
44-
],
45-
pb_plugin = "//third_party/protoc_gen_grpc_java:protoc_gen_grpc_java_bin",
46-
pb_runtime_deps = [
47-
"@io_grpc_grpc_netty//jar",
48-
"@io_grpc_grpc_protobuf_lite//jar",
49-
"@io_netty_netty_buffer//jar",
50-
"@io_netty_netty_codec//jar",
51-
"@io_netty_netty_codec_http2//jar",
52-
"@io_netty_netty_common//jar",
53-
"@io_netty_netty_handler//jar",
54-
"@io_netty_netty_resolver//jar",
55-
"@io_netty_netty_transport//jar",
56-
],
57-
)
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+
# )
5860

5961
java_proto_language_import(
6062
name = "grpc_compiletime_deps",

‎java/rules.bzl‎

Lines changed: 32 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -5,33 +5,38 @@ load("//protobuf:rules.bzl",
55
"proto_repositories")
66

77
def java_proto_repositories(lang_requires = [
8-
"com_google_protobuf_protobuf_java",
9-
"com_google_code_gson_gson",
10-
"com_google_guava_guava",
11-
"junit_junit_4", # TODO: separate test requirements
12-
13-
"protoc_gen_grpc_java_linux_x86_64",
14-
"protoc_gen_grpc_java_macosx",
15-
"com_squareup_okhttp_okhttp",
16-
"com_squareup_okio_okio",
17-
"io_grpc_grpc_auth",
18-
"io_grpc_grpc_core",
19-
"io_grpc_grpc_netty",
20-
"io_grpc_grpc_okhttp",
21-
"io_grpc_grpc_protobuf",
22-
"io_grpc_grpc_protobuf_lite",
23-
"io_grpc_grpc_stub",
24-
"io_netty_netty_buffer",
25-
"io_netty_netty_codec",
26-
"io_netty_netty_codec_http",
27-
"io_netty_netty_codec_http2",
28-
"io_netty_netty_common",
29-
"io_netty_netty_handler",
30-
"io_netty_netty_resolver",
31-
"io_netty_netty_transport",
32-
"com_google_protobuf_protobuf_java_util",
33-
"com_google_auth_google_auth_library_credentials",
34-
"com_google_code_findbugs_jsr305"], **kwargs):
8+
"com_google_protobuf_protobuf_java",
9+
"com_google_protobuf_protobuf_java_util",
10+
"com_google_code_gson_gson",
11+
"com_google_guava_guava",
12+
"junit_junit_4", # TODO: separate test requirements
13+
"com_google_code_findbugs_jsr305",
14+
15+
"protoc_gen_grpc_java_linux_x86_64",
16+
"protoc_gen_grpc_java_macosx",
17+
18+
"io_grpc_grpc_core",
19+
"io_grpc_grpc_context",
20+
"io_grpc_grpc_stub",
21+
"io_grpc_grpc_protobuf",
22+
"io_grpc_grpc_protobuf_lite",
23+
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",
39+
], **kwargs):
3540
proto_repositories(lang_requires = lang_requires, **kwargs)
3641

3742
def nano_proto_repositories(

‎protobuf/internal/repositories.bzl‎

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

201-
"com_google_auth_google_auth_library_credentials": {
202-
"kind": "maven_jar",
203-
"name": "com_google_auth_google_auth_library_credentials",
204-
"artifact": "com.google.auth:google-auth-library-credentials:jar:0.4.0",
205-
"sha1": "171da91494a1391aef13b88bd7302b29edb8d3b3",
206-
},
207-
208-
"com_google_code_gson_gson": {
209-
"kind": "maven_jar",
210-
"name": "com_google_code_gson_gson",
211-
"artifact": "com.google.code.gson:gson:jar:2.3",
212-
"sha1": "5fc52c41ef0239d1093a1eb7c3697036183677ce",
213-
},
214-
215201
"com_google_code_findbugs_jsr305": {
216202
"kind": "maven_jar",
217203
"name": "com_google_code_findbugs_jsr305",
@@ -226,27 +212,73 @@ REPOSITORIES = {
226212
"sha1": "6ce200f6b23222af3d8abb6b6459e6c44f4bb0e9",
227213
},
228214

215+
"io_grpc_grpc_core": {
216+
"kind": "maven_jar",
217+
"name": "io_grpc_grpc_core",
218+
"artifact": "io.grpc:grpc-core:jar:1.0.1",
219+
"sha1": "dce1c939c2c6110ac571d99f8d2a29b19bdad4db",
220+
},
221+
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+
229+
"io_grpc_grpc_protobuf": {
230+
"kind": "maven_jar",
231+
"name": "io_grpc_grpc_protobuf",
232+
"artifact": "io.grpc:grpc-protobuf:jar:1.0.1",
233+
"sha1": "17222b03c64a65eb05de5ab266c920fca8c90fab",
234+
},
235+
229236
"com_google_protobuf_protobuf_java": {
230237
"kind": "maven_jar",
231238
"name": "com_google_protobuf_protobuf_java",
232239
"artifact": "com.google.protobuf:protobuf-java:jar:3.0.0",
233240
"sha1": "6d325aa7c921661d84577c0a93d82da4df9fa4c8",
234241
},
235242

236-
"com_google_protobuf_nano_protobuf_javanano": {
237-
"kind": "maven_jar",
238-
"name": "com_google_protobuf_nano_protobuf_javanano",
239-
"artifact": "com.google.protobuf.nano:protobuf-javanano:jar:3.0.0-alpha-5",
240-
"sha1": "357e60f95cebb87c72151e49ba1f570d899734f8",
241-
},
242-
243243
"com_google_protobuf_protobuf_java_util": {
244244
"kind": "maven_jar",
245245
"name": "com_google_protobuf_protobuf_java_util",
246246
"artifact": "com.google.protobuf:protobuf-java-util:jar:3.0.0",
247247
"sha1": "5c39485775c197fc1938e594dc358bfec1c188a0",
248248
},
249249

250+
"io_grpc_grpc_protobuf_lite": {
251+
"kind": "maven_jar",
252+
"name": "io_grpc_grpc_protobuf_lite",
253+
"artifact": "io.grpc:grpc-protobuf-lite:jar:1.0.1",
254+
"sha1": "b28a07b56ed2e66088221cbaf1228fa4e9669166",
255+
},
256+
257+
"com_google_code_gson_gson": {
258+
"kind": "maven_jar",
259+
"name": "com_google_code_gson_gson",
260+
"artifact": "com.google.code.gson:gson:jar:2.3",
261+
"sha1": "5fc52c41ef0239d1093a1eb7c3697036183677ce",
262+
},
263+
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": {
276+
"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",
280+
},
281+
250282
"com_squareup_okhttp_okhttp": {
251283
"kind": "maven_jar",
252284
"name": "com_squareup_okhttp_okhttp",
@@ -264,57 +296,36 @@ REPOSITORIES = {
264296
"io_grpc_grpc_auth": {
265297
"kind": "maven_jar",
266298
"name": "io_grpc_grpc_auth",
267-
"artifact": "io.grpc:grpc-auth:jar:1.0.0-pre1",
299+
"artifact": "io.grpc:grpc-auth:jar:1.0.1",
268300
"sha1": "f0f297a406c45ecc030e2aca69b81a7ed67c3de7",
269301
},
270302

271-
"io_grpc_grpc_core": {
272-
"kind": "maven_jar",
273-
"name": "io_grpc_grpc_core",
274-
"artifact": "io.grpc:grpc-core:jar:1.0.0-pre1",
275-
"sha1": "6489670c182cb214cdcbbd7e6508b4f3ac831ce5",
276-
},
277-
278303
"io_grpc_grpc_netty": {
279304
"kind": "maven_jar",
280305
"name": "io_grpc_grpc_netty",
281-
"artifact": "io.grpc:grpc-netty:jar:1.0.0-pre1",
282-
"sha1": "53094773926bf863daa8faa3ff1175f3f6909ca8",
306+
"artifact": "io.grpc:grpc-netty:jar:1.0.1",
307+
"sha1": "1e4628b96434fcd6fbe519e7a3dbcc1ec5ac2c14",
283308
},
284309

285310
"io_grpc_grpc_okhttp": {
286311
"kind": "maven_jar",
287312
"name": "io_grpc_grpc_okhttp",
288-
"artifact": "io.grpc:grpc-okhttp:jar:1.0.0-pre1",
313+
"artifact": "io.grpc:grpc-okhttp:jar:1.0.1",
289314
"sha1": "3cd4e41931268eef7c1ce00a2baecba6e53cb1da",
290315
},
291316

292-
"io_grpc_grpc_protobuf": {
293-
"kind": "maven_jar",
294-
"name": "io_grpc_grpc_protobuf",
295-
"artifact": "io.grpc:grpc-protobuf:jar:1.0.0-pre1",
296-
"sha1": "9e5235fbae40a22fe97a4cd55333b18969ef76cb",
297-
},
298-
299-
"io_grpc_grpc_protobuf_lite": {
300-
"kind": "maven_jar",
301-
"name": "io_grpc_grpc_protobuf_lite",
302-
"artifact": "io.grpc:grpc-protobuf-lite:jar:1.0.0-pre1",
303-
"sha1": "8ab07e256e0d9fb3650954f38bc09b5ea258b716",
304-
},
305-
306317
"io_grpc_grpc_protobuf_nano": {
307318
"kind": "maven_jar",
308319
"name": "io_grpc_grpc_protobuf_nano",
309-
"artifact": "io.grpc:grpc-protobuf-nano:jar:1.0.0-pre1",
320+
"artifact": "io.grpc:grpc-protobuf-nano:jar:1.0.1",
310321
"sha1": "c88ce3b66d21eadcdfecb8326ecd976b2aecbe9f",
311322
},
312323

313324
"io_grpc_grpc_stub": {
314325
"kind": "maven_jar",
315326
"name": "io_grpc_grpc_stub",
316-
"artifact": "io.grpc:grpc-stub:jar:1.0.0-pre1",
317-
"sha1": "1fb325fdb52b0e5df3aea3a98b0f75119b2a3701",
327+
"artifact": "io.grpc:grpc-stub:jar:1.0.1",
328+
"sha1": "a875969bf700b0d25dc8b7febe42bfb253ca5b3b",
318329
},
319330

320331
"io_netty_netty_buffer": {
@@ -376,15 +387,15 @@ REPOSITORIES = {
376387
"protoc_gen_grpc_java_linux_x86_64": {
377388
"kind": "http_file",
378389
"name": "protoc_gen_grpc_java_linux_x86_64",
379-
"url": "http://repo1.maven.org/maven2/io/grpc/protoc-gen-grpc-java/1.0.0-pre1/protoc-gen-grpc-java-1.0.0-pre1-linux-x86_64.exe",
390+
"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",
380391
"sha256": "4245b79757ce78a64dbec6f7facf64e1ff74fee411ce5b090c1114e1b5ec46d7",
381392
},
382393

383394
"protoc_gen_grpc_java_macosx": {
384395
"kind": "http_file",
385396
"name": "protoc_gen_grpc_java_macosx",
386-
"url": "http://repo1.maven.org/maven2/io/grpc/protoc-gen-grpc-java/1.0.0-pre1/protoc-gen-grpc-java-1.0.0-pre1-osx-x86_64.exe",
387-
"sha256": "850fd0420cb896dfcd1f7d1edd6b3cb010890f8732f84821af5ef6b5f89e885d",
397+
"url": "http://repo1.maven.org/maven2/io/grpc/protoc-gen-grpc-java/1.0.1/protoc-gen-grpc-java-1.0.1-osx-x86_64.exe",
398+
"sha256": "cb4762ee4bde80fee5a35409474d6f177a2005e76d41590066e09be180af7781",
388399
},
389400

390401
"junit_junit_4": {

0 commit comments

Comments
 (0)