chore: bump buildifier, go and gazelle deps (#845)

2024-05-13 23:30:19 -07:00 · 2024-05-13 23:30:19 -07:00 · 155e3f250e
parent 7c958d665f
commit 155e3f250e
4 changed files with 29 additions and 39 deletions
--- a/.bcr/patches/go_dev_dep.patch
+++ b/.bcr/patches/go_dev_dep.patch
@ -5,13 +5,13 @@ index e63fa5b..9d78a88 100644
@@ -50,19 +50,19 @@ use_repo(host, "aspect_bazel_lib_host")
 bazel_dep(
     name = "gazelle",
-     version = "0.33.0",
+     version = "0.36.0",
 -    # In released versions: dev_dependency = True
 +    dev_dependency = True,
 )
 bazel_dep(
     name = "rules_go",
-     version = "0.41.0",
+     version = "0.46.0",
     repo_name = "io_bazel_rules_go",
 -    # In released versions: dev_dependency = True
 +    dev_dependency = True,
--- a/MODULE.bazel
+++ b/MODULE.bazel
@ -48,12 +48,12 @@ use_repo(host, "aspect_bazel_lib_host")

 bazel_dep(
    name = "gazelle",
-    version = "0.33.0",
+    version = "0.36.0",
    # In released versions: dev_dependency = True
 )
 bazel_dep(
    name = "rules_go",
-    version = "0.41.0",
+    version = "0.46.0",
    repo_name = "io_bazel_rules_go",
    # In released versions: dev_dependency = True
 )
@ -73,5 +73,5 @@ use_repo(
 # Development-only dependencies

 bazel_dep(name = "bazel_skylib_gazelle_plugin", version = "1.5.0", dev_dependency = True)
-bazel_dep(name = "buildifier_prebuilt", version = "6.3.3", dev_dependency = True)
+bazel_dep(name = "buildifier_prebuilt", version = "6.4.0", dev_dependency = True)
 bazel_dep(name = "bazel_features", version = "0.2.0", dev_dependency = True)
--- a/internal_deps.bzl
+++ b/internal_deps.bzl
@ -12,36 +12,26 @@ def bazel_lib_internal_deps():
    "Fetch deps needed for local development"
    http_archive(
        name = "io_bazel_rules_go",
-        sha256 = "6734a719993b1ba4ebe9806e853864395a8d3968ad27f9dd759c196b3eb3abe8",
-        urls = [
-            "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.45.1/rules_go-v0.45.1.zip",
-            "https://github.com/bazelbuild/rules_go/releases/download/v0.45.1/rules_go-v0.45.1.zip",
-        ],
+        sha256 = "80a98277ad1311dacd837f9b16db62887702e9f1d1c4c9f796d0121a46c8e184",
+        urls = ["https://github.com/bazelbuild/rules_go/releases/download/v0.46.0/rules_go-v0.46.0.zip"],
    )

    http_archive(
        name = "bazel_gazelle",
-        sha256 = "32938bda16e6700063035479063d9d24c60eda8d79fd4739563f50d331cb3209",
-        urls = [
-            "https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.35.0/bazel-gazelle-v0.35.0.tar.gz",
-            "https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.35.0/bazel-gazelle-v0.35.0.tar.gz",
-        ],
-    )
-
-    http_archive(
-        name = "bazel_skylib",
-        sha256 = "cd55a062e763b9349921f0f5db8c3933288dc8ba4f76dd9416aac68acee3cb94",
-        urls = [
-            "https://github.com/bazelbuild/bazel-skylib/releases/download/1.5.0/bazel-skylib-1.5.0.tar.gz",
-        ],
+        integrity = "sha256-dd8ojEsxyB61D1Hi4U9HY8t1SNquEmgXJHBkY3/Z6mI=",
+        urls = ["https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.36.0/bazel-gazelle-v0.36.0.tar.gz"],
    )

    http_archive(
        name = "bazel_skylib_gazelle_plugin",
        sha256 = "747addf3f508186234f6232674dd7786743efb8c68619aece5fb0cac97b8f415",
-        urls = [
-            "https://github.com/bazelbuild/bazel-skylib/releases/download/1.5.0/bazel-skylib-gazelle-plugin-1.5.0.tar.gz",
-        ],
+        urls = ["https://github.com/bazelbuild/bazel-skylib/releases/download/1.5.0/bazel-skylib-gazelle-plugin-1.5.0.tar.gz"],
+    )
+
+    http_archive(
+        name = "bazel_skylib",
+        sha256 = "cd55a062e763b9349921f0f5db8c3933288dc8ba4f76dd9416aac68acee3cb94",
+        urls = ["https://github.com/bazelbuild/bazel-skylib/releases/download/1.5.0/bazel-skylib-1.5.0.tar.gz"],
    )

    http_archive(
@ -55,9 +45,9 @@ def bazel_lib_internal_deps():

    http_archive(
        name = "buildifier_prebuilt",
-        sha256 = "72b5bb0853aac597cce6482ee6c62513318e7f2c0050bc7c319d75d03d8a3875",
-        strip_prefix = "buildifier-prebuilt-6.3.3",
-        urls = ["https://github.com/keith/buildifier-prebuilt/archive/6.3.3.tar.gz"],
+        sha256 = "8ada9d88e51ebf5a1fdff37d75ed41d51f5e677cdbeafb0a22dda54747d6e07e",
+        strip_prefix = "buildifier-prebuilt-6.4.0",
+        urls = ["http://github.com/keith/buildifier-prebuilt/archive/6.4.0.tar.gz"],
    )

    http_archive(
@ -69,9 +59,9 @@ def bazel_lib_internal_deps():

    http_archive(
        name = "bazel_features",
-        sha256 = "f3082bfcdca73dc77dcd68faace806135a2e08c230b02b1d9fbdbd7db9d9c450",
-        strip_prefix = "bazel_features-0.1.0",
-        url = "https://github.com/bazel-contrib/bazel_features/releases/download/v0.1.0/bazel_features-v0.1.0.tar.gz",
+        sha256 = "1aabce613b3ed83847b47efa69eb5dc9aa3ae02539309792a60e705ca4ab92a5",
+        strip_prefix = "bazel_features-0.2.0",
+        url = "https://github.com/bazel-contrib/bazel_features/releases/download/v0.2.0/bazel_features-v0.2.0.tar.gz",
    )

    # Register toolchains for tests
--- a/lib/repositories.bzl
+++ b/lib/repositories.bzl
@ -38,7 +38,7 @@ def register_jq_toolchains(name = DEFAULT_JQ_REPOSITORY, version = DEFAULT_JQ_VE
        register: whether to call through to native.register_toolchains.
            Should be True for WORKSPACE users, but false when used under bzlmod extension
    """
-    for [platform, meta] in JQ_PLATFORMS.items():
+    for [platform, _] in JQ_PLATFORMS.items():
        jq_platform_repo(
            name = "%s_%s" % (name, platform),
            platform = platform,
@ -66,7 +66,7 @@ def register_yq_toolchains(name = DEFAULT_YQ_REPOSITORY, version = DEFAULT_YQ_VE
        register: whether to call through to native.register_toolchains.
            Should be True for WORKSPACE users, but false when used under bzlmod extension
    """
-    for [platform, meta] in YQ_PLATFORMS.items():
+    for [platform, _] in YQ_PLATFORMS.items():
        yq_platform_repo(
            name = "%s_%s" % (name, platform),
            platform = platform,
@ -92,7 +92,7 @@ def register_tar_toolchains(name = DEFAULT_TAR_REPOSITORY, register = True):
        register: whether to call through to native.register_toolchains.
            Should be True for WORKSPACE users, but false when used under bzlmod extension
    """
-    for [platform, meta] in BSDTAR_PLATFORMS.items():
+    for [platform, _] in BSDTAR_PLATFORMS.items():
        bsdtar_binary_repo(
            name = "%s_%s" % (name, platform),
            platform = platform,
@ -215,7 +215,7 @@ def register_coreutils_toolchains(name = DEFAULT_COREUTILS_REPOSITORY, version =
        register: whether to call through to native.register_toolchains.
            Should be True for WORKSPACE users, but false when used under bzlmod extension
    """
-    for [platform, meta] in COREUTILS_PLATFORMS.items():
+    for [platform, _] in COREUTILS_PLATFORMS.items():
        coreutils_platform_repo(
            name = "%s_%s" % (name, platform),
            platform = platform,
@ -251,7 +251,7 @@ def register_copy_directory_toolchains(name = DEFAULT_COPY_DIRECTORY_REPOSITORY,
            native.register_toolchains("@%s_toolchains//:toolchain" % name)
        return

-    for [platform, meta] in COPY_DIRECTORY_PLATFORMS.items():
+    for [platform, _] in COPY_DIRECTORY_PLATFORMS.items():
        copy_directory_platform_repo(
            name = "%s_%s" % (name, platform),
            platform = platform,
@ -286,7 +286,7 @@ def register_copy_to_directory_toolchains(name = DEFAULT_COPY_TO_DIRECTORY_REPOS
            native.register_toolchains("@%s_toolchains//:toolchain" % name)
        return

-    for [platform, meta] in COPY_TO_DIRECTORY_PLATFORMS.items():
+    for [platform, _] in COPY_TO_DIRECTORY_PLATFORMS.items():
        copy_to_directory_platform_repo(
            name = "%s_%s" % (name, platform),
            platform = platform,
@ -321,7 +321,7 @@ def register_expand_template_toolchains(name = DEFAULT_EXPAND_TEMPLATE_REPOSITOR
            native.register_toolchains("@%s_toolchains//:toolchain" % name)
        return

-    for [platform, meta] in EXPAND_TEMPLATE_PLATFORMS.items():
+    for [platform, _] in EXPAND_TEMPLATE_PLATFORMS.items():
        expand_template_platform_repo(
            name = "%s_%s" % (name, platform),
            platform = platform,