bazel: bump Bazel repositories versions

Author: adambabik

BUILD.bazel

@@ -19,6 +19,18 @@ buildifier(
 # gazelle:go_proto_compilers //:go_apiv2
 # gazelle:go_grpc_compilers //:go_apiv2, //:go_grpc
 # gazelle:go_naming_convention import_alias
+# gazelle:resolve proto proto google/api/annotations.proto @googleapis//google/api:annotations_proto
+# gazelle:resolve proto go google/api/annotations.proto  @org_golang_google_genproto_googleapis_api//annotations
+# gazelle:resolve proto proto google/api/http.proto @googleapis//google/api:http_proto
+# gazelle:resolve proto go google/api/http.proto  @org_golang_google_genproto_googleapis_api//annotations
+# gazelle:resolve proto proto google/api/field_behavior.proto @googleapis//google/api:field_behavior_proto
+# gazelle:resolve proto go google/api/field_behavior.proto  @org_golang_google_genproto_googleapis_api//annotations
+# gazelle:resolve proto proto google/api/httpbody.proto @googleapis//google/api:httpbody_proto
+# gazelle:resolve proto go google/api/httpbody.proto  @org_golang_google_genproto_googleapis_api//httpbody
+# gazelle:resolve proto proto google/api/visibility.proto @googleapis//google/api:visibility_proto
+# gazelle:resolve proto go google/api/visibility.proto  @org_golang_google_genproto_googleapis_api//visibility
+# gazelle:resolve proto proto google/rpc/status.proto @googleapis//google/rpc:status_proto
+# gazelle:resolve proto go google/rpc/status.proto  @org_golang_google_genproto_googleapis_rpc//status
 
 gazelle(name = "gazelle")
 

CONTRIBUTING.md

@@ -19,7 +19,7 @@ docker run -itv $(pwd):/grpc-gateway -w /grpc-gateway --entrypoint /bin/bash --r
     ghcr.io/grpc-ecosystem/grpc-gateway/build-env:1.19 -c '\
         bazel run :gazelle -- update-repos -from_file=go.mod -to_macro=repositories.bzl%go_repositories && \
         bazel run :gazelle && \
-        bazel run :buildifier'
+        BAZEL_CXXOPTS="-std=c++14" bazel run :buildifier'
 ```
 
 You may need to authenticate with GitHub to pull `docker.pkg.github.com/grpc-ecosystem/grpc-gateway/build-env`.

WORKSPACE

@@ -18,6 +18,21 @@ http_archive(
     urls = ["https://github.com/protocolbuffers/protobuf/archive/v23.4.tar.gz"],
 )
 
+http_archive(
+    name = "googleapis",
+    sha256 = "9d1a930e767c93c825398b8f8692eca3fe353b9aaadedfbcf1fca2282c85df88",
+    strip_prefix = "googleapis-64926d52febbf298cb82a8f472ade4a3969ba922",
+    urls = [
+        "https://github.com/googleapis/googleapis/archive/64926d52febbf298cb82a8f472ade4a3969ba922.zip",
+    ],
+)
+
+load("@googleapis//:repository_rules.bzl", "switched_rules_by_language")
+
+switched_rules_by_language(
+    name = "com_google_googleapis_imports",
+)
+
 http_archive(
     name = "bazel_skylib",
     sha256 = "66ffd9315665bfaafc96b52278f57c7e2dd09f5ede279ea6d39b2be471e7e3aa",
@@ -33,11 +48,10 @@ bazel_skylib_workspace()
 
 http_archive(
     name = "rules_proto",
-    sha256 = "66bfdf8782796239d3875d37e7de19b1d94301e8972b3cbd2446b332429b4df1",
-    strip_prefix = "rules_proto-4.0.0",
+    sha256 = "dc3fb206a2cb3441b485eb1e423165b231235a1ea9b031b4433cf7bc1fa460dd",
+    strip_prefix = "rules_proto-5.3.0-21.7",
     urls = [
-        "https://mirror.bazel.build/github.com/bazelbuild/rules_proto/archive/refs/tags/4.0.0.tar.gz",
-        "https://github.com/bazelbuild/rules_proto/archive/refs/tags/4.0.0.tar.gz",
+        "https://github.com/bazelbuild/rules_proto/archive/refs/tags/5.3.0-21.7.tar.gz",
     ],
 )
 
@@ -49,25 +63,27 @@ rules_proto_toolchains()
 
 http_archive(
     name = "io_bazel_rules_go",
-    sha256 = "6b65cb7917b4d1709f9410ffe00ecf3e160edf674b78c54a894471320862184f",
+    sha256 = "278b7ff5a826f3dc10f04feaf0b70d48b68748ccd512d7f98bf442077f043fe3",
     urls = [
-        "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.39.0/rules_go-v0.39.0.zip",
-        "https://github.com/bazelbuild/rules_go/releases/download/v0.41.0/rules_go-v0.39.0.zip",
+        "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.41.0/rules_go-v0.41.0.zip",
+        "https://github.com/bazelbuild/rules_go/releases/download/v0.41.0/rules_go-v0.41.0.zip",
     ],
 )
 
-git_repository(
-    name = "bazel_gazelle",
-    commit = "f377e6eff8e24508feb1a34b1e5e681982482a9f",
-    remote = "https://github.com/bazelbuild/bazel-gazelle",
-    shallow_since = "1648046534 -0400",
-)
-
 load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies")
 
 go_rules_dependencies()
 
-go_register_toolchains(version = "1.19.4")
+go_register_toolchains(version = "1.20.6")
+
+http_archive(
+    name = "bazel_gazelle",
+    sha256 = "29218f8e0cebe583643cbf93cae6f971be8a2484cdcfa1e45057658df8d54002",
+    urls = [
+        "https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.32.0/bazel-gazelle-v0.32.0.tar.gz",
+        "https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.32.0/bazel-gazelle-v0.32.0.tar.gz",
+    ],
+)
 
 load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies")
 

examples/internal/gateway/BUILD.bazel

@@ -15,7 +15,7 @@ go_library(
         "//examples/internal/proto/standalone",
         "//runtime",
         "@com_github_golang_glog//:glog",
-        "@go_googleapis//google/rpc:errdetails_go_proto",
+        "@org_golang_google_genproto_googleapis_rpc//errdetails",
         "@org_golang_google_grpc//:go_default_library",
         "@org_golang_google_grpc//connectivity",
         "@org_golang_google_grpc//credentials/insecure",

examples/internal/helloworld/BUILD.bazel

@@ -12,7 +12,7 @@ proto_library(
     visibility = ["//visibility:public"],
     deps = [
         "@com_google_protobuf//:wrappers_proto",
-        "@go_googleapis//google/api:annotations_proto",
+        "@googleapis//google/api:annotations_proto",
     ],
 )
 
@@ -27,7 +27,7 @@ go_proto_library(
     proto = ":helloworld_proto",
     visibility = ["//visibility:public"],
     deps = [
-        "@go_googleapis//google/api:annotations_go_proto",
+        "@org_golang_google_genproto_googleapis_api//annotations",
         "@org_golang_google_protobuf//proto:go_default_library",  #keep
     ],
 )

examples/internal/integration/BUILD.bazel

@@ -20,7 +20,7 @@ go_test(
         "@com_github_golang_glog//:glog",
         "@com_github_google_go_cmp//cmp",
         "@com_github_rogpeppe_fastuuid//:fastuuid",
-        "@go_googleapis//google/rpc:status_go_proto",
+        "@org_golang_google_genproto_googleapis_rpc//status",
         "@org_golang_google_grpc//codes",
         "@org_golang_google_protobuf//encoding/protojson",
         "@org_golang_google_protobuf//proto",

examples/internal/proto/examplepb/BUILD.bazel

@@ -72,10 +72,11 @@ proto_library(
         "@com_google_protobuf//:struct_proto",
         "@com_google_protobuf//:timestamp_proto",
         "@com_google_protobuf//:wrappers_proto",
-        "@go_googleapis//google/api:annotations_proto",
-        "@go_googleapis//google/api:httpbody_proto",
-        "@go_googleapis//google/api:visibility_proto",
-        "@go_googleapis//google/rpc:status_proto",
+        "@googleapis//google/api:annotations_proto",
+        "@googleapis//google/api:field_behavior_proto",
+        "@googleapis//google/api:httpbody_proto",
+        "@googleapis//google/api:visibility_proto",
+        "@googleapis//google/rpc:status_proto",
     ],
 )
 
@@ -87,8 +88,10 @@ proto_library(
         "openapi_merge_b.proto",
     ],
     deps = [
-        "@go_googleapis//google/api:annotations_proto",
-        "@go_googleapis//google/api:httpbody_proto",
+        "@com_google_protobuf//:api_proto",
+        "@googleapis//google/api:annotations_proto",
+        "@googleapis//google/api:field_behavior_proto",
+        "@googleapis//google/rpc:status_proto",
     ],
 )
 
@@ -108,10 +111,10 @@ go_proto_library(
         "//examples/internal/proto/sub2",
         "//protoc-gen-openapiv2/options",
         "@com_github_golang_protobuf//descriptor:go_default_library_gen",  # keep
-        "@go_googleapis//google/api:annotations_go_proto",
-        "@go_googleapis//google/api:httpbody_go_proto",
-        "@go_googleapis//google/api:visibility_go_proto",
-        "@go_googleapis//google/rpc:status_go_proto",
+        "@org_golang_google_genproto_googleapis_api//annotations",
+        "@org_golang_google_genproto_googleapis_api//httpbody",
+        "@org_golang_google_genproto_googleapis_api//visibility",
+        "@org_golang_google_genproto_googleapis_rpc//status",
         "@org_golang_google_protobuf//proto:go_default_library",  # keep
     ],
 )
@@ -131,7 +134,7 @@ go_library(
     deps = [
         "//runtime",
         "//utilities",
-        "@go_googleapis//google/api:annotations_go_proto",
+        "@org_golang_google_genproto_googleapis_api//annotations",
         "@org_golang_google_grpc//:go_default_library",
         "@org_golang_google_grpc//codes",
         "@org_golang_google_grpc//grpclog",

examples/internal/server/BUILD.bazel

@@ -25,9 +25,9 @@ go_library(
         "//runtime",
         "@com_github_golang_glog//:glog",
         "@com_github_rogpeppe_fastuuid//:fastuuid",
-        "@go_googleapis//google/api:httpbody_go_proto",
-        "@go_googleapis//google/rpc:errdetails_go_proto",
-        "@go_googleapis//google/rpc:status_go_proto",
+        "@org_golang_google_genproto_googleapis_api//httpbody",
+        "@org_golang_google_genproto_googleapis_rpc//errdetails",
+        "@org_golang_google_genproto_googleapis_rpc//status",
         "@org_golang_google_grpc//:go_default_library",
         "@org_golang_google_grpc//codes",
         "@org_golang_google_grpc//metadata",

internal/descriptor/BUILD.bazel

@@ -20,8 +20,8 @@ go_library(
         "//internal/httprule",
         "//protoc-gen-openapiv2/options",
         "@com_github_golang_glog//:glog",
-        "@go_googleapis//google/api:annotations_go_proto",
         "@in_gopkg_yaml_v3//:yaml_v3",
+        "@org_golang_google_genproto_googleapis_api//annotations",
         "@org_golang_google_protobuf//compiler/protogen",
         "@org_golang_google_protobuf//encoding/protojson",
         "@org_golang_google_protobuf//proto",

internal/descriptor/apiconfig/BUILD.bazel

@@ -9,17 +9,15 @@ proto_library(
     srcs = [
         "apiconfig.proto",
     ],
-    deps = [
-        "@go_googleapis//google/api:annotations_proto",
-    ],
+    deps = ["@googleapis//google/api:http_proto"],
 )
 
 go_proto_library(
     name = "apiconfig_go_proto",
     compilers = ["//:go_apiv2"],
     importpath = "github.com/grpc-ecosystem/grpc-gateway/v2/internal/descriptor/apiconfig",
     proto = ":apiconfig_proto",
-    deps = ["@go_googleapis//google/api:annotations_go_proto"],
+    deps = ["@org_golang_google_genproto_googleapis_api//annotations"],
 )
 
 go_library(