From cfe9e8fe37ee29cd9b96fe5b87db7bfd8d424875 Mon Sep 17 00:00:00 2001
From: Tyler French <tfrench@uber.com>
Date: Thu, 1 Aug 2024 13:32:41 -0400
Subject: [PATCH] prepare release 0.38 (#1849)

* prepare release 0.38

* Update MODULE.bazel
---
 MODULE.bazel                       | 13 +++---------
 WORKSPACE                          |  2 +-
 third_party/patches/BUILD.bazel    |  0
 third_party/patches/rules_go.patch | 33 ------------------------------
 4 files changed, 4 insertions(+), 44 deletions(-)
 delete mode 100644 third_party/patches/BUILD.bazel
 delete mode 100644 third_party/patches/rules_go.patch

diff --git a/MODULE.bazel b/MODULE.bazel
index d821962eb..ce36c8de6 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -1,13 +1,13 @@
 module(
     name = "gazelle",
-    version = "0.37.0",
+    version = "0.38.0",
     repo_name = "bazel_gazelle",
 )
 
 bazel_dep(name = "bazel_features", version = "1.9.1")
 bazel_dep(name = "bazel_skylib", version = "1.5.0")
 bazel_dep(name = "protobuf", version = "3.19.6", repo_name = "com_google_protobuf")
-bazel_dep(name = "rules_go", version = "0.46.0", repo_name = "io_bazel_rules_go")
+bazel_dep(name = "rules_go", version = "0.47.0", repo_name = "io_bazel_rules_go")
 bazel_dep(name = "rules_proto", version = "4.0.0")
 
 go_sdk = use_extension("@io_bazel_rules_go//go:extensions.bzl", "go_sdk")
@@ -58,7 +58,7 @@ bazel_dep(name = "bazel_skylib_gazelle_plugin", version = "1.4.1", dev_dependenc
 bazel_dep(name = "stardoc", version = "0.6.2", dev_dependency = True, repo_name = "io_bazel_stardoc")
 
 go_sdk_dev = use_extension("@io_bazel_rules_go//go:extensions.bzl", "go_sdk", dev_dependency = True)
-go_sdk_dev.download(version = "1.22.4")
+go_sdk_dev.download(version = "1.22.5")
 
 # Used by compatibility tests, keep as low as possible.
 go_sdk_dev.download(version = "1.18.10")
@@ -68,10 +68,3 @@ use_repo(
     go_sdk_dev,
     go_sdk = "go_default_sdk",
 )
-
-# This will only apply in the root module. temporarily needed to fix `bazel_features` in CI.
-single_version_override(
-    module_name = "rules_go",
-    patch_strip = 1,
-    patches = ["//third_party/patches:rules_go.patch"],
-)
diff --git a/WORKSPACE b/WORKSPACE
index ddf70d439..9952c4918 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -40,7 +40,7 @@ go_rules_dependencies()
 
 go_register_toolchains(
     nogo = "@bazel_gazelle//:nogo",
-    version = "1.22.0",
+    version = "1.22.5",
 )
 
 go_download_sdk(
diff --git a/third_party/patches/BUILD.bazel b/third_party/patches/BUILD.bazel
deleted file mode 100644
index e69de29bb..000000000
diff --git a/third_party/patches/rules_go.patch b/third_party/patches/rules_go.patch
deleted file mode 100644
index ab5a023b2..000000000
--- a/third_party/patches/rules_go.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/go/private/BUILD.bazel b/go/private/BUILD.bazel
-index 51df4ed6e..0833b2c10 100644
---- a/go/private/BUILD.bazel
-+++ b/go/private/BUILD.bazel
-@@ -64,7 +64,7 @@ bzl_library(
-         "@bazel_skylib//rules:common_settings",
-         "@bazel_tools//tools/build_defs/cc:action_names.bzl",
-         "@bazel_tools//tools/cpp:toolchain_utils.bzl",
--        "@io_bazel_rules_go_bazel_features//:features.bzl",
-+        "@io_bazel_rules_go_bazel_features//:features",
-         "@io_bazel_rules_nogo//:scope.bzl",
-     ],
- )
-diff --git a/go/private/polyfill_bazel_features.bzl b/go/private/polyfill_bazel_features.bzl
-index 9d3c9203a..5481b6b0c 100644
---- a/go/private/polyfill_bazel_features.bzl
-+++ b/go/private/polyfill_bazel_features.bzl
-@@ -22,7 +22,14 @@ def _polyfill_bazel_features_impl(rctx):
-
-     find_cpp_toolchain_has_mandatory_param = major_version_int > 6 or (major_version_int == 6 and minor_version_int >= 1)
-
--    rctx.file("BUILD.bazel", """exports_files(["features.bzl"])
-+    rctx.file("BUILD.bazel", """
-+load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
-+bzl_library(
-+    name = "features",
-+    srcs = ["features.bzl"],
-+    visibility = ["//visibility:public"],
-+)
-+exports_files(["features.bzl"])
- """)
-     rctx.file("features.bzl", _POLYFILL_BAZEL_FEATURES.format(
-         find_cpp_toolchain_has_mandatory_param = repr(find_cpp_toolchain_has_mandatory_param),