chore: use bazel_lib instead of aspect_bazel_lib

.gitattributes

@@ -1,6 +1,3 @@
-# In code review, collapse generated files
-docs/*.md linguist-generated=true
-
 #################################
 # Configuration for 'git archive'
 # See https://git-scm.com/docs/git-archive#ATTRIBUTES

.pre-commit-config.yaml

@@ -23,10 +23,6 @@ repos:
       - id: destroyed-symlinks
       - id: detect-private-key
       - id: end-of-file-fixer
-        exclude: |
-          (?x)^(
-            docs/
-          )
       - id: trailing-whitespace
   # Check formatting and lint for starlark code
   - repo: https://github.com/keith/pre-commit-buildifier

MODULE.bazel

@@ -6,7 +6,7 @@ module(
     compatibility_level = 1,
 )
 
-bazel_dep(name = "aspect_bazel_lib", version = "2.19.1")
+bazel_dep(name = "bazel_lib", version = "3.0.0")
 bazel_dep(name = "bazel_features", version = "1.32.0")
 bazel_dep(name = "bazel_skylib", version = "1.8.1")
 bazel_dep(name = "package_metadata", version = "0.0.5")

d/BUILD.bazel

@@ -1,4 +1,4 @@
-load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
+load("@bazel_lib//:bzl_library.bzl", "bzl_library")
 load("//d/private:resolved_toolchain.bzl", "resolved_toolchain")
 
 # For stardoc to reference the files
@@ -38,6 +38,7 @@ bzl_library(
     deps = [
         "//d/private:toolchains_repo",
         "//d/private/sdk:versions",
+        "@bazel_tools//tools/build_defs/repo:cache.bzl",
         "@bazel_tools//tools/build_defs/repo:http.bzl",
         "@bazel_tools//tools/build_defs/repo:utils.bzl",
     ],

d/private/BUILD.bazel

@@ -1,4 +1,4 @@
-load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
+load("@bazel_lib//:bzl_library.bzl", "bzl_library")
 
 bzl_library(
     name = "toolchains_repo",

d/private/rules/BUILD.bazel

@@ -1,4 +1,4 @@
-load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
+load("@bazel_lib//:bzl_library.bzl", "bzl_library")
 
 exports_files(
     glob(["*.bzl"]),
@@ -24,7 +24,7 @@ bzl_library(
     ],
     deps = [
         "//d/private:providers",
-        "@aspect_bazel_lib//lib:expand_make_vars",
+        "@bazel_lib//lib:expand_make_vars",
         "@bazel_skylib//lib:dicts",
         "@bazel_skylib//lib:paths",
         "@rules_cc//cc/common",

d/private/rules/common.bzl

@@ -1,6 +1,6 @@
 """Common definitions for D rules."""
 
-load("@aspect_bazel_lib//lib:expand_make_vars.bzl", "expand_variables")
+load("@bazel_lib//lib:expand_make_vars.bzl", "expand_variables")
 load("@bazel_skylib//lib:dicts.bzl", "dicts")
 load("@bazel_skylib//lib:paths.bzl", "paths")
 load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")

d/private/sdk/BUILD.bazel

@@ -1,4 +1,4 @@
-load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
+load("@bazel_lib//:bzl_library.bzl", "bzl_library")
 
 bzl_library(
     name = "versions",

d/repositories.bzl

@@ -105,6 +105,7 @@ def d_register_toolchains(name, register = True, **kwargs):
     - create a repository exposing toolchains for each platform like "d_platforms"
     - register a toolchain pointing at each platform
     Users can avoid this macro and do these steps themselves, if they want more control.
+
     Args:
         name: base name for all created repos, like "d1_14"
         register: whether to call through to native.register_toolchains.

e2e/smoke/WORKSPACE.bazel

@@ -7,17 +7,31 @@ local_repository(
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
 http_archive(
-    name = "aspect_bazel_lib",
-    sha256 = "63ae96db9b9ea3821320e4274352980387dc3218baeea0387f7cf738755d0f16",
-    strip_prefix = "bazel-lib-2.19.1",
-    url = "https://github.com/bazel-contrib/bazel-lib/releases/download/v2.19.1/bazel-lib-v2.19.1.tar.gz",
+    name = "bazel_lib",
+    sha256 = "6fd3b1e1a38ca744f9664be4627ced80895c7d2ee353891c172f1ab61309c933",
+    strip_prefix = "bazel-lib-3.0.0",
+    url = "https://github.com/bazel-contrib/bazel-lib/releases/download/v3.0.0/bazel-lib-v3.0.0.tar.gz",
 )
 
-load("@aspect_bazel_lib//lib:repositories.bzl", "aspect_bazel_lib_dependencies", "aspect_bazel_lib_register_toolchains")
+load("@bazel_lib//lib:repositories.bzl", "bazel_lib_dependencies", "bazel_lib_register_toolchains")
 
-aspect_bazel_lib_dependencies()
+bazel_lib_dependencies()
 
-aspect_bazel_lib_register_toolchains()
+load("@rules_shell//shell:repositories.bzl", "rules_shell_dependencies", "rules_shell_toolchains")
+
+rules_shell_dependencies()
+
+rules_shell_toolchains()
+
+bazel_lib_register_toolchains()
+
+load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
+load("@platforms//host:extension.bzl", "host_platform_repo")
+
+maybe(
+    host_platform_repo,
+    name = "host_platform",
+)
 
 http_archive(
     name = "bazel_features",

tools/BUILD.bazel

@@ -8,6 +8,7 @@ bazelrc_preset(
     tags = ["manual"],
 )
 
+# gazelle:map_kind bzl_library bzl_library @bazel_lib//:bzl_library.bzl
 gazelle_binary(
     name = "gazelle_bin",
     languages = ["@bazel_skylib_gazelle_plugin//bzl"],