diff --git a/WORKSPACE b/WORKSPACE index 7fc01acd..b05f83a8 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -4,10 +4,10 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") http_archive( name = "io_bazel_rules_closure", - sha256 = "1f8d2e169bb292ef2adbe563bd66d5b8d4b462b6b869a67647e771ecef4b5030", - strip_prefix = "rules_closure-a176ec89a1b251bb5442ba569d47cee3c053e633", + sha256 = "fecda06179906857ac79af6500124bf03fe1630fd1b3d4dcf6c65346b9c0725d", + strip_prefix = "rules_closure-03110588392d8c6c05b99c08a6f1c2121604ca27", urls = [ - "https://github.com/bazelbuild/rules_closure/archive/a176ec89a1b251bb5442ba569d47cee3c053e633.zip", + "https://github.com/bazelbuild/rules_closure/archive/03110588392d8c6c05b99c08a6f1c2121604ca27.zip", ], ) diff --git a/bazel/closure_grpc_web_library.bzl b/bazel/closure_grpc_web_library.bzl index 4a261143..c9646448 100644 --- a/bazel/closure_grpc_web_library.bzl +++ b/bazel/closure_grpc_web_library.bzl @@ -41,7 +41,7 @@ def _proto_include_path(proto): return path def _proto_include_paths(protos): - return depset([_proto_include_path(proto) for proto in protos]) + return [_proto_include_path(proto) for proto in protos] def _generate_closure_grpc_web_src_progress_message(name): # TODO(yannic): Add a better message? @@ -55,7 +55,7 @@ def _generate_closure_grpc_web_srcs( mode, sources, transitive_sources): - all_sources = [src for src in sources] + [src for src in transitive_sources] + all_sources = [src for src in sources] + [src for src in transitive_sources.to_list()] proto_include_paths = [ "-I%s" % p for p in _proto_include_paths( diff --git a/scripts/kokoro.sh b/scripts/kokoro.sh index 1a33f00d..96b3061f 100755 --- a/scripts/kokoro.sh +++ b/scripts/kokoro.sh @@ -45,7 +45,7 @@ done docker-compose -f advanced.yml build # Run all bazel unit tests -BAZEL_VERSION=0.23.1 +BAZEL_VERSION=0.27.1 wget https://github.com/bazelbuild/bazel/releases/download/"${BAZEL_VERSION}"/bazel-"${BAZEL_VERSION}"-installer-linux-x86_64.sh chmod +x ./bazel-"${BAZEL_VERSION}"-installer-linux-x86_64.sh ./bazel-"${BAZEL_VERSION}"-installer-linux-x86_64.sh --user