Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
F
fuchsia.googlesource.com-third_party-tink
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
fuchsia-mirror
fuchsia.googlesource.com-third_party-tink
Commits
4592f7b5
Commit
4592f7b5
authored
5 years ago
by
przydatek
Committed by
Copybara-Service
5 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Bumping up versions of Protobufs and gRPC.
Cleaning up WORKSPACE. PiperOrigin-RevId: 271114848
parent
f4a6abbe
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
WORKSPACE
+18
-68
18 additions, 68 deletions
WORKSPACE
cmake/TinkWorkspace.cmake
+2
-2
2 additions, 2 deletions
cmake/TinkWorkspace.cmake
with
20 additions
and
70 deletions
WORKSPACE
+
18
−
68
View file @
4592f7b5
...
@@ -71,17 +71,6 @@ http_archive(
...
@@ -71,17 +71,6 @@ http_archive(
)
)
# Needed by gRPC.
http_archive
(
name
=
"
github_nanopb
"
,
urls
=
[
"
https://github.com/nanopb/nanopb/archive/f8ac463766281625ad710900479130c7fcb4d63b.tar.gz
"
,
],
sha256
=
"
8bbbb1e78d4ddb0a1919276924ab10d11b631df48b657d960e0c795a25515735
"
,
strip_prefix
=
"
nanopb-f8ac463766281625ad710900479130c7fcb4d63b
"
,
build_file
=
"
//:third_party/nanopb.BUILD.bazel
"
,
)
# Needed by googleapis.
# Needed by googleapis.
http_archive
(
http_archive
(
name
=
"
com_google_api_codegen
"
,
name
=
"
com_google_api_codegen
"
,
...
@@ -99,65 +88,21 @@ http_archive(
...
@@ -99,65 +88,21 @@ http_archive(
strip_prefix
=
"
googleapis-43a324913190da118e1c3c1a89ef6cfc47c5caf3
"
,
strip_prefix
=
"
googleapis-43a324913190da118e1c3c1a89ef6cfc47c5caf3
"
,
)
)
# Needed by gRPC.
# gRPC.
http_archive
(
name
=
"
com_github_cares_cares
"
,
build_file
=
"
@com_github_grpc_grpc//third_party:cares/cares.BUILD
"
,
url
=
"
https://github.com/c-ares/c-ares/archive/cares-1_15_0.zip
"
,
sha256
=
"
ac95874559aade58b30308f11480359926637a993b8ac585e90fd1bf6c082bc5
"
,
strip_prefix
=
"
c-ares-cares-1_15_0
"
,
)
# Actual gRPC.
http_archive
(
http_archive
(
name
=
"
com_github_grpc_grpc
"
,
name
=
"
com_github_grpc_grpc
"
,
urls
=
[
urls
=
[
"
https://github.com/grpc/grpc/archive/v1.2
1.3
.tar.gz
"
"
https://github.com/grpc/grpc/archive/v1.2
2.1
.tar.gz
"
],
],
sha256
=
"
50747c8939c535b1059f19534de263eb9b7570b5347390fb24b0bbce8763e9a4
"
,
sha256
=
"
cce1d4585dd017980d4a407d8c5e9f8fc8c1dbb03f249b99e88a387ebb45a035
"
,
strip_prefix
=
"
grpc-1.21.3
"
,
strip_prefix
=
"
grpc-1.22.1
"
,
)
# Binds needed by gRPC.
bind
(
name
=
"
libssl
"
,
actual
=
"
@boringssl//:ssl
"
,
)
bind
(
name
=
"
zlib
"
,
actual
=
"
@zlib//:zlib
"
,
)
)
bind
(
# Load grpc_deps.
name
=
"
nanopb
"
,
# This is a workaround around the missing support for recursive WORKSPACE
actual
=
"
@github_nanopb//:nanopb
"
,
# file loading (https://github.com/bazelbuild/bazel/issues/1943).
)
load
(
"
@com_github_grpc_grpc//bazel:grpc_deps.bzl
"
,
"
grpc_deps
"
)
grpc_deps
()
bind
(
name
=
"
protobuf
"
,
actual
=
"
@com_google_protobuf//:protobuf
"
,
)
bind
(
name
=
"
protobuf_headers
"
,
actual
=
"
@com_google_protobuf//:protobuf_headers
"
,
)
bind
(
name
=
"
protobuf_clib
"
,
actual
=
"
@com_google_protobuf//:protoc_lib
"
,
)
bind
(
name
=
"
protocol_compiler
"
,
actual
=
"
@com_google_protobuf//:protoc
"
,
)
bind
(
name
=
"
cares
"
,
actual
=
"
@com_github_cares_cares//:ares
"
,
)
http_archive
(
http_archive
(
name
=
"
curl
"
,
name
=
"
curl
"
,
...
@@ -188,11 +133,17 @@ http_archive(
...
@@ -188,11 +133,17 @@ http_archive(
# This statement defines the @com_google_protobuf repo.
# This statement defines the @com_google_protobuf repo.
http_archive
(
http_archive
(
name
=
"
com_google_protobuf
"
,
name
=
"
com_google_protobuf
"
,
strip_prefix
=
"
protobuf-3.
8.0
"
,
strip_prefix
=
"
protobuf-3.
9.1
"
,
urls
=
[
"
https://github.com/google/protobuf/archive/v3.
8.0
.zip
"
],
urls
=
[
"
https://github.com/google/protobuf/archive/v3.
9.1
.zip
"
],
sha256
=
"
1e622ce4b84b88b6d2cdf1db38d1a634fe2392d74f0b7b74ff98f3a51838ee53
"
,
sha256
=
"
c90d9e13564c0af85fd2912545ee47b57deded6e5a97de80395b6d2d9be64854
"
,
)
)
# Load protobuf_deps.
# This is a workaround around the missing support for recursive WORKSPACE
# file loading (https://github.com/bazelbuild/bazel/issues/1943).
load
(
"
@com_google_protobuf//:protobuf_deps.bzl
"
,
"
protobuf_deps
"
)
protobuf_deps
()
# java_lite_proto_library rules implicitly depend on
# java_lite_proto_library rules implicitly depend on
# @com_google_protobuf_javalite//:javalite_toolchain, which is the JavaLite proto
# @com_google_protobuf_javalite//:javalite_toolchain, which is the JavaLite proto
# runtime (base classes and common utilities).
# runtime (base classes and common utilities).
...
@@ -203,7 +154,6 @@ http_archive(
...
@@ -203,7 +154,6 @@ http_archive(
sha256
=
"
79d102c61e2a479a0b7e5fc167bcfaa4832a0c6aad4a75fa7da0480564931bcc
"
,
sha256
=
"
79d102c61e2a479a0b7e5fc167bcfaa4832a0c6aad4a75fa7da0480564931bcc
"
,
)
)
# Needed by gRPC, to build pb.h/pb.cc files from protos that contain services.
# Needed by gRPC, to build pb.h/pb.cc files from protos that contain services.
http_archive
(
http_archive
(
name
=
"
build_stack_rules_proto
"
,
name
=
"
build_stack_rules_proto
"
,
...
...
This diff is collapsed.
Click to expand it.
cmake/TinkWorkspace.cmake
+
2
−
2
View file @
4592f7b5
...
@@ -88,7 +88,7 @@ set(protobuf_BUILD_EXAMPLES OFF CACHE BOOL "Tink dependency override" FORCE)
...
@@ -88,7 +88,7 @@ set(protobuf_BUILD_EXAMPLES OFF CACHE BOOL "Tink dependency override" FORCE)
http_archive
(
http_archive
(
NAME com_google_protobuf
NAME com_google_protobuf
URL https://github.com/google/protobuf/archive/v3.
7.0
.zip
URL https://github.com/google/protobuf/archive/v3.
9.1
.zip
SHA256
b50be32ea806bdb948c22595ba0742c75dc2f8799865def414cf27ea5706f2b7
SHA256
c90d9e13564c0af85fd2912545ee47b57deded6e5a97de80395b6d2d9be64854
CMAKE_SUBDIR cmake
CMAKE_SUBDIR cmake
)
)
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment