Skip to content

Commit ddc97a6

Browse files
committed
auto formatting
1 parent 3ad4c60 commit ddc97a6

107 files changed

Lines changed: 160 additions & 199 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

WORKSPACE

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,20 @@
11
workspace(name = "rules_android")
22

33
load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
4-
54
load("prereqs.bzl", "rules_android_prereqs")
65

76
rules_android_prereqs(dev_mode = True)
87

98
load("@bazel_features//:deps.bzl", "bazel_features_deps")
9+
1010
bazel_features_deps()
1111

1212
load("@rules_cc//cc:extensions.bzl", "compatibility_proxy_repo")
13+
1314
compatibility_proxy_repo()
1415

1516
load("@rules_java//java:rules_java_deps.bzl", "rules_java_dependencies")
17+
1618
rules_java_dependencies()
1719

1820
# note that the following line is what is minimally required from protobuf for the java rules

android/rules.bzl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,12 @@
1515

1616
# Don't use relative paths since this file is coppied to //android/rules.bzl.
1717

18+
load(
19+
"//providers:providers.bzl",
20+
_AndroidAppsInfo = "AndroidAppsInfo",
21+
_ApkInfo = "ApkInfo",
22+
_StarlarkApkInfo = "StarlarkApkInfo",
23+
)
1824
load(
1925
"//rules:android_sdk.bzl",
2026
_android_sdk = "android_sdk",
@@ -27,12 +33,6 @@ load(
2733
"//rules:instrumented_app_info_aspect.bzl",
2834
_instrumented_app_info_aspect = "instrumented_app_info_aspect",
2935
)
30-
load(
31-
"//providers:providers.bzl",
32-
_AndroidAppsInfo = "AndroidAppsInfo",
33-
_ApkInfo = "ApkInfo",
34-
_StarlarkApkInfo = "StarlarkApkInfo",
35-
)
3636
load(
3737
"//rules/aar_import:rule.bzl",
3838
_aar_import = "aar_import",

defs.bzl

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,12 @@ def rules_android_workspace():
4242
# put anything into @maven for WORKSPACE mode.
4343
maven_install(
4444
name = "maven",
45-
artifacts = PROTOBUF_MAVEN_ARTIFACTS, # protobuf maven deps
46-
repositories = [ # protobuf maven deps
47-
"https://repo1.maven.org/maven2", # protobuf maven deps
48-
"https://maven.google.com", # protobuf maven deps
49-
], # protobuf maven deps
45+
artifacts = PROTOBUF_MAVEN_ARTIFACTS, # protobuf maven deps
46+
repositories = [
47+
# protobuf maven deps
48+
"https://repo1.maven.org/maven2", # protobuf maven deps
49+
"https://maven.google.com", # protobuf maven deps
50+
], # protobuf maven deps
5051
)
5152

5253
bazel_skylib_workspace()
@@ -153,7 +154,8 @@ def rules_android_workspace():
153154
# All lines in the artifacts list must be tagged "bazel worker api" for
154155
# the presubmit maven artifact consistency checker to pass.
155156
name = "bazel_worker_maven",
156-
artifacts = [ # bazel worker api
157+
artifacts = [
158+
# bazel worker api
157159
"com.google.code.gson:gson:2.10.1", # bazel worker api
158160
"com.google.errorprone:error_prone_annotations:2.23.0", # bazel worker api
159161
"com.google.guava:guava:33.0.0-jre", # bazel worker api

examples/basicapp/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
# Empty build file to satisfy gazelle for rules_go.
1+
# Empty build file to satisfy gazelle for rules_go.

examples/basicapp/MODULE.bazel

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,11 @@ module(
55
bazel_dep(name = "rules_java", version = "9.0.3")
66
bazel_dep(name = "bazel_skylib", version = "1.8.1")
77
bazel_dep(name = "rules_jvm_external", version = "6.7")
8-
98
bazel_dep(
109
name = "rules_android",
1110
version = "0.7.3",
1211
)
1312

14-
1513
# Local override to enable this app to be used for rules_android presubmit
1614
# integration testing. If you're basing your app's MODULE file on this
1715
# example, you do *not* need the following override.
@@ -22,7 +20,8 @@ local_path_override(
2220

2321
remote_android_extensions = use_extension(
2422
"@rules_android//bzlmod_extensions:android_extensions.bzl",
25-
"remote_android_tools_extensions")
23+
"remote_android_tools_extensions",
24+
)
2625
use_repo(remote_android_extensions, "android_tools")
2726

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

examples/basicapp/WORKSPACE

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,56 @@
11
local_repository(
22
name = "rules_android",
3-
path = "../..", # rules_android's WORKSPACE relative to this inner workspace
3+
path = "../..", # rules_android's WORKSPACE relative to this inner workspace
44
)
55

66
# --SNIP--: Everything below this line goes into the example WORKSPACE snippet in the release notes.
77

88
# Android rules dependencies
99
load("@rules_android//:prereqs.bzl", "rules_android_prereqs")
10+
1011
rules_android_prereqs()
1112

1213
load("@bazel_features//:deps.bzl", "bazel_features_deps")
14+
1315
bazel_features_deps()
1416

1517
load("@rules_cc//cc:extensions.bzl", "compatibility_proxy_repo")
18+
1619
compatibility_proxy_repo()
1720

1821
##### rules_java setup for rules_android #####
1922
load("@rules_java//java:rules_java_deps.bzl", "rules_java_dependencies")
23+
2024
rules_java_dependencies()
2125

2226
# note that the following line is what is minimally required from protobuf for the java rules
2327
# consider using the protobuf_deps() public API from @com_google_protobuf//:protobuf_deps.bzl
2428
load("@com_google_protobuf//bazel/private:proto_bazel_features.bzl", "proto_bazel_features") # buildifier: disable=bzl-visibility
29+
2530
proto_bazel_features(name = "proto_bazel_features")
31+
2632
# register toolchains
2733
load("@rules_java//java:repositories.bzl", "rules_java_toolchains")
34+
2835
rules_java_toolchains()
2936

3037
##### rules_jvm_external setup for rules_android #####
3138
load("@rules_jvm_external//:repositories.bzl", "rules_jvm_external_deps")
39+
3240
rules_jvm_external_deps()
41+
3342
load("@rules_jvm_external//:setup.bzl", "rules_jvm_external_setup")
43+
3444
rules_jvm_external_setup()
3545

3646
##### rules_android setup #####
3747
load("@rules_android//:defs.bzl", "rules_android_workspace")
48+
3849
rules_android_workspace()
3950

4051
# Android SDK setup
4152
load("@rules_android//rules:rules.bzl", "android_sdk_repository")
53+
4254
android_sdk_repository(
4355
name = "androidsdk",
4456
)

examples/basicapp/java/com/basicapp/BUILD

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
load(
22
"@rules_android//android:rules.bzl",
3-
"android_binary",
4-
"android_library",
5-
"android_application",
3+
"android_application",
4+
"android_binary",
5+
"android_library",
66
)
77

88
android_binary(

mobile_install/adapters/aar_import.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
# limitations under the License.
1414
"""Rule adapter for aar_import."""
1515

16+
load("@rules_java//java/common:java_info.bzl", "JavaInfo")
1617
load(
1718
"//mobile_install:providers.bzl",
1819
"MIAndroidAssetsInfo",
@@ -26,7 +27,6 @@ load("//mobile_install:transform.bzl", "dex")
2627
load("//providers:providers.bzl", "StarlarkAndroidResourcesInfo")
2728
load("//rules:java.bzl", _java = "java")
2829
load("//rules:visibility.bzl", "PROJECT_VISIBILITY")
29-
load("@rules_java//java/common:java_info.bzl", "JavaInfo")
3030
load(":base.bzl", "make_adapter")
3131
load(":desugar.bzl", "get_desugar_classpath")
3232

mobile_install/adapters/android_binary.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
# limitations under the License.
1414
"""Rule adapter for android_binary."""
1515

16+
load("@rules_java//java/common:java_info.bzl", "JavaInfo")
1617
load("//mobile_install:launcher_direct.bzl", "make_direct_launcher")
1718
load("//mobile_install:process.bzl", "process")
1819
load(
@@ -27,7 +28,6 @@ load("//mobile_install:utils.bzl", "utils")
2728
load("//providers:providers.bzl", "AndroidBinaryNativeLibsInfo", "AndroidBuildStampInfo", "AndroidIdeInfo")
2829
load("//rules:visibility.bzl", "PROJECT_VISIBILITY")
2930
load("//rules/flags:flags.bzl", "flags")
30-
load("@rules_java//java/common:java_info.bzl", "JavaInfo")
3131
load(":base.bzl", "make_adapter")
3232
load(":desugar.bzl", "get_desugar_classpath")
3333

mobile_install/adapters/android_library.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
# limitations under the License.
1414
"""Rule adapter for android_library."""
1515

16+
load("@rules_java//java/common:java_info.bzl", "JavaInfo")
1617
load(
1718
"//mobile_install:providers.bzl",
1819
"MIAndroidAarNativeLibsInfo",
@@ -27,7 +28,6 @@ load("//mobile_install:tools.bzl", "TOOLCHAIN_TYPES")
2728
load("//mobile_install:transform.bzl", "dex", "filter_jars")
2829
load("//providers:providers.bzl", "AndroidIdeInfo")
2930
load("//rules:visibility.bzl", "PROJECT_VISIBILITY")
30-
load("@rules_java//java/common:java_info.bzl", "JavaInfo")
3131
load(":base.bzl", "make_adapter")
3232
load(":desugar.bzl", "get_desugar_classpath")
3333

0 commit comments

Comments
 (0)