From 4e41e0eff03d975138eb890989e582548368ebc0 Mon Sep 17 00:00:00 2001 From: Charles Guo Date: Sat, 5 Jul 2025 18:18:07 -0400 Subject: [PATCH 1/4] Update Gazelle, to bring in bzlmod support --- gazelle/MODULE.bazel | 2 +- gazelle/python/testdata/respect_kind_mapping/BUILD.out | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gazelle/MODULE.bazel b/gazelle/MODULE.bazel index 6bbc74bc61..9f4e4a6e9b 100644 --- a/gazelle/MODULE.bazel +++ b/gazelle/MODULE.bazel @@ -7,7 +7,7 @@ module( bazel_dep(name = "bazel_skylib", version = "1.6.1") bazel_dep(name = "rules_python", version = "0.18.0") bazel_dep(name = "rules_go", version = "0.41.0", repo_name = "io_bazel_rules_go") -bazel_dep(name = "gazelle", version = "0.33.0", repo_name = "bazel_gazelle") +bazel_dep(name = "gazelle", version = "0.44.0", repo_name = "bazel_gazelle") bazel_dep(name = "rules_cc", version = "0.0.16") local_path_override( diff --git a/gazelle/python/testdata/respect_kind_mapping/BUILD.out b/gazelle/python/testdata/respect_kind_mapping/BUILD.out index 7c5fb0bd20..fa06e2af12 100644 --- a/gazelle/python/testdata/respect_kind_mapping/BUILD.out +++ b/gazelle/python/testdata/respect_kind_mapping/BUILD.out @@ -1,5 +1,5 @@ -load(":mytest.bzl", "my_test") load("@rules_python//python:defs.bzl", "py_library") +load(":mytest.bzl", "my_test") # gazelle:map_kind py_test my_test :mytest.bzl From 634411cd7d77723d313be83f45fe6430cad9ed00 Mon Sep 17 00:00:00 2001 From: Charles Guo Date: Sat, 5 Jul 2025 18:42:33 -0400 Subject: [PATCH 2/4] Update WORKSPACE, too --- gazelle/WORKSPACE | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gazelle/WORKSPACE b/gazelle/WORKSPACE index ad428b10cd..f581a93ff8 100644 --- a/gazelle/WORKSPACE +++ b/gazelle/WORKSPACE @@ -13,10 +13,10 @@ http_archive( http_archive( name = "bazel_gazelle", - sha256 = "29d5dafc2a5582995488c6735115d1d366fcd6a0fc2e2a153f02988706349825", + sha256 = "bde9c2949e64d059c18d8f93566a64dafc6d2e8e259a70322fb804831dfd0b5b", urls = [ - "https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.31.0/bazel-gazelle-v0.31.0.tar.gz", - "https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.31.0/bazel-gazelle-v0.31.0.tar.gz", + "https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.44.0/bazel-gazelle-v0.44.0.tar.gz", + "https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.44.0/bazel-gazelle-v0.44.0.tar.gz", ], ) From 1cabc1891ee981b1c77e7bf70487d0baf43cee9b Mon Sep 17 00:00:00 2001 From: Charles Guo Date: Sat, 5 Jul 2025 18:51:53 -0400 Subject: [PATCH 3/4] Update shasum --- gazelle/WORKSPACE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gazelle/WORKSPACE b/gazelle/WORKSPACE index f581a93ff8..cec97690a9 100644 --- a/gazelle/WORKSPACE +++ b/gazelle/WORKSPACE @@ -13,7 +13,7 @@ http_archive( http_archive( name = "bazel_gazelle", - sha256 = "bde9c2949e64d059c18d8f93566a64dafc6d2e8e259a70322fb804831dfd0b5b", + sha256 = "49b14c691ceec841f445f8642d28336e99457d1db162092fd5082351ea302f1d", urls = [ "https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.44.0/bazel-gazelle-v0.44.0.tar.gz", "https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.44.0/bazel-gazelle-v0.44.0.tar.gz", From aa9e24ae35c5ae515cd0bb0957e9d0cd0fdb52b4 Mon Sep 17 00:00:00 2001 From: Charles Guo Date: Sat, 5 Jul 2025 19:01:20 -0400 Subject: [PATCH 4/4] Use golang 1.20.5 --- gazelle/WORKSPACE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gazelle/WORKSPACE b/gazelle/WORKSPACE index cec97690a9..b5ad029cb0 100644 --- a/gazelle/WORKSPACE +++ b/gazelle/WORKSPACE @@ -25,7 +25,7 @@ load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_depe go_rules_dependencies() -go_register_toolchains(version = "1.19.4") +go_register_toolchains(version = "1.20.5") gazelle_dependencies()