refactor: remove vendored is_bazel_7_or_greater from bazel-lib; use u…

…pstream instead (#1578)
aspect-build · Apr 28, 2024 · f0920ad · f0920ad
1 parent b7c397f
commit f0920ad
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 12 deletions.
diff --git a/js/BUILD.bazel b/js/BUILD.bazel
@@ -1,8 +1,8 @@
 "Public API"
 
+load("@aspect_bazel_lib//lib:utils.bzl", "is_bazel_7_or_greater")
 load("@bazel_features//:features.bzl", "bazel_features")
 load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
-load("//js/private:is_bazel_7_or_greater.bzl", "is_bazel_7_or_greater")
 
 exports_files(
     glob(["*.bzl"]),

diff --git a/js/private/BUILD.bazel b/js/private/BUILD.bazel
@@ -1,10 +1,10 @@
 "Internal implementation details"
 
 load("@aspect_bazel_lib//lib:copy_to_bin.bzl", "copy_to_bin")
+load("@aspect_bazel_lib//lib:utils.bzl", "is_bazel_7_or_greater")
 load("@aspect_bazel_lib//lib:write_source_files.bzl", "write_source_files")
 load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
 load("//js:defs.bzl", "js_binary")
-load("//js/private:is_bazel_7_or_greater.bzl", "is_bazel_7_or_greater")
 
 exports_files(
     glob(["*.bzl"]),

diff --git a/js/private/is_bazel_7_or_greater.bzl b/js/private/is_bazel_7_or_greater.bzl
diff --git a/npm/private/BUILD.bazel b/npm/private/BUILD.bazel
@@ -1,12 +1,10 @@
 "Internal implementation details"
 
 load("@aspect_bazel_lib//lib:testing.bzl", "assert_contains")
+load("@aspect_bazel_lib//lib:utils.bzl", "is_bazel_7_or_greater")
 load("@aspect_rules_js//js:defs.bzl", "js_library")
 load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
 
-# buildifier: disable=bzl-visibility
-load("//js/private:is_bazel_7_or_greater.bzl", "is_bazel_7_or_greater")
-
 js_library(
     name = "npm_publish_mjs",
     srcs = ["npm_publish.mjs"],