Skip to content

Commit 34cfd5b

Browse files
authored
Upgrade grpc to 1.24.1 (#20)
## What is the goal of this PR? Update gRPC to a more recent version ## What are the changes implemented in this PR? - Bump `@graknlabs_build_tools` and `@graknlabs_protocol` versions - Upgrade gRPC Maven dependencies to 1.24.1; add `grpc-api` - Update targets to depend on `grpc-api`
1 parent 1f20272 commit 34cfd5b

File tree

9 files changed

+70
-23
lines changed

9 files changed

+70
-23
lines changed

.bazelversion

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
0.29.0

BUILD

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ java_library(
5252
"//dependencies/maven/artifacts/commons-lang:commons-lang", # PREVIOUSLY UNDECLARED
5353
"//dependencies/maven/artifacts/com/google/code/findbugs:jsr305",
5454
"//dependencies/maven/artifacts/io/grpc:grpc-core",
55+
"//dependencies/maven/artifacts/io/grpc:grpc-api",
5556
"//dependencies/maven/artifacts/jline:jline",
5657
"//dependencies/maven/artifacts/org/slf4j:slf4j-api",
5758
],

dependencies/graknlabs/dependencies.bzl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ def graknlabs_build_tools():
2222
git_repository(
2323
name = "graknlabs_build_tools",
2424
remote = "https://github.com/graknlabs/build-tools",
25-
commit = "f17e730b628ff9957cbd31bfa3e1780857ac86c9", # sync-marker: do not remove this comment, this is used for sync-dependencies by @graknlabs_build_tools
25+
commit = "65af6e1cabcf4edbd3e38fce877015cd2b3f349d", # sync-marker: do not remove this comment, this is used for sync-dependencies by @graknlabs_build_tools
2626
)
2727

2828
def graknlabs_common():
@@ -50,7 +50,7 @@ def graknlabs_protocol():
5050
git_repository(
5151
name = "graknlabs_protocol",
5252
remote = "https://github.com/graknlabs/protocol",
53-
tag = "1.0.3", # sync-marker: do not remove this comment, this is used for sync-dependencies by @graknlabs_protocol
53+
commit = "1a0dfaa4f3a60256aeb749679bf135f3a831242f", # sync-marker: do not remove this comment, this is used for sync-dependencies by @graknlabs_protocol
5454
)
5555

5656
def graknlabs_client_java():
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
java_library(
2+
name = "annotations",
3+
exports = [
4+
"//external:jar/com/google/android/annotations"
5+
],
6+
visibility = [
7+
"//dependencies/maven/artifacts:__subpackages__"
8+
]
9+
)
10+
11+

dependencies/maven/artifacts/io/grpc/BUILD

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,22 @@
1+
java_library(
2+
name = "grpc-api",
3+
exports = [
4+
"//external:jar/io/grpc/grpc-api"
5+
],
6+
runtime_deps = [
7+
"//dependencies/maven/artifacts/com/google/code/findbugs:jsr305",
8+
"//dependencies/maven/artifacts/com/google/errorprone:error-prone-annotations",
9+
"//dependencies/maven/artifacts/com/google/guava:guava",
10+
"//dependencies/maven/artifacts/org/codehaus/mojo:animal-sniffer-annotations",
11+
":grpc-context"
12+
],
13+
visibility = [
14+
"//visibility:public"
15+
]
16+
)
17+
18+
19+
120
java_library(
221
name = "grpc-context",
322
exports = [
@@ -16,14 +35,12 @@ java_library(
1635
"//external:jar/io/grpc/grpc-core"
1736
],
1837
runtime_deps = [
19-
"//dependencies/maven/artifacts/com/google/code/findbugs:jsr305",
38+
"//dependencies/maven/artifacts/com/google/android:annotations",
2039
"//dependencies/maven/artifacts/com/google/code/gson:gson",
21-
"//dependencies/maven/artifacts/com/google/errorprone:error-prone-annotations",
22-
"//dependencies/maven/artifacts/com/google/guava:guava",
2340
"//dependencies/maven/artifacts/io/opencensus:opencensus-api",
2441
"//dependencies/maven/artifacts/io/opencensus:opencensus-contrib-grpc-metrics",
25-
"//dependencies/maven/artifacts/org/codehaus/mojo:animal-sniffer-annotations",
26-
":grpc-context"
42+
"//dependencies/maven/artifacts/io/perfmark:perfmark-api",
43+
":grpc-api"
2744
],
2845
visibility = [
2946
"//visibility:public"

dependencies/maven/artifacts/io/opencensus/BUILD

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@ java_library(
33
exports = [
44
"//external:jar/io/opencensus/opencensus-api"
55
],
6-
runtime_deps = [
7-
"//dependencies/maven/artifacts/com/google/errorprone:error-prone-annotations"
8-
],
96
visibility = [
107
"//dependencies/maven/artifacts:__subpackages__"
118
]
@@ -19,7 +16,6 @@ java_library(
1916
"//external:jar/io/opencensus/opencensus-contrib-grpc-metrics"
2017
],
2118
runtime_deps = [
22-
"//dependencies/maven/artifacts/com/google/errorprone:error-prone-annotations",
2319
":opencensus-api"
2420
],
2521
visibility = [
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
java_library(
2+
name = "perfmark-api",
3+
exports = [
4+
"//external:jar/io/perfmark/perfmark-api"
5+
],
6+
runtime_deps = [
7+
"//dependencies/maven/artifacts/com/google/code/findbugs:jsr305",
8+
"//dependencies/maven/artifacts/com/google/errorprone:error-prone-annotations"
9+
],
10+
visibility = [
11+
"//dependencies/maven/artifacts:__subpackages__"
12+
]
13+
)
14+
15+

dependencies/maven/dependencies.bzl

Lines changed: 14 additions & 11 deletions
Large diffs are not rendered by default.

dependencies/maven/dependencies.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,10 @@ dependencies:
6969

7070
io.grpc:
7171
grpc-core:
72-
version: "1.16.0"
72+
version: "1.24.1"
73+
lang: java
74+
grpc-api:
75+
version: "1.24.1"
7376
lang: java
7477

7578
jline:

0 commit comments

Comments
 (0)