Skip to content

Update protobuf to remove zlib dependency #242

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 29, 2019
Merged

Update protobuf to remove zlib dependency #242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,13 @@ load(
)

apple_support_dependencies()

load(
"@com_google_protobuf//:protobuf_deps.bzl",
"protobuf_deps",
)

protobuf_deps()
```

The `swift_rules_dependencies` macro creates a toolchain appropriate for your
Expand Down
7 changes: 7 additions & 0 deletions WORKSPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,10 @@ load(
)

apple_support_dependencies()

load(
"@com_google_protobuf//:protobuf_deps.bzl",
"protobuf_deps",
)

protobuf_deps()
25 changes: 4 additions & 21 deletions swift/repositories.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,30 +88,13 @@ def swift_rules_dependencies():
_maybe(
http_archive,
name = "com_google_protobuf",
# v3.7.1, latest as of 2019-04-03
urls = ["https://github.com/protocolbuffers/protobuf/archive/v3.7.1.zip"],
sha256 = "f976a4cd3f1699b6d20c1e944ca1de6754777918320c719742e1674fcf247b7e",
strip_prefix = "protobuf-3.7.1",
# v3.8.0, latest as of 2019-05-28
urls = ["https://github.com/protocolbuffers/protobuf/archive/v3.8.0.zip"],
sha256 = "1e622ce4b84b88b6d2cdf1db38d1a634fe2392d74f0b7b74ff98f3a51838ee53",
strip_prefix = "protobuf-3.8.0",
type = "zip",
)

# TODO(https://github.com/protocolbuffers/protobuf/issues/5918):
# Remove this when protobuf releases protobuf_deps.bzl and instruct users to call
# `protobuf_deps()` instead.
if not native.existing_rule("net_zlib"):
http_archive(
name = "net_zlib",
build_file = "@com_google_protobuf//examples:third_party/zlib.BUILD",
sha256 = "c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1",
strip_prefix = "zlib-1.2.11",
urls = ["https://zlib.net/zlib-1.2.11.tar.gz"],
)

native.bind(
name = "zlib",
actual = "@net_zlib//:zlib",
)

_maybe(
swift_autoconfiguration,
name = "build_bazel_rules_swift_local_config",
Expand Down
2 changes: 1 addition & 1 deletion third_party/com_github_grpc_grpc_swift/BUILD.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ cc_library(
tags = ["swift_module=CgRPC"],
deps = [
":BoringSSL",
"//external:zlib",
"@zlib//:zlib",
],
)

Expand Down