chore: use bazel_lib instead of aspect_bazel_lib

Author: dcarp

.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

.prettierignore

@@ -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")

MODULE.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/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/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/BUILD.bazel

@@ -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/rules/common.bzl

@@ -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/private/sdk/BUILD.bazel

@@ -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.