Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use a more recent rules_android #1185

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@ build --explicit_java_test_deps

build --experimental_sibling_repository_layout

# For rules_android
# Delete these once https://github.com/bazelbuild/rules_android/issues/219 is resolved.
common --experimental_google_legacy_api
common --experimental_enable_android_migration_apis

# Make sure we get something helpful when tests fail
test --verbose_failures
test --test_output=errors
Expand Down
11 changes: 9 additions & 2 deletions MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,23 @@ bazel_dep(
)
bazel_dep(
name = "rules_android",
version = "0.1.1",
version = "0.2.0",
)
bazel_dep(
name = "stardoc",
version = "0.5.6",
repo_name = "io_bazel_stardoc",
)

# Use a more recent rules_android
git_override(
module_name = "rules_android",
remote = "https://github.com/bazelbuild/rules_android.git",
commit = "1124b494b30b5626c934a6644ac8236cdcd34645",
)

# Remove this once rules_android has rolled out official Bzlmod support
remote_android_extensions = use_extension("@bazel_tools//tools/android:android_extensions.bzl", "remote_android_tools_extensions")
remote_android_extensions = use_extension("@rules_android//bzlmod_extensions:android_extensions.bzl", "remote_android_tools_extensions")
use_repo(remote_android_extensions, "android_gmaven_r8", "android_tools")

maven = use_extension(":extensions.bzl", "maven")
Expand Down
1 change: 1 addition & 0 deletions tests/unit/aar_import/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
# limitations under the License.

load("@bazel_skylib//rules:build_test.bzl", "build_test")
load("@rules_android//rules:rules.bzl", "aar_import")
load(":aar_import_test.bzl", "aar_import_test_suite")

aar_import(
Expand Down