Skip to content

Commit 7bc32fe

Browse files
ted-xiecopybara-github
authored andcommitted
Merge #523 by ted-xie: Add @bazel_features
Needed for an upcoming change. Closes #523 COPYBARA_INTEGRATE_REVIEW=#523 from ted-xie:bazel-features-repo 9a17600 PiperOrigin-RevId: 930781047 Change-Id: I5ab9942a0e31133ada5e5c6e7c64edd89e3671fa
1 parent 3400569 commit 7bc32fe

3 files changed

Lines changed: 6 additions & 3 deletions

File tree

MODULE.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ use_repo(rules_java_toolchains, "remote_java_tools")
1818
bazel_dep(name = "protobuf", version = "33.4", repo_name = "com_google_protobuf")
1919
bazel_dep(name = "rules_jvm_external", version = "6.9")
2020
bazel_dep(name = "bazel_skylib", version = "1.8.1")
21+
bazel_dep(name = "bazel_features", version = "1.48.1")
2122
bazel_dep(name = "rules_robolectric", version = "4.14.1.2", repo_name = "robolectric")
2223

2324
register_toolchains("//toolchains/android:all")

defs.bzl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
# limitations under the License.
1414
"""Workspace setup macro for rules_android."""
1515

16+
load("@bazel_features//:deps.bzl", "bazel_features_deps")
1617
load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies", "go_repository")
1718
load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")
1819
load("@com_google_protobuf//:protobuf_deps.bzl", "PROTOBUF_MAVEN_ARTIFACTS", "protobuf_deps")
@@ -33,6 +34,7 @@ load("@rules_shell//shell:repositories.bzl", "rules_shell_dependencies", "rules_
3334
def rules_android_workspace():
3435
""" Sets up workspace dependencies for rules_android."""
3536

37+
bazel_features_deps()
3638
protobuf_deps()
3739

3840
# Note: We have to manually set up @maven deps here. rules_android has a

prereqs.bzl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ def rules_android_prereqs(dev_mode = False):
2424
maybe(
2525
http_archive,
2626
name = "bazel_features",
27-
sha256 = "a660027f5a87f13224ab54b8dc6e191693c554f2692fcca46e8e29ee7dabc43b",
28-
strip_prefix = "bazel_features-1.30.0",
29-
url = "https://github.com/bazel-contrib/bazel_features/releases/download/v1.30.0/bazel_features-v1.30.0.tar.gz",
27+
sha256 = "89eca73d4c334cf664f84920365d2ce04e2c98099b89f7c5b676b5f377c8e754",
28+
strip_prefix = "bazel_features-1.48.1",
29+
url = "https://github.com/bazel-contrib/bazel_features/releases/download/v1.48.1/bazel_features-v1.48.1.tar.gz",
3030
)
3131

3232
maybe(

0 commit comments

Comments
 (0)