Skip to content

Commit 8ab67ca

Browse files
ted-xiecopybara-github
authored andcommitted
Prepare for 0.6.0
Closes #295 COPYBARA_INTEGRATE_REVIEW=#295 from ted-xie:cosmetic_stuff 9622296 PiperOrigin-RevId: 705929914 Change-Id: I77ee4abfa11c6c7c4708d032b59f20bb08174ac1
1 parent a1e745b commit 8ab67ca

File tree

3 files changed

+28
-13
lines changed

3 files changed

+28
-13
lines changed

.bcr/presubmit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ bcr_test_module:
22
module_path: examples/basicapp
33
matrix:
44
platform: ["ubuntu2004", "macos", "windows"]
5-
bazel: ["7.2.1", "7.4.0", "8.x", "rolling"]
5+
bazel: ["7.4.1", "8.0.0", "rolling"]
66
tasks:
77
run_test_module:
88
name: "Verify build targets with bzlmod"

MODULE.bazel

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,7 @@ use_repo(rules_java_toolchains, "remote_java_tools")
1717
bazel_dep(name = "protobuf", version = "29.0", repo_name = "com_google_protobuf")
1818
bazel_dep(name = "rules_jvm_external", version = "6.6")
1919
bazel_dep(name = "bazel_skylib", version = "1.0.3")
20-
bazel_dep(name = "rules_robolectric", version = "4.14.1", repo_name = "robolectric")
21-
22-
# To include PR #123
23-
git_override(
24-
module_name = "rules_robolectric",
25-
commit = "f38b7365361f382ecdad255af69b37413dd48ead",
26-
remote = "https://github.com/robolectric/robolectric-bazel",
27-
)
20+
bazel_dep(name = "rules_robolectric", version = "4.14.1.2", repo_name = "robolectric")
2821

2922
register_toolchains("//toolchains/android:all")
3023

README.md

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,37 @@ To use the Starlark Bazel Android rules, add the following to your WORKSPACE fil
3030
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
3131
http_archive(
3232
name = "rules_android",
33-
sha256 = "fc6b022e97c2d5893aa3dd01b480f37cd386d82fc7e14edbcba393cd390a244e",
34-
strip_prefix = "rules_android-0.6.0",
35-
url = "https://github.com/bazelbuild/rules_android/releases/download/v0.6.0/rules_android-v0.6.0.tar.gz",
33+
sha256 = "fe3d8c4955857b44019d83d05a0b15c2a0330a6a0aab990575bb397e9570ff1b",
34+
strip_prefix = "rules_android-0.6.0-alpha1",
35+
url = "https://github.com/bazelbuild/rules_android/releases/download/v0.6.0-alpha1/rules_android-v0.6.0-alpha1.tar.gz",
3636
)
37+
38+
# Android rules dependencies
3739
load("@rules_android//:prereqs.bzl", "rules_android_prereqs")
3840
rules_android_prereqs()
41+
42+
##### rules_java setup for rules_android #####
43+
load("@rules_java//java:rules_java_deps.bzl", "rules_java_dependencies")
44+
rules_java_dependencies()
45+
# note that the following line is what is minimally required from protobuf for the java rules
46+
# consider using the protobuf_deps() public API from @com_google_protobuf//:protobuf_deps.bzl
47+
load("@com_google_protobuf//bazel/private:proto_bazel_features.bzl", "proto_bazel_features") # buildifier: disable=bzl-visibility
48+
proto_bazel_features(name = "proto_bazel_features")
49+
# register toolchains
50+
load("@rules_java//java:repositories.bzl", "rules_java_toolchains")
51+
rules_java_toolchains()
52+
53+
##### rules_jvm_external setup for rules_android #####
54+
load("@rules_jvm_external//:repositories.bzl", "rules_jvm_external_deps")
55+
rules_jvm_external_deps()
56+
load("@rules_jvm_external//:setup.bzl", "rules_jvm_external_setup")
57+
rules_jvm_external_setup()
58+
59+
##### rules_android setup #####
3960
load("@rules_android//:defs.bzl", "rules_android_workspace")
4061
rules_android_workspace()
4162

63+
# Android SDK setup
4264
load("@rules_android//rules:rules.bzl", "android_sdk_repository")
4365
android_sdk_repository(
4466
name = "androidsdk",
@@ -75,4 +97,4 @@ android_binary(
7597
android_library(
7698
...
7799
)
78-
```
100+
```

0 commit comments

Comments
 (0)