From 566d38349a50a302c39277b3c91dcabc306cac8b Mon Sep 17 00:00:00 2001 From: Tristan Swadell Date: Mon, 30 Sep 2024 12:25:06 -0700 Subject: [PATCH] Update workspace deps to Go 1.21 (#1033) --- WORKSPACE | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 932a26ea..471bb93a 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_go", - sha256 = "56d8c5a5c91e1af73eca71a6fab2ced959b67c86d12ba37feedb0a2dfea441a6", + sha256 = "b2038e2de2cace18f032249cb4bb0048abf583a36369fa98f687af1b3f880b26", urls = [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.37.0/rules_go-v0.37.0.zip", - "https://github.com/bazelbuild/rules_go/releases/download/v0.37.0/rules_go-v0.37.0.zip", + "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.48.1/rules_go-v0.48.1.zip", + "https://github.com/bazelbuild/rules_go/releases/download/v0.48.1/rules_go-v0.48.1.zip", ], ) @@ -20,14 +20,11 @@ http_archive( ], ) -# rules_proto v3.20.0 http_archive( name = "rules_proto", - sha256 = "e017528fd1c91c5a33f15493e3a398181a9e821a804eb7ff5acdd1d2d6c2b18d", - strip_prefix = "rules_proto-4.0.0-3.20.0", - urls = [ - "https://github.com/bazelbuild/rules_proto/archive/refs/tags/4.0.0-3.20.0.tar.gz", - ], + sha256 = "6fb6767d1bef535310547e03247f7518b03487740c11b6c6adb7952033fe1295", + strip_prefix = "rules_proto-6.0.2", + url = "https://github.com/bazelbuild/rules_proto/releases/download/6.0.2/rules_proto-6.0.2.tar.gz", ) # googleapis as of 08/31/2023 @@ -51,7 +48,6 @@ http_archive( load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies") load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies", "go_repository") load("@com_google_googleapis//:repository_rules.bzl", "switched_rules_by_language") -load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies", "rules_proto_toolchains") load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps") switched_rules_by_language( @@ -65,7 +61,7 @@ go_repository( name = "org_golang_google_protobuf", build_file_proto_mode = "disable_global", importpath = "google.golang.org/protobuf", - tag = "v1.28.1", + tag = "v1.34.2", ) # Generated Google APIs protos for Golang 08/24/2024 @@ -104,8 +100,8 @@ go_repository( go_repository( name = "org_golang_x_text", importpath = "golang.org/x/text", - sum = "h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=", - version = "v0.3.7", + sum = "h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=", + version = "v0.16.0", ) # ANTLR v4.13.0 @@ -156,8 +152,8 @@ go_repository( go_repository( name = "org_golang_x_exp", importpath = "golang.org/x/exp", - sum = "h1:+WEEuIdZHnUeJJmEUjyYC2gfUMj69yZXw17EnHg/otA=", - version = "v0.0.0-20220722155223-a9213eeb770e", + sum = "h1:mCRnTeVUjcrhlRmO0VK8a6k6Rrf6TF9htwo2pJVSjIU=", + version = "v0.0.0-20230515195305-f3d0a9c9a5cc", ) go_repository( @@ -171,12 +167,17 @@ go_repository( # of the above repositories but at different versions, so ours must come first. go_rules_dependencies() -go_register_toolchains(version = "1.19.1") +go_register_toolchains(version = "1.21.0") gazelle_dependencies() +load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies") rules_proto_dependencies() +load("@rules_proto//proto:setup.bzl", "rules_proto_setup") +rules_proto_setup() + +load("@rules_proto//proto:toolchains.bzl", "rules_proto_toolchains") rules_proto_toolchains() protobuf_deps()