Skip to content
This repository was archived by the owner on Oct 3, 2023. It is now read-only.

Commit 5d4f91a

Browse files
authored
Upgrade bazel and dependencies to latest. (#211)
1 parent 97b4403 commit 5d4f91a

File tree

2 files changed

+13
-31
lines changed

2 files changed

+13
-31
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ install:
1414
- case "$BUILD" in
1515
"BAZEL")
1616
export BAZEL_OS="linux" ;
17-
export BAZEL_VERSION="0.26.0" ;
17+
export BAZEL_VERSION="0.28.1" ;
1818
wget "https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/bazel-${BAZEL_VERSION}-installer-${BAZEL_OS}-x86_64.sh" ;
1919
chmod +x bazel-${BAZEL_VERSION}-installer-${BAZEL_OS}-x86_64.sh ;
2020
./bazel-${BAZEL_VERSION}-installer-${BAZEL_OS}-x86_64.sh --user ;

src/WORKSPACE

Lines changed: 12 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -17,46 +17,28 @@ workspace(name = "opencensus_proto")
1717
load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
1818
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
1919

20-
# Import gRPC git repo so that we can load java_grpc_library build.
20+
# Import grpc_java for java_grpc_library().
2121
git_repository(
2222
name = "grpc_java",
2323
remote = "https://github.com/grpc/grpc-java.git",
24-
tag = "v1.10.1",
24+
tag = "v1.22.1",
2525
)
2626

2727
load("@grpc_java//:repositories.bzl", "grpc_java_repositories")
2828

29-
grpc_java_repositories(
30-
# Omit to avoid conflicts.
31-
omit_com_google_protobuf=True,
32-
omit_com_google_protobuf_nano_protobuf_javanano=True,
33-
)
29+
grpc_java_repositories()
3430

35-
# proto_library rules implicitly depend on @com_google_protobuf//:protoc,
36-
# which is the proto-compiler.
37-
# This statement defines the @com_google_protobuf repo.
31+
# Import grpc for cc_grpc_library().
3832
http_archive(
39-
name = "com_google_protobuf",
40-
sha256 = "73fdad358857e120fd0fa19e071a96e15c0f23bb25f85d3f7009abfd4f264a2a",
41-
strip_prefix = "protobuf-3.6.1.3",
42-
urls = ["https://github.com/google/protobuf/archive/v3.6.1.3.tar.gz"],
33+
name = "com_github_grpc_grpc",
34+
sha256 = "54130a7fa3dae57ed148f24cddcc91ff56e8023ed3d1e44cff4e1a922406087d",
35+
strip_prefix = "grpc-809e7c951358a80182d7126b255c3a40881fb3fa",
36+
urls = ["https://github.com/grpc/grpc/archive/809e7c951358a80182d7126b255c3a40881fb3fa.zip"],
4337
)
4438

45-
http_archive(
46-
name = "com_google_protobuf_cc",
47-
sha256 = "73fdad358857e120fd0fa19e071a96e15c0f23bb25f85d3f7009abfd4f264a2a",
48-
strip_prefix = "protobuf-3.6.1.3",
49-
urls = ["https://github.com/google/protobuf/archive/v3.6.1.3.tar.gz"],
50-
)
39+
load("@com_github_grpc_grpc//bazel:grpc_deps.bzl", "grpc_deps")
5140

52-
# java_proto_library rules implicitly depend on @com_google_protobuf_java//:java_toolchain,
53-
# which is the Java proto runtime (base classes and common utilities).
54-
http_archive(
55-
name = "com_google_protobuf_java",
56-
sha256 = "73fdad358857e120fd0fa19e071a96e15c0f23bb25f85d3f7009abfd4f264a2a",
57-
strip_prefix = "protobuf-3.6.1.3",
58-
urls = ["https://github.com/google/protobuf/archive/v3.6.1.3.tar.gz"],
59-
)
41+
grpc_deps()
6042

6143
# go rules related
6244
git_repository(
@@ -69,10 +51,10 @@ git_repository(
6951
# see https://github.com/bazelbuild/rules_go/blob/release-0.12/go/private/repositories.bzl#L75
7052
# for the included golang protobuf version and
7153
# see https://github.com/golang/protobuf/pull/544 for "paths=source_relative" usage
72-
tag = "0.15.8",
54+
tag = "0.19.1",
7355
)
7456

75-
load("@io_bazel_rules_go//go:def.bzl", "go_rules_dependencies", "go_register_toolchains")
57+
load("@io_bazel_rules_go//go:deps.bzl", "go_rules_dependencies", "go_register_toolchains")
7658
go_rules_dependencies()
7759
go_register_toolchains()
7860

0 commit comments

Comments
 (0)