Skip to content
Merged
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
4 changes: 2 additions & 2 deletions MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ module(
compatibility_level = 1,
)

bazel_dep(name = "hermetic_android_toolchains", version = "0.1.1", dev_dependency = True)
bazel_dep(name = "hermetic_android_toolchains", version = "0.2.0", dev_dependency = True)

bazel_dep(name = "rules_android", version = "0.7.3")
bazel_dep(name = "rules_java", version = "9.3.0")
Expand Down Expand Up @@ -42,12 +42,12 @@ android.sdk(
build_tools_version = "35.0.0",
version = "34",
)
android.ndk(version = "r25c")
use_repo(android, "androidsdk")

rules_android_sdk = use_extension(
"@rules_android//rules/android_sdk_repository:rule.bzl",
"android_sdk_repository_extension",
dev_dependency = True,
)

override_repo(rules_android_sdk, "androidsdk")
Expand Down
11 changes: 7 additions & 4 deletions examples/simple-android/MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -11,24 +11,27 @@ local_path_override(
path = "../../",
)

bazel_dep(name = "hermetic_android_toolchains", version = "0.1.1")
bazel_dep(name = "hermetic_android_toolchains", version = "0.2.0", dev_dependency = True)

bazel_dep(name = "platforms", version = "1.1.0")
bazel_dep(name = "rules_android", version = "0.7.3")
bazel_dep(name = "rules_jvm_external", version = "7.0")

android = use_extension("@hermetic_android_toolchains//:extensions.bzl", "android")
android = use_extension("@hermetic_android_toolchains//:extensions.bzl", "android", dev_dependency = True)
android.sdk(
build_tools_version = "35.0.0",
version = "34",
)
android.ndk(version = "r25c")
use_repo(android, "androidsdk")

rules_android_sdk = use_extension("@rules_android//rules/android_sdk_repository:rule.bzl", "android_sdk_repository_extension")

override_repo(rules_android_sdk, "androidsdk")

register_toolchains("@androidsdk//:all")
register_toolchains(
"@androidsdk//:all",
dev_dependency = True,
)

maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
maven.install(
Expand Down
17 changes: 10 additions & 7 deletions tests/scripts/lint_helper.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ function set_up_lint_workspace() {
cat > "${dest}/MODULE.bazel" <<EOF
module(name = "rules_android_lint")

bazel_dep(name = "hermetic_android_toolchains", version = "0.1.1", dev_dependency = True)
bazel_dep(name = "hermetic_android_toolchains", version = "0.2.0", dev_dependency = True)
bazel_dep(name = "rules_android", version = "0.7.3")
bazel_dep(name = "rules_java", version = "9.3.0")
bazel_dep(name = "rules_python", version = "1.7.0")
Expand All @@ -45,7 +45,6 @@ android.sdk(
build_tools_version = "35.0.0",
version = "34",
)
android.ndk(version = "r25c")
use_repo(android, "androidsdk")

rules_android_sdk = use_extension(
Expand Down Expand Up @@ -112,30 +111,34 @@ EOF
# The consumer workspace, in the CWD.
cat > MODULE.bazel <<EOF
bazel_dep(name = "rules_android_lint")
bazel_dep(name = "hermetic_android_toolchains", version = "0.1.1")
bazel_dep(name = "hermetic_android_toolchains", version = "0.2.0", dev_dependency = True)
bazel_dep(name = "rules_android", version = "0.7.3")

local_path_override(
module_name = "rules_android_lint",
path = "${dest}",
)

android = use_extension("@hermetic_android_toolchains//:extensions.bzl", "android")
android = use_extension(
"@hermetic_android_toolchains//:extensions.bzl",
"android",
dev_dependency = True,
)
android.sdk(
build_tools_version = "35.0.0",
version = "34",
)
android.ndk(version = "r25c")
use_repo(android, "androidsdk")

rules_android_sdk = use_extension(
"@rules_android//rules/android_sdk_repository:rule.bzl",
"android_sdk_repository_extension",
dev_dependency = True,
)
override_repo(rules_android_sdk, "androidsdk")

register_toolchains("@androidsdk//:all")
register_toolchains("//toolchains:default_toolchain")
register_toolchains("@androidsdk//:all", dev_dependency = True)
register_toolchains("//toolchains:default_toolchain", dev_dependency = True)
EOF

mkdir -p toolchains
Expand Down
Loading