Merge #523 by ted-xie: Add `@bazel_features` Needed for an upcoming change. Closes #523 COPYBARA_INTEGRATE_REVIEW=https://github.com/bazelbuild/rules_android/pull/523 from ted-xie:bazel-features-repo 9a17600f69517da13b28147e856ceea5210fcd79 PiperOrigin-RevId: 930781047 Change-Id: I5ab9942a0e31133ada5e5c6e7c64edd89e3671fa
diff --git a/MODULE.bazel b/MODULE.bazel index 29dfce2..943528b 100644 --- a/MODULE.bazel +++ b/MODULE.bazel
@@ -18,6 +18,7 @@ bazel_dep(name = "protobuf", version = "33.4", repo_name = "com_google_protobuf") bazel_dep(name = "rules_jvm_external", version = "6.9") bazel_dep(name = "bazel_skylib", version = "1.8.1") +bazel_dep(name = "bazel_features", version = "1.48.1") bazel_dep(name = "rules_robolectric", version = "4.14.1.2", repo_name = "robolectric") register_toolchains("//toolchains/android:all")
diff --git a/defs.bzl b/defs.bzl index 0780190..a090061 100644 --- a/defs.bzl +++ b/defs.bzl
@@ -13,6 +13,7 @@ # limitations under the License. """Workspace setup macro for rules_android.""" +load("@bazel_features//:deps.bzl", "bazel_features_deps") load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies", "go_repository") load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace") load("@com_google_protobuf//:protobuf_deps.bzl", "PROTOBUF_MAVEN_ARTIFACTS", "protobuf_deps") @@ -33,6 +34,7 @@ def rules_android_workspace(): """ Sets up workspace dependencies for rules_android.""" + bazel_features_deps() protobuf_deps() # Note: We have to manually set up @maven deps here. rules_android has a
diff --git a/prereqs.bzl b/prereqs.bzl index a4fa5d2..72fe861 100644 --- a/prereqs.bzl +++ b/prereqs.bzl
@@ -24,9 +24,9 @@ maybe( http_archive, name = "bazel_features", - sha256 = "a660027f5a87f13224ab54b8dc6e191693c554f2692fcca46e8e29ee7dabc43b", - strip_prefix = "bazel_features-1.30.0", - url = "https://github.com/bazel-contrib/bazel_features/releases/download/v1.30.0/bazel_features-v1.30.0.tar.gz", + sha256 = "89eca73d4c334cf664f84920365d2ce04e2c98099b89f7c5b676b5f377c8e754", + strip_prefix = "bazel_features-1.48.1", + url = "https://github.com/bazel-contrib/bazel_features/releases/download/v1.48.1/bazel_features-v1.48.1.tar.gz", ) maybe(