Skip to content

Commit

Permalink
Update Go Version & related dependencies
Browse files Browse the repository at this point in the history
Test: N/A
Bug: b/372258572
Change-Id: I807d6ed14cc61382353ee15492813e7d35bafdb0
GitOrigin-RevId: 7f497c37c62c909ad79466ba385a0037621a03cf
  • Loading branch information
bentekkie authored and copybara-github committed Dec 12, 2024
1 parent 6a68612 commit 17dd3cd
Show file tree
Hide file tree
Showing 12 changed files with 38 additions and 28 deletions.
2 changes: 2 additions & 0 deletions .bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ build:windows --@io_bazel_rules_go//go/config:static
build:windows --@io_bazel_rules_go//go/config:pure
build:linux --@io_bazel_rules_go//go/config:static
build:linux --@io_bazel_rules_go//go/config:pure
build:macos --@io_bazel_rules_go//go/config:static
build:macos --@io_bazel_rules_go//go/config:pure

### Required for LLVM
# Prevent invalid caching if input files are modified during a build.
Expand Down
2 changes: 1 addition & 1 deletion .bazelversion
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
7.4.0
7.4.1
### PLEASE READ ###

Bazelisk only reads the first line of this file. Don't move this up.
Expand Down
22 changes: 11 additions & 11 deletions MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
register_toolchains(
"@nodejs_toolchains//:linux_amd64_toolchain_target",
"@nodejs_toolchains//:linux_amd64_toolchain",
"@ninja_1.11.1_toolchains//:all",
"@ninja_1.12.1_toolchains//:all", # Make sure to update in use_repo as well
"@rules_foreign_cc//toolchains:built_ninja_toolchain",
)

## Bazel rule libraries
bazel_dep(name = "rules_cc", version = "0.0.9")
bazel_dep(name = "rules_foreign_cc", version = "0.10.1")
bazel_dep(name = "rules_cc", version = "0.0.17")
bazel_dep(name = "rules_foreign_cc", version = "0.13.0")
single_version_override(
module_name = "rules_foreign_cc",
patch_strip = 0,
Expand All @@ -19,10 +19,10 @@ single_version_override(
)

tools = use_extension("@rules_foreign_cc//foreign_cc:extensions.bzl", "tools")
use_repo(tools, "ninja_1.11.1_toolchains")
use_repo(tools, "ninja_1.12.1_toolchains") # Make sure to update in register_toolchains as well

bazel_dep(name = "rules_proto", version = "7.0.2")
bazel_dep(name = "rules_go", version = "0.48.0", repo_name = "io_bazel_rules_go")
bazel_dep(name = "rules_go", version = "0.50.1", repo_name = "io_bazel_rules_go")
single_version_override(
module_name = "rules_go",
patch_strip = 0,
Expand All @@ -41,9 +41,9 @@ single_version_override(
)

bazel_dep(name = "rules_pkg", version = "1.0.1")
bazel_dep(name = "bazel_skylib", version = "1.7.0")
bazel_dep(name = "bazel_skylib", version = "1.7.1")
bazel_dep(name = "platforms", version = "0.0.10")
bazel_dep(name = "rules_nodejs", version = "6.1.1")
bazel_dep(name = "rules_nodejs", version = "6.3.2")

## Nodejs Dependencies
node = use_extension("@rules_nodejs//nodejs:extensions.bzl", "node")
Expand All @@ -69,9 +69,9 @@ git_override(
)

bazel_dep(name = "grpc", version = "1.63.1", repo_name = "com_github_grpc_grpc")
bazel_dep(name = "glog", version = "0.7.0", repo_name = "com_github_google_glog")
bazel_dep(name = "glog", version = "0.7.1", repo_name = "com_github_google_glog")
bazel_dep(name = "gflags", version = "2.2.2", repo_name = "com_github_gflags_gflags")
bazel_dep(name = "googletest", version = "1.14.0.bcr.1", repo_name = "com_google_googletest")
bazel_dep(name = "googletest", version = "1.15.2", repo_name = "com_google_googletest")

gclient_repository = use_repo_rule("//:gclient.bzl", "gclient_repository")

Expand Down Expand Up @@ -119,12 +119,12 @@ use_repo(android_toolchain_extension, "linux_android1404", "linux_android1404_an
go_sdk = use_extension("@io_bazel_rules_go//go:extensions.bzl", "go_sdk")
go_sdk.download(
name = "go_sdk",
version = "1.21.11",
version = "1.22.7",
)
use_repo(go_sdk, "go_sdk")
go_sdk.nogo(nogo = "//tools:nogo")

bazel_dep(name = "gazelle", version = "0.38.0")
bazel_dep(name = "gazelle", version = "0.40.0")

go_deps = use_extension("@gazelle//:extensions.bzl", "go_deps")
go_deps.from_file(go_mod = "//:go.mod")
Expand Down
2 changes: 1 addition & 1 deletion experiments/internal/pkg/experiment/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ go_library(
"//experiments/internal/pkg/gcs",
"//experiments/internal/pkg/vm",
"@com_github_golang_glog//:glog",
"@io_bazel_rules_go//go/tools/bazel:go_default_library",
"@io_bazel_rules_go//go/tools/bazel",
"@org_golang_google_protobuf//proto",
"@org_golang_x_sync//errgroup",
],
Expand Down
10 changes: 6 additions & 4 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
module github.com/bazelbuild/reclient

go 1.21.11
go 1.22.7 // Remember to also update the go sdks in MODULE.bazel

toolchain go1.23.4

require (
cloud.google.com/go/bigquery v1.63.1
Expand All @@ -12,7 +14,7 @@ require (
github.com/GoogleCloudPlatform/protoc-gen-bq-schema v1.1.0
github.com/Microsoft/go-winio v0.6.2
github.com/bazelbuild/remote-apis-sdks v0.0.0-20241120150805-8ff3cc74b7fd
github.com/bazelbuild/rules_go v0.48.0
github.com/bazelbuild/rules_go v0.50.1
github.com/eapache/go-resiliency v1.6.0
github.com/fatih/color v1.17.0
github.com/golang/glog v1.2.2
Expand All @@ -26,15 +28,15 @@ require (
github.com/shirou/gopsutil/v3 v3.24.4
github.com/vardius/progress-go v0.0.0-20221030221608-f948426036a9
go.opencensus.io v0.24.0
golang.org/x/mod v0.20.0
golang.org/x/mod v0.22.0
golang.org/x/oauth2 v0.23.0
golang.org/x/sync v0.10.0
golang.org/x/sys v0.28.0
golang.org/x/tools v0.24.0
google.golang.org/api v0.197.0
google.golang.org/genproto v0.0.0-20241007155032-5fefd90f89a9
google.golang.org/genproto/googleapis/rpc v0.0.0-20241007155032-5fefd90f89a9
google.golang.org/grpc v1.67.1
google.golang.org/grpc v1.68.0
google.golang.org/protobuf v1.35.1
)

Expand Down
12 changes: 6 additions & 6 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -167,8 +167,8 @@ github.com/bazelbuild/remote-apis v0.0.0-20230411132548-35aee1c4a425 h1:Lj8uXWW9
github.com/bazelbuild/remote-apis v0.0.0-20230411132548-35aee1c4a425/go.mod h1:ry8Y6CkQqCVcYsjPOlLXDX2iRVjOnjogdNwhvHmRcz8=
github.com/bazelbuild/remote-apis-sdks v0.0.0-20241120150805-8ff3cc74b7fd h1:ZXfCmS+V6ZMamGwgwVVyPZCQ5KvAykbuZDlAPB2pAsQ=
github.com/bazelbuild/remote-apis-sdks v0.0.0-20241120150805-8ff3cc74b7fd/go.mod h1:SkKj81cDNRVeJ9Ba34FGlnlz9QmpLJ1d2AOushpY5L4=
github.com/bazelbuild/rules_go v0.48.0 h1:fZgo6mCUKeL/+GQiMWy5/QU1FjNXGPnTd5bAeao1pbg=
github.com/bazelbuild/rules_go v0.48.0/go.mod h1:Dhcz716Kqg1RHNWos+N6MlXNkjNP2EwZQ0LukRKJfMs=
github.com/bazelbuild/rules_go v0.50.1 h1:/BUvuaB8MEiUA2oLPPCGtuw5V+doAYyiGTFyoSWlkrw=
github.com/bazelbuild/rules_go v0.50.1/go.mod h1:Dhcz716Kqg1RHNWos+N6MlXNkjNP2EwZQ0LukRKJfMs=
github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM=
github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
Expand Down Expand Up @@ -1275,8 +1275,8 @@ golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.5.0/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro=
golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro=
golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY=
golang.org/x/mod v0.20.0 h1:utOm6MM3R3dnawAiJgn0y+xvuYRsm1RKM/4giyfDgV0=
golang.org/x/mod v0.20.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
golang.org/x/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4=
golang.org/x/mod v0.22.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
Expand Down Expand Up @@ -1789,8 +1789,8 @@ google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ5
google.golang.org/grpc v1.43.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU=
google.golang.org/grpc v1.44.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU=
google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ=
google.golang.org/grpc v1.67.1 h1:zWnc1Vrcno+lHZCOofnIMvycFcc0QRGIzm9dhnDX68E=
google.golang.org/grpc v1.67.1/go.mod h1:1gLDyUQU7CTLJI90u3nXZ9ekeghjeM7pTDZlqFNg2AA=
google.golang.org/grpc v1.68.0 h1:aHQeeJbo8zAkAa3pRzrVjZlbz6uSfeOXlJNQM0RAbz0=
google.golang.org/grpc v1.68.0/go.mod h1:fmSPC5AsjSBCK54MyHRx48kpOti1/jRfOlwEWywNjWA=
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw=
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
Expand Down
2 changes: 1 addition & 1 deletion internal/pkg/auxiliary/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ go_test(
embed = [":auxiliary"],
deps = [
"@com_github_google_go_cmp//cmp",
"@io_bazel_rules_go//go/tools/bazel:go_default_library",
"@io_bazel_rules_go//go/tools/bazel",
"@org_golang_google_protobuf//proto",
"@org_golang_google_protobuf//reflect/protoreflect",
"@org_golang_google_protobuf//types/dynamicpb",
Expand Down
2 changes: 1 addition & 1 deletion internal/pkg/inputprocessor/action/clanglink/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,6 @@ go_test(
"//internal/pkg/inputprocessor/flags",
"@com_github_google_go_cmp//cmp",
"@com_github_google_go_cmp//cmp/cmpopts",
"@io_bazel_rules_go//go/tools/bazel:go_default_library",
"@io_bazel_rules_go//go/tools/bazel",
],
)
2 changes: 1 addition & 1 deletion internal/pkg/inputprocessor/action/typescript/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@ go_test(
"@com_github_bazelbuild_remote_apis_sdks//go/pkg/command",
"@com_github_google_go_cmp//cmp",
"@com_github_google_go_cmp//cmp/cmpopts",
"@io_bazel_rules_go//go/tools/bazel:go_default_library",
"@io_bazel_rules_go//go/tools/bazel",
],
)
2 changes: 1 addition & 1 deletion internal/pkg/inputprocessor/toolchain/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,6 @@ go_test(
"@com_github_bazelbuild_remote_apis_sdks//go/pkg/command",
"@com_github_bazelbuild_remote_apis_sdks//go/pkg/filemetadata",
"@com_github_google_go_cmp//cmp",
"@io_bazel_rules_go//go/tools/bazel:go_default_library",
"@io_bazel_rules_go//go/tools/bazel",
],
)
6 changes: 6 additions & 0 deletions internal/pkg/ipc/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,15 @@ go_library(
"@io_bazel_rules_go//go/platform:openbsd": [
"@org_golang_google_grpc//:grpc",
],
"@io_bazel_rules_go//go/platform:osx": [
"@org_golang_google_grpc//:grpc",
],
"@io_bazel_rules_go//go/platform:plan9": [
"@org_golang_google_grpc//:grpc",
],
"@io_bazel_rules_go//go/platform:qnx": [
"@org_golang_google_grpc//:grpc",
],
"@io_bazel_rules_go//go/platform:solaris": [
"@org_golang_google_grpc//:grpc",
],
Expand Down
2 changes: 1 addition & 1 deletion pkg/inputprocessor/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ go_test(
"@com_github_bazelbuild_remote_apis_sdks//go/pkg/outerr",
"@com_github_google_go_cmp//cmp",
"@com_github_google_go_cmp//cmp/cmpopts",
"@io_bazel_rules_go//go/tools/bazel:go_default_library",
"@io_bazel_rules_go//go/tools/bazel",
"@org_golang_google_grpc//codes",
"@org_golang_google_grpc//status",
],
Expand Down

0 comments on commit 17dd3cd

Please sign in to comment.