Bazel 5 Upgrade (attempt 2) (#274)

* Upgrade bazel to 5.1.1

* Upgrade grpc/grpc to v1.42.0

- make tidy

Author: pcj

.bazelci/presubmit.yml

@@ -2,7 +2,7 @@
 buildifier:
   version: 4.2.3
   warnings: "-function-docstring,-function-docstring-header,-module-docstring,-function-docstring-args,-list-append"
-bazel: 4.0.0
+bazel: 5.1.1
 tasks:
   default_workspace_ubuntu1804:
     platform: ubuntu1804

.bazelversion

@@ -1 +1 @@
-4.0.0
+5.1.1

Makefile

@@ -1,4 +1,4 @@
-BAZEL := bazel
+BAZEL := bzl
 
 .PHONY: tidy
 tidy: deps

deps/BUILD.bazel

@@ -236,25 +236,19 @@ proto_dependency(
     visibility = ["//visibility:public"],
 )
 
-# Release: v1.35.0
-# Commit: v1.35.x
-# Date: 2021-01-19 18:07:57 +0000 UTC
-# URL: https://github.com/grpc/grpc/releases/tag/v1.35.0
-# Branch: master
-# Commit: 5f759fcd1f602b38004b948b071f8b5726a9a4b1
-# Date: 2021-02-09 05:46:27 +0000 UTC
-# URL: https://github.com/grpc/grpc/commit/5f759fcd1f602b38004b948b071f8b5726a9a4b1
-#
-# Merge pull request #25384 from gnossen/fix_interop_typo
+# Release: v1.42.0
+# Commit: 11f00485aa5ad422cfe2d9d90589158f46954101
+# Date: 2021-11-16 23:39:48 +0000 UTC
+# URL: https://github.com/grpc/grpc/commit/11f00485aa5ad422cfe2d9d90589158f46954101
 #
-# Fix Interop Client Typo
-# Size: 7899154 (7.9 MB)
+# internal_ci: rename grpc_xds_k8s to psm-security as part of tech-debt cleanup and name clarity (#28034) (#28098)
+# Size: 8463684 (8.5 MB)
 proto_dependency(
     name = "com_github_grpc_grpc",
     repository_rule = "http_archive",
-    sha256 = "e6c6b1ac9ba2257c93e49c98ef4fc96b2e2a1cdd90782a919f60e23fa8c2428b",
-    strip_prefix = "grpc-5f759fcd1f602b38004b948b071f8b5726a9a4b1",
-    urls = ["https://github.com/grpc/grpc/archive/5f759fcd1f602b38004b948b071f8b5726a9a4b1.tar.gz"],
+    sha256 = "3db6da6500312cf011ecea4231cdb75ba1dd40440a10c9f807cee805448fc82b",
+    strip_prefix = "grpc-11f00485aa5ad422cfe2d9d90589158f46954101",
+    urls = ["https://github.com/grpc/grpc/archive/11f00485aa5ad422cfe2d9d90589158f46954101.tar.gz"],
     deps = [
         ":build_bazel_rules_swift",
         ":com_google_protobuf",

deps/grpc_core_deps.bzl

@@ -103,9 +103,9 @@ def com_github_grpc_grpc():
     _maybe(
         http_archive,
         name = "com_github_grpc_grpc",
-        sha256 = "e6c6b1ac9ba2257c93e49c98ef4fc96b2e2a1cdd90782a919f60e23fa8c2428b",
-        strip_prefix = "grpc-5f759fcd1f602b38004b948b071f8b5726a9a4b1",
+        sha256 = "3db6da6500312cf011ecea4231cdb75ba1dd40440a10c9f807cee805448fc82b",
+        strip_prefix = "grpc-11f00485aa5ad422cfe2d9d90589158f46954101",
         urls = [
-            "https://github.com/grpc/grpc/archive/5f759fcd1f602b38004b948b071f8b5726a9a4b1.tar.gz",
+            "https://github.com/grpc/grpc/archive/11f00485aa5ad422cfe2d9d90589158f46954101.tar.gz",
         ],
     )

deps/grpc_node_deps.bzl

@@ -104,10 +104,10 @@ def com_github_grpc_grpc():
     _maybe(
         http_archive,
         name = "com_github_grpc_grpc",
-        sha256 = "e6c6b1ac9ba2257c93e49c98ef4fc96b2e2a1cdd90782a919f60e23fa8c2428b",
-        strip_prefix = "grpc-5f759fcd1f602b38004b948b071f8b5726a9a4b1",
+        sha256 = "3db6da6500312cf011ecea4231cdb75ba1dd40440a10c9f807cee805448fc82b",
+        strip_prefix = "grpc-11f00485aa5ad422cfe2d9d90589158f46954101",
         urls = [
-            "https://github.com/grpc/grpc/archive/5f759fcd1f602b38004b948b071f8b5726a9a4b1.tar.gz",
+            "https://github.com/grpc/grpc/archive/11f00485aa5ad422cfe2d9d90589158f46954101.tar.gz",
         ],
     )
 

deps/grpc_web_deps.bzl

@@ -9,6 +9,8 @@ def _maybe(repo_rule, name, **kwargs):
         repo_rule(name = name, **kwargs)
 
 def grpc_web_deps():
+    """grpc_web dependency macro
+    """
     com_github_grpc_grpc_web_releases_download_v1_3_1_protoc_gen_grpc_web_1_3_1_darwin_x86_64()  # via <TOP>
     com_github_grpc_grpc_web_releases_download_v1_3_1_protoc_gen_grpc_web_1_3_1_linux_x86_64()  # via <TOP>
     com_github_grpc_grpc_web_releases_download_v1_3_1_protoc_gen_grpc_web_1_3_1_windows_x86_64()  # via <TOP>

go_deps.bzl

@@ -73,6 +73,14 @@ def go_deps():
         sum = "h1:KViqR7qKXwz+LrNdIauCDU21kneCk+4DnYjpvlJwH50=",
         version = "v0.27.0",
     )
+    go_repository(
+        name = "com_github_bmatcuk_doublestar",
+        build_file_proto_mode = "disable_global",
+        importpath = "github.com/bmatcuk/doublestar",
+        sum = "h1:oC24CykoSAB8zd7XgruHo33E0cHJf/WhQA/7BeXj+x0=",
+        version = "v1.2.2",
+    )
+
     go_repository(
         name = "com_github_burntsushi_toml",
         build_file_proto_mode = "disable_global",

pkg/rule/rules_scala/BUILD.bazel

@@ -16,7 +16,7 @@ go_library(
         "@bazel_gazelle//label:go_default_library",
         "@bazel_gazelle//resolve:go_default_library",
         "@bazel_gazelle//rule:go_default_library",
-        "@com_github_bmatcuk_doublestar//:go_default_library",
+        "@com_github_bmatcuk_doublestar//:doublestar",
         "@com_github_emicklei_proto//:proto",
     ],
 )