From 42ab3a5bc201e76fea515c3f3e57b22f91d7742b Mon Sep 17 00:00:00 2001
From: Fabian Meumertzheim <fabian@meumertzhe.im>
Date: Thu, 7 Nov 2024 23:00:11 +0100
Subject: [PATCH] Bump even further

---
 BUILD.bazel                       | 4 ++--
 MODULE.bazel                      | 2 +-
 WORKSPACE                         | 4 +++-
 cmd/fetch_repo/BUILD.bazel        | 6 +++---
 tests/bcr/go_mod/go.mod           | 2 +-
 tests/bcr/go_work/go.mod          | 2 +-
 tests/bcr/go_work/go.work         | 2 +-
 tests/bcr/go_work/pkg/go.mod      | 2 +-
 tests/bcr/go_work/proto/go.mod    | 2 +-
 tests/bcr/go_work/test_dep/go.mod | 2 +-
 tests/bcr/go_work/tools/go.mod    | 2 +-
 11 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/BUILD.bazel b/BUILD.bazel
index e073e04ef..c425e5609 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -39,8 +39,8 @@ gazelle_binary(
 )
 
 go_cross_binary(
-    name = "gazelle_local_go1.20",
-    sdk_version = "1.20",
+    name = "gazelle_local_go1.21",
+    sdk_version = "1.21",
     target = ":gazelle_local",
 )
 
diff --git a/MODULE.bazel b/MODULE.bazel
index 69b40c315..dd1d17055 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -63,7 +63,7 @@ go_sdk_dev = use_extension("@io_bazel_rules_go//go:extensions.bzl", "go_sdk", de
 go_sdk_dev.download(version = "1.23.3")
 
 # Used by compatibility tests, keep as low as possible.
-go_sdk_dev.download(version = "1.20.14")
+go_sdk_dev.download(version = "1.21.13")
 
 # Known to exist since it is instantiated by rules_go itself.
 use_repo(
diff --git a/WORKSPACE b/WORKSPACE
index 01aee392a..aa91aa08f 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -49,11 +49,13 @@ go_register_nogo(
     nogo = "@bazel_gazelle//:nogo",
 )
 
+# Go 1.21 is needed to support the toolchain directive in go.mod, which is non-hermetically read
+# by GoToolchainBinaryBuild on Windows.
 # Go 1.20 is needed so support nogo's use of token.File.FileStart.
 # Go 1.19 is needed for recent versions of golang.org/x/tools.
 go_download_sdk(
     name = "go_compat_sdk",
-    version = "1.20.14",
+    version = "1.21.13",
 )
 
 load("//:deps.bzl", "gazelle_dependencies")
diff --git a/cmd/fetch_repo/BUILD.bazel b/cmd/fetch_repo/BUILD.bazel
index 62aea7afb..58fa1fecc 100644
--- a/cmd/fetch_repo/BUILD.bazel
+++ b/cmd/fetch_repo/BUILD.bazel
@@ -26,10 +26,10 @@ go_binary(
     visibility = ["//visibility:public"],
 )
 
-# Verify that fetch_repo builds with Go 1.20.
+# Verify that fetch_repo builds with Go 1.21.
 go_cross_binary(
-    name = "fetch_repo_go1.20",
-    sdk_version = "1.20",
+    name = "fetch_repo_go1.21",
+    sdk_version = "1.21",
     target = ":fetch_repo",
 )
 
diff --git a/tests/bcr/go_mod/go.mod b/tests/bcr/go_mod/go.mod
index 1af64cc01..0b6325c1d 100644
--- a/tests/bcr/go_mod/go.mod
+++ b/tests/bcr/go_mod/go.mod
@@ -1,7 +1,7 @@
 // This will stop go mod from descending into this directory.
 module github.com/bazelbuild/bazel-gazelle/tests/bcr/go_mod
 
-go 1.23.2
+go 1.23.3
 
 // Validate go.mod replace directives can be properly used:
 replace github.com/bmatcuk/doublestar/v4 => github.com/bmatcuk/doublestar/v4 v4.7.1
diff --git a/tests/bcr/go_work/go.mod b/tests/bcr/go_work/go.mod
index 92290f47e..ec030c9ed 100644
--- a/tests/bcr/go_work/go.mod
+++ b/tests/bcr/go_work/go.mod
@@ -1,3 +1,3 @@
 module github.com/bazelbuild/bazel-gazelle/tests/bcr/go_work
 
-go 1.23.2
+go 1.23.3
diff --git a/tests/bcr/go_work/go.work b/tests/bcr/go_work/go.work
index c02390ab8..e71eef1e4 100644
--- a/tests/bcr/go_work/go.work
+++ b/tests/bcr/go_work/go.work
@@ -1,4 +1,4 @@
-go 1.21
+go 1.23.3
 
 use (
 	.
diff --git a/tests/bcr/go_work/pkg/go.mod b/tests/bcr/go_work/pkg/go.mod
index b2735344a..d97377231 100644
--- a/tests/bcr/go_work/pkg/go.mod
+++ b/tests/bcr/go_work/pkg/go.mod
@@ -1,6 +1,6 @@
 module github.com/bazelbuild/bazel-gazelle/tests/bcr/go_work/pkg
 
-go 1.21.5
+go 1.23.3
 
 require (
 	example.org/hello v0.0.0-00010101000000-000000000000
diff --git a/tests/bcr/go_work/proto/go.mod b/tests/bcr/go_work/proto/go.mod
index 344688491..0de63b243 100644
--- a/tests/bcr/go_work/proto/go.mod
+++ b/tests/bcr/go_work/proto/go.mod
@@ -1,2 +1,2 @@
 module github.com/bazelbuild/bazel-gazelle/tests/bcr/go_work/proto
-go 1.21.5
+go 1.23.3
diff --git a/tests/bcr/go_work/test_dep/go.mod b/tests/bcr/go_work/test_dep/go.mod
index 389c77c0c..829367d23 100644
--- a/tests/bcr/go_work/test_dep/go.mod
+++ b/tests/bcr/go_work/test_dep/go.mod
@@ -1,6 +1,6 @@
 module github.com/bazelbuild/bazel-gazelle/tests/bcr/go_work/test_dep
 
-go 1.21.5
+go 1.23.3
 
 require github.com/stretchr/testify v1.8.4
 
diff --git a/tests/bcr/go_work/tools/go.mod b/tests/bcr/go_work/tools/go.mod
index 4cc88570d..6a50d9a6b 100644
--- a/tests/bcr/go_work/tools/go.mod
+++ b/tests/bcr/go_work/tools/go.mod
@@ -1,6 +1,6 @@
 module github.com/bazelbuild/bazel-gazelle/tests/bcr/go_work/tools
 
-go 1.21.0
+go 1.23.3
 
 require (
 	github.com/99designs/gqlgen v0.17.40