Skip to content

Commit

Permalink
bazel: Remove deps that protobuf includes
Browse files Browse the repository at this point in the history
net_zlib is no longer used ("zlib" is used instead). Zlib and skylib are
both included via protobuf_deps(). With the language-specific rules
needing to be imported (e.g., rules_proto, rules_java) we are relying on
protobuf_deps() pretty heavily starting in Protobuf 3.10, so we aren't
losing much to remove these two deps.
  • Loading branch information
ejona86 committed Oct 9, 2019
1 parent 079219b commit 7e8e9d6
Showing 1 changed file with 0 additions and 23 deletions.
23 changes: 0 additions & 23 deletions repositories.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ IO_GRPC_GRPC_JAVA_OVERRIDE_TARGETS = {
}

def grpc_java_repositories(
omit_bazel_skylib = False,
omit_com_google_android_annotations = False,
omit_com_google_api_grpc_google_common_protos = False,
omit_com_google_auth_google_auth_library_credentials = False,
Expand Down Expand Up @@ -73,12 +72,9 @@ def grpc_java_repositories(
omit_io_perfmark = False,
omit_javax_annotation = False,
omit_junit_junit = False,
omit_net_zlib = False,
omit_org_apache_commons_lang3 = False,
omit_org_codehaus_mojo_animal_sniffer_annotations = False):
"""Imports dependencies for grpc-java."""
if not omit_bazel_skylib:
bazel_skylib()
if not omit_com_google_android_annotations:
com_google_android_annotations()
if not omit_com_google_api_grpc_google_common_protos:
Expand Down Expand Up @@ -147,8 +143,6 @@ def grpc_java_repositories(
javax_annotation()
if not omit_junit_junit:
junit_junit()
if not omit_net_zlib:
net_zlib()
if not omit_org_apache_commons_lang3:
org_apache_commons_lang3()
if not omit_org_codehaus_mojo_animal_sniffer_annotations:
Expand All @@ -167,14 +161,6 @@ def grpc_java_repositories(
actual = "@com_google_errorprone_error_prone_annotations//jar",
)

def bazel_skylib():
http_archive(
name = "bazel_skylib",
sha256 = "bce240a0749dfc52fab20dce400b4d5cf7c28b239d64f8fd1762b3c9470121d8",
strip_prefix = "bazel-skylib-0.7.0",
urls = ["https://github.com/bazelbuild/bazel-skylib/archive/0.7.0.zip"],
)

def com_google_android_annotations():
jvm_maven_import_external(
name = "com_google_android_annotations",
Expand Down Expand Up @@ -475,15 +461,6 @@ def junit_junit():
licenses = ["notice"], # EPL 1.0
)

def net_zlib():
http_archive(
name = "net_zlib",
build_file = "@com_google_protobuf//:third_party/zlib.BUILD",
sha256 = "c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1",
strip_prefix = "zlib-1.2.11",
urls = ["https://zlib.net/zlib-1.2.11.tar.gz"],
)

def org_apache_commons_lang3():
jvm_maven_import_external(
name = "org_apache_commons_commons_lang3",
Expand Down

0 comments on commit 7e8e9d6

Please sign in to comment.