Rename set -> depset for bazel 0.6.0 compatibility (#133)

pcj · web-flow · commit 7ea48a1b1e62 · 2017-09-23T18:19:12.000-06:00
* Rename set -> depset for bazel 0.6.0 compatibility and update deps for same * Suppress implicit nullables in closure_proto_library Fixes #132
diff --git a/WORKSPACE b/WORKSPACE
@@ -24,10 +24,10 @@ go_repositories()
 
 github_archive(
     name = "io_bazel_rules_closure",
-    commit = "a6b65d5c5c9db8968fb8e03115d5e4f6976de8f7",
+    commit = "4af89ef1db659eb41f110df189b67d4cf14073e1",
     org = "bazelbuild",
     repo = "rules_closure",
-    sha256 = "1bccdc7ed05fb74ef18aba39e51c059777cd843dc5d0758303deb9745a93c45e",
+    sha256 = "f73b1b3974e7639183e1646737d446d73a966ff57f853a896e19bcccc40e9b7b",
 )
 
 load("@io_bazel_rules_closure//closure:defs.bzl", "closure_repositories")
@@ -73,10 +73,10 @@ node_repositories()
 
 github_archive(
     name = "io_bazel_rules_python",
-    commit = "d6fbb0fb2a5c8e318dd4de5104dc41358cefaa90",
+    commit = "fa77c9c1118380e066c88b955c90fb3c7353429e",
     org = "bazelbuild",
     repo = "rules_python",
-    sha256 = "43dceb1be46d1c6c1a08d510931982664f1115a399a3bce1a419e63143e5b6c1",
+    sha256 = "7d06126d0d10ea8e63cc7eaf774d9ecebcd9583094ee8e93b0035da659eab5c1",
 )
 
 load("@io_bazel_rules_python//python:pip.bzl", "pip_repositories", "pip_import")
@@ -110,7 +110,13 @@ csharp_proto_repositories()
 
 load("//java:rules.bzl", "java_proto_repositories", "nano_proto_repositories")
 
-java_proto_repositories()
+java_proto_repositories(
+    # Already picking these up from rules_closure
+    excludes = [
+        "com_google_code_findbugs_jsr305",
+        "com_google_errorprone_error_prone_annotations",
+    ],
+)
 #nano_proto_repositories()
 
 load("//go:rules.bzl", "go_proto_repositories")
diff --git a/closure/rules.bzl b/closure/rules.bzl
@@ -50,9 +50,12 @@ def closure_proto_library(
 
   closure_js_library(
     name = name,
-    proto_descriptor_set = name + ".descriptor_set",
+    internal_descriptors = [name + ".descriptor_set"],
     srcs = srcs + [name + ".pb"],
-    deps = list(set(deps + proto_deps + [
+    deps = depset(deps + proto_deps + [
       "@io_bazel_rules_closure//closure/protobuf:jspb",
-    ])),
+    ]).to_list(),
+    suppress = [
+      "JSC_IMPLICITLY_NULLABLE_JSDOC",
+    ],
     **kwargs)
diff --git a/cpp/deps.bzl b/cpp/deps.bzl
@@ -6,9 +6,9 @@ DEPS = {
     # from here into 'com_google_grpc'.
     "com_google_grpc_base": {
         "rule": "http_archive",
-        "url": "https://github.com/grpc/grpc/archive/f5600e99be0fdcada4b3039c0f656a305264884a.zip", # Sep 1, 2017
-        "sha256": "95ee013fdb605f9d4f47b1abcedc119f41d66d94ebc7af665c2866d4167e506e",
-        "strip_prefix": "grpc-f5600e99be0fdcada4b3039c0f656a305264884a",
+        "url": "https://github.com/grpc/grpc/archive/ca87867579580928ca4c9fdf97051fa25bf1d386.zip", # Sep 19, 2017 (PR#12571)
+        "sha256": "d3794ca4ff7b12635bd4972bb9478f1d11e478305490b96469eb3a47e50b1768",
+        "strip_prefix": "grpc-ca87867579580928ca4c9fdf97051fa25bf1d386",
     },
 
     "com_google_grpc": {
diff --git a/cpp/generate_cc.modified.bzl b/cpp/generate_cc.modified.bzl
@@ -92,7 +92,7 @@ def generate_cc_impl(ctx):
       command = " && ".join(cmds),
   )
 
-  return struct(files=set(out_files))
+  return struct(files=depset(out_files))
 
 _generate_cc = rule(
     attrs = {
diff --git a/cpp/rules.bzl b/cpp/rules.bzl
@@ -97,7 +97,7 @@ def cpp_proto_library(
   native.cc_library(
     name = name,
     srcs = srcs + [name + ".pb"],
-    deps = list(set(deps + proto_deps + compile_deps)),
+    deps = depset(deps + proto_deps + compile_deps).to_list(),
     **kwargs)
 
 # Alias for cpp_proto_library
diff --git a/csharp/rules.bzl b/csharp/rules.bzl
@@ -105,6 +105,6 @@ def csharp_proto_library(
   csharp_library(
     name = name,
     srcs = srcs + [name + ".pb"],
-    #deps = list(set(deps + proto_deps + [name + "_imports"])),
-    deps = list(set(deps + proto_deps + compile_deps)),
+    #deps = depset(deps + proto_deps + [name + "_imports"]).to_list(),
+    deps = depset(deps + proto_deps + compile_deps).to_list(),
     **kwargs)
diff --git a/examples/helloworld/closure/BUILD b/examples/helloworld/closure/BUILD
@@ -30,7 +30,6 @@ closure_js_test(
     name = "greeter_test",
     srcs = ["greeter_test.js"],
     compilation_level = "SIMPLE",
-    pedantic = True,
     size = "small",
     deps = [
         ":greeter",
diff --git a/go/rules.bzl b/go/rules.bzl
@@ -107,6 +107,6 @@ def go_proto_library(
   go_library(
     name = name,
     srcs = srcs + [name + ".pb"],
-    deps = list(set(deps + proto_deps + go_proto_deps)),
+    deps = depset(deps + proto_deps + go_proto_deps).to_list(),
     importpath = importpath,
     **kwargs)
diff --git a/gogo/rules.bzl b/gogo/rules.bzl
@@ -182,5 +182,5 @@ def gogo_proto_library(
   go_library(
     name = name,
     srcs = srcs + [name + ".pb"],
-    deps = list(set(deps + proto_deps + go_proto_deps)),
+    deps = depset(deps + proto_deps + go_proto_deps).to_list(),
     **kwargs)
diff --git a/grpc_gateway/rules.bzl b/grpc_gateway/rules.bzl
@@ -127,7 +127,7 @@ def grpc_gateway_proto_library(
   go_library(
     name = name,
     srcs = srcs + [name + ".pb"] + [name + ".gw"],
-    deps = list(set(deps + proto_deps + go_proto_deps + grpc_gateway_deps)),
+    deps = depset(deps + proto_deps + go_proto_deps + grpc_gateway_deps).to_list(),
     **kwargs)
 
 
diff --git a/java/rules.bzl b/java/rules.bzl
@@ -129,7 +129,7 @@ def java_proto_library(
     name = name,
     srcs = srcs + [name + ".pb"],
     exports = java_exports,
-    deps = list(set(deps + proto_deps + [name + "_compile_imports"])),
+    deps = depset(deps + proto_deps + [name + "_compile_imports"]).to_list(),
     **kwargs)
 
 
diff --git a/node/rules.bzl b/node/rules.bzl
@@ -98,5 +98,5 @@ def node_proto_library(
     name = name,
     srcs = srcs + [name + ".pb"],
     data = data + [dep + ".pb" for dep in proto_deps],
-    deps = list(set(deps + proto_deps)),
+    deps = depset(deps + proto_deps).to_list(),
     **kwargs)
diff --git a/objc/rules.bzl b/objc/rules.bzl
@@ -82,5 +82,5 @@ def objc_proto_library(
   native.objc_library(
     name = name,
     srcs = srcs + [name + ".pb"],
-    deps = list(set(deps + proto_deps + compile_deps)),
+    deps = depset(deps + proto_deps + compile_deps).to_list(),
     **kwargs)
diff --git a/protobuf/internal/proto_compile.bzl b/protobuf/internal/proto_compile.bzl
@@ -385,7 +385,7 @@ def _get_external_root(ctx):
 
   # This set size must be 0 or 1. (all source files must exist in this
   # workspace or the same external workspace).
-  roots = set(external_roots)
+  roots = depset(external_roots)
   if (ctx.attr.verbose > 2):
     print("external roots: %r" % roots)
   n = len(roots)
@@ -414,7 +414,7 @@ def _compile(ctx, unit):
   protoc_cmd = [protoc] + list(unit.args) + imports + srcs
   manifest = [f.short_path for f in unit.outputs]
 
-  transitive_units = set()
+  transitive_units = depset()
   for u in unit.data.transitive_units:
     transitive_units = transitive_units | u.inputs
   inputs = list(unit.inputs | transitive_units) + [unit.compiler]
@@ -600,11 +600,11 @@ def _proto_compile_impl(ctx):
     compiler = ctx.executable.protoc,
     data = data,
     transitive_mappings = builder.get("transitive_mappings", {}),
-    args = set(builder["args"] + ctx.attr.args),
-    imports = set(builder["imports"]),
-    inputs = set(builder["inputs"]),
-    outputs = set(builder["outputs"] + [ctx.outputs.descriptor_set]),
-    commands = set(builder["commands"]),
+    args = depset(builder["args"] + ctx.attr.args),
+    imports = depset(builder["imports"]),
+    inputs = depset(builder["inputs"]),
+    outputs = depset(builder["outputs"] + [ctx.outputs.descriptor_set]),
+    commands = depset(builder["commands"]),
   )
 
   # Run protoc
@@ -614,7 +614,7 @@ def _proto_compile_impl(ctx):
     if run.lang.output_to_jar:
       _build_output_srcjar(run, builder)
 
-  files = set(builder["outputs"])
+  files = depset(builder["outputs"])
 
   return struct(
     files = files,
diff --git a/protobuf/internal/proto_language.bzl b/protobuf/internal/proto_language.bzl
@@ -108,7 +108,7 @@ def _proto_language_deps_impl(ctx):
                 deps.append(file)
 
     return struct(
-        files = set(deps),
+        files = depset(deps),
     )
 
 proto_language_deps = rule(
diff --git a/python/rules.bzl b/python/rules.bzl
@@ -69,5 +69,5 @@ def py_proto_library(
   native.py_library(
     name = name,
     srcs = srcs + [name + ".pb"],
-    deps = list(set(deps + proto_deps)),
+    deps = depset(deps + proto_deps).to_list(),
     **kwargs)

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ def generate_cc_impl(ctx):`
`92`	`92`	`command = " && ".join(cmds),`
`93`	`93`	`)`
`94`	`94`
`95`		`- return struct(files=set(out_files))`
	`95`	`+ return struct(files=depset(out_files))`
`96`	`96`
`97`	`97`	`_generate_cc = rule(`
`98`	`98`	`attrs = {`