Skip to content

Rename @rules_android_maven to @maven. #428

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.

Sign up for GitHub

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

Open
ted-xie wants to merge 1 commit into
base: main
Choose a base branch
from
+337 −337
Open

Rename @rules_android_maven to @maven. #428

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 9 additions & 9 deletions MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ bazel_dep(name = "stardoc", version = "0.7.2", dev_dependency = True)
rules_java_toolchains = use_extension("@rules_java//java:extensions.bzl", "toolchains")
use_repo(rules_java_toolchains, "remote_java_tools")

bazel_dep(name = "protobuf", version = "31.1", repo_name = "com_google_protobuf")
bazel_dep(name = "protobuf", version = "33.1", repo_name = "com_google_protobuf")
bazel_dep(name = "rules_jvm_external", version = "6.6")
bazel_dep(name = "bazel_skylib", version = "1.0.3")
bazel_dep(name = "rules_robolectric", version = "4.14.1.2", repo_name = "robolectric")
Expand Down Expand Up @@ -79,8 +79,8 @@ maven.install(
# These technically aren't needed, but the protobuf version pulled
# in by these older deps has compatibility issues with the newer
# protobuf runtimes.
"com.google.protobuf:protobuf-java:4.31.1",
"com.google.protobuf:protobuf-java-util:4.31.1",
"com.google.protobuf:protobuf-java:4.33.1",
"com.google.protobuf:protobuf-java-util:4.33.1",
],
repositories = [
"https://maven.google.com",
Expand All @@ -90,7 +90,7 @@ maven.install(
)
use_repo(maven, "android_ide_common_30_1_3")
maven.install(
name = "rules_android_maven",
name = "maven",
aar_import_bzl_label = "@rules_android//rules:rules.bzl",
artifacts = [
"androidx.privacysandbox.tools:tools:1.0.0-alpha06",
Expand All @@ -117,8 +117,8 @@ maven.install(
"jakarta.inject:jakarta.inject-api:2.0.1",
"junit:junit:4.13.2",
"com.beust:jcommander:1.82",
"com.google.protobuf:protobuf-java:4.31.1",
"com.google.protobuf:protobuf-java-util:4.31.1",
"com.google.protobuf:protobuf-java:4.33.1",
"com.google.protobuf:protobuf-java-util:4.33.1",
"com.google.code.findbugs:jsr305:3.0.2",
"androidx.databinding:databinding-compiler:8.7.0",
"org.ow2.asm:asm:9.6",
Expand Down Expand Up @@ -156,14 +156,14 @@ maven.install(
"https://repo1.maven.org/maven2",
],
# To generate, run:
# REPIN=1 bazelisk run --enable_bzlmod @rules_android_maven//:pin
# lock_file = "//:rules_android_maven_install.json",
# REPIN=1 bazelisk run --enable_bzlmod @maven//:pin
# lock_file = "//:maven_install.json",
use_starlark_android_rules = True,
)

use_repo(
maven,
"rules_android_maven",
"maven",
)

remote_android_extensions = use_extension("//bzlmod_extensions:android_extensions.bzl", "remote_android_tools_extensions")
Expand Down
4 changes: 2 additions & 2 deletions bzlmod_extensions/apksig.BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ java_binary(
main_class = "com.android.apksigner.ApkSignerTool",
visibility = ["//visibility:public"],
deps = [
"@rules_android_maven//:org_bouncycastle_bcprov_jdk18on",
"@rules_android_maven//:org_conscrypt_conscrypt_openjdk_uber",
"@maven//:org_bouncycastle_bcprov_jdk18on",
"@maven//:org_conscrypt_conscrypt_openjdk_uber",
],
)
56 changes: 28 additions & 28 deletions src/tools/java/com/google/devtools/build/android/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ java_binary(
main_class = "com.google.devtools.build.android.ResourceProcessorBusyBox",
# Do not sort: Deps order matters until android_tools.jar deps are deleted (b/393172052).
runtime_deps = [
"@rules_android_maven//:com_android_tools_build_aapt2_proto",
"@rules_android_maven//:com_google_guava_guava",
"@maven//:com_android_tools_build_aapt2_proto",
"@maven//:com_google_guava_guava",
":android_builder_lib",
],
)
Expand Down Expand Up @@ -94,11 +94,11 @@ java_library(
"@android_ide_common_30_1_3//:com_android_tools_sdk_common",
"@bazel_worker_java//:worker_protocol_java_proto",
"@bazel_worker_java//src/main/java/com/google/devtools/build/lib/worker:work_request_handlers",
"@rules_android_maven//:com_beust_jcommander",
"@rules_android_maven//:com_google_code_findbugs_jsr305",
"@rules_android_maven//:com_google_errorprone_error_prone_annotations",
"@rules_android_maven//:com_google_guava_guava",
"@rules_android_maven//:com_google_protobuf_protobuf_java",
"@maven//:com_beust_jcommander",
"@maven//:com_google_code_findbugs_jsr305",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
":android_common_30_1_3",
":android_databinding_wrapper_lib",
":android_options_utils",
Expand All @@ -120,9 +120,9 @@ java_library(
],
# Do not sort: Deps order matters until android_tools.jar deps are deleted (b/393172052).
deps = [
"@rules_android_maven//:com_android_tools_r8",
"@rules_android_maven//:com_beust_jcommander",
"@rules_android_maven//:com_google_guava_guava",
"@maven//:com_android_tools_r8",
"@maven//:com_beust_jcommander",
"@maven//:com_google_guava_guava",
":android_builder_lib",
"//src/tools/java/com/google/devtools/build/android/r8",
"//src/tools/java/com/google/devtools/build/android/r8:constants",
Expand Down Expand Up @@ -152,7 +152,7 @@ java_library(
name = "android_common_30_1_3",
# Do not sort: Deps order matters until android_tools.jar deps are deleted (b/393172052).
exports = [
"@rules_android_maven//:com_android_signflinger",
"@maven//:com_android_signflinger",
"@android_ide_common_30_1_3//:com_android_tools_analytics_library_protos",
"@android_ide_common_30_1_3//:com_android_tools_analytics_library_shared",
"@android_ide_common_30_1_3//:com_android_tools_analytics_library_tracker",
Expand All @@ -163,20 +163,20 @@ java_library(
"@android_ide_common_30_1_3//:com_android_tools_annotations",
"@android_ide_common_30_1_3//:com_android_tools_layoutlib_layoutlib_api",
"@android_ide_common_30_1_3//:com_android_tools_repository",
"@rules_android_maven//:com_android_tools_build_aapt2_proto",
"@rules_android_maven//:com_android_tools_build_apksig",
"@rules_android_maven//:com_android_tools_build_apkzlib",
"@rules_android_maven//:com_android_tools_ddms_ddmlib",
"@rules_android_maven//:com_android_tools_dvlib",
"@rules_android_maven//:com_android_tools_sdk_common",
"@rules_android_maven//:com_android_tools_sdklib",
"@rules_android_maven//:com_android_zipflinger",
"@rules_android_maven//:org_glassfish_jaxb_jaxb_runtime",
"@rules_android_maven//:org_jetbrains_kotlin_kotlin_stdlib_jdk7",
"@rules_android_maven//:org_ow2_asm_asm",
"@rules_android_maven//:org_ow2_asm_asm_commons",
"@rules_android_maven//:org_ow2_asm_asm_tree",
"@rules_android_maven//:org_ow2_asm_asm_util",
"@maven//:com_android_tools_build_aapt2_proto",
"@maven//:com_android_tools_build_apksig",
"@maven//:com_android_tools_build_apkzlib",
"@maven//:com_android_tools_ddms_ddmlib",
"@maven//:com_android_tools_dvlib",
"@maven//:com_android_tools_sdk_common",
"@maven//:com_android_tools_sdklib",
"@maven//:com_android_zipflinger",
"@maven//:org_glassfish_jaxb_jaxb_runtime",
"@maven//:org_jetbrains_kotlin_kotlin_stdlib_jdk7",
"@maven//:org_ow2_asm_asm",
"@maven//:org_ow2_asm_asm_commons",
"@maven//:org_ow2_asm_asm_tree",
"@maven//:org_ow2_asm_asm_util",
],
)

Expand All @@ -195,8 +195,8 @@ java_library(
"//src/tools/javatests/com/google/devtools/build/android:__pkg__",
],
deps = [
"@rules_android_maven//:com_beust_jcommander",
"@rules_android_maven//:com_google_code_findbugs_jsr305",
"@rules_android_maven//:com_google_guava_guava",
"@maven//:com_beust_jcommander",
"@maven//:com_google_code_findbugs_jsr305",
"@maven//:com_google_guava_guava",
],
)
4 changes: 2 additions & 2 deletions src/tools/java/com/google/devtools/build/android/desugar/dependencies/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ java_library(
deps = [
"//src/tools/java/com/google/devtools/build/android/r8:deps_collector_api",
"//third_party/bazel/src/main/protobuf:desugar_deps_java_proto",
"@rules_android_maven//:com_google_code_findbugs_jsr305",
"@rules_android_maven//:com_google_guava_guava",
"@maven//:com_google_code_findbugs_jsr305",
"@maven//:com_google_guava_guava",
],
)

Expand Down
18 changes: 9 additions & 9 deletions src/tools/java/com/google/devtools/build/android/desugar/io/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@ java_library(
"//src/tools/java/com/google/devtools/build/android/desugar/langmodel",
"//src/tools/java/com/google/devtools/build/android/ziputils:ziputils_lib",
"//tools/android:autovalue",
"@rules_android_maven//:com_google_auto_value_auto_value",
"@rules_android_maven//:com_google_code_findbugs_jsr305",
"@rules_android_maven//:com_google_errorprone_error_prone_annotations",
"@rules_android_maven//:com_google_flogger_flogger",
"@rules_android_maven//:com_google_guava_guava",
"@rules_android_maven//:jakarta_inject_jakarta_inject_api",
"@rules_android_maven//:org_ow2_asm_asm",
"@rules_android_maven//:org_ow2_asm_asm_commons",
"@rules_android_maven//:org_ow2_asm_asm_tree",
"@maven//:com_google_auto_value_auto_value",
"@maven//:com_google_code_findbugs_jsr305",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_flogger_flogger",
"@maven//:com_google_guava_guava",
"@maven//:jakarta_inject_jakarta_inject_api",
"@maven//:org_ow2_asm_asm",
"@maven//:org_ow2_asm_asm_commons",
"@maven//:org_ow2_asm_asm_tree",
],
)

Expand Down
14 changes: 7 additions & 7 deletions src/tools/java/com/google/devtools/build/android/desugar/langmodel/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ java_library(
deps = [
":desugar_class_attr_java_proto",
"//tools/android:autovalue",
"@rules_android_maven//:com_google_code_findbugs_jsr305",
"@rules_android_maven//:com_google_errorprone_error_prone_annotations",
"@rules_android_maven//:com_google_guava_guava",
"@rules_android_maven//:com_google_protobuf_protobuf_java",
"@rules_android_maven//:org_ow2_asm_asm",
"@rules_android_maven//:org_ow2_asm_asm_commons",
"@rules_android_maven//:org_ow2_asm_asm_tree",
"@maven//:com_google_code_findbugs_jsr305",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven//:org_ow2_asm_asm",
"@maven//:org_ow2_asm_asm_commons",
"@maven//:org_ow2_asm_asm_tree",
],
)

Expand Down
12 changes: 6 additions & 6 deletions src/tools/java/com/google/devtools/build/android/desugar/scan/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ java_library(
"//src/tools/java/com/google/devtools/build/android:android_builder_lib",
"//src/tools/java/com/google/devtools/build/android:android_options_utils",
"//src/tools/java/com/google/devtools/build/android/desugar/io",
"@rules_android_maven//:com_beust_jcommander",
"@rules_android_maven//:com_google_auto_value_auto_value",
"@rules_android_maven//:com_google_code_findbugs_jsr305",
"@rules_android_maven//:com_google_guava_guava",
"@rules_android_maven//:org_ow2_asm_asm",
"@rules_android_maven//:org_ow2_asm_asm_commons",
"@maven//:com_beust_jcommander",
"@maven//:com_google_auto_value_auto_value",
"@maven//:com_google_code_findbugs_jsr305",
"@maven//:com_google_guava_guava",
"@maven//:org_ow2_asm_asm",
"@maven//:org_ow2_asm_asm_commons",
],
)

Expand Down
24 changes: 12 additions & 12 deletions src/tools/java/com/google/devtools/build/android/dexer/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ java_binary(
# Do not sort: Deps order matters until android_tools.jar deps are deleted (b/393172052).
deps = [
"@com_android_dex//:dex",
"@rules_android_maven//:com_beust_jcommander",
"@rules_android_maven//:com_google_code_findbugs_jsr305",
"@rules_android_maven//:com_google_errorprone_error_prone_annotations",
"@rules_android_maven//:com_google_guava_guava",
"@maven//:com_beust_jcommander",
"@maven//:com_google_code_findbugs_jsr305",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
":DexFileSplitter_lib",
"//src/tools/java/com/google/devtools/build/android:android_builder_lib",
"//src/tools/java/com/google/devtools/build/android:android_options_utils",
Expand All @@ -52,11 +52,11 @@ java_library(
"//tools/android:autovalue",
"@bazel_worker_api//:worker_protocol_proto",
"@com_android_dex//:dex",
"@rules_android_maven//:com_beust_jcommander",
"@rules_android_maven//:com_google_auto_value_auto_value",
"@rules_android_maven//:com_google_code_findbugs_jsr305",
"@rules_android_maven//:com_google_errorprone_error_prone_annotations",
"@rules_android_maven//:com_google_guava_guava",
"@maven//:com_beust_jcommander",
"@maven//:com_google_auto_value_auto_value",
"@maven//:com_google_code_findbugs_jsr305",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
],
)

Expand All @@ -71,8 +71,8 @@ java_library(
runtime_deps = [
"//src/tools/java/com/google/devtools/build/android:android_builder_lib",
"@bazel_worker_api//:worker_protocol_proto",
"@rules_android_maven//:com_google_auto_value_auto_value",
"@rules_android_maven//:com_google_code_findbugs_jsr305",
"@rules_android_maven//:com_google_guava_guava",
"@maven//:com_google_auto_value_auto_value",
"@maven//:com_google_code_findbugs_jsr305",
"@maven//:com_google_guava_guava",
],
)
6 changes: 3 additions & 3 deletions src/tools/java/com/google/devtools/build/android/idlclass/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ java_library(
"//src/tools/java/com/google/devtools/build/android:android_builder_lib",
"//src/tools/java/com/google/devtools/build/android:android_options_utils",
"//third_party/bazel/src/main/protobuf:java_compilation_java_proto",
"@rules_android_maven//:com_beust_jcommander",
"@rules_android_maven//:com_google_code_findbugs_jsr305",
"@rules_android_maven//:com_google_guava_guava",
"@maven//:com_beust_jcommander",
"@maven//:com_google_code_findbugs_jsr305",
"@maven//:com_google_guava_guava",
],
)

Expand Down
4 changes: 2 additions & 2 deletions src/tools/java/com/google/devtools/build/android/junctions/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ java_library(
],
deps = [
":windows_file_jar",
"@rules_android_maven//:com_google_code_findbugs_jsr305",
"@rules_android_maven//:com_google_guava_guava",
"@maven//:com_google_code_findbugs_jsr305",
"@maven//:com_google_guava_guava",
],
)
2 changes: 1 addition & 1 deletion src/tools/java/com/google/devtools/build/android/proto/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ java_proto_library(
[
genrule(
name = proto + "_proto_file",
srcs = ["@rules_android_maven//:com_android_tools_build_aapt2_proto"],
srcs = ["@maven//:com_android_tools_build_aapt2_proto"],
outs = [proto + ".proto"],
cmd = "unzip -q $< " + proto + ".proto && " +
"sed 's/import \\\"/import \\\"src\\/tools\\/java\\/com\\/google\\/devtools\\/build\\/android\\/proto\\//' " + proto + ".proto > $@",
Expand Down
14 changes: 7 additions & 7 deletions src/tools/java/com/google/devtools/build/android/r8/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,12 @@ java_library(
"//src/tools/java/com/google/devtools/build/android:android_options_utils",
"//tools/android:autovalue",
"@bazel_worker_java//src/main/java/com/google/devtools/build/lib/worker:work_request_handlers",
"@rules_android_maven//:com_android_tools_r8",
"@rules_android_maven//:com_beust_jcommander",
"@rules_android_maven//:com_google_code_findbugs_jsr305",
"@rules_android_maven//:com_google_guava_guava",
"@rules_android_maven//:org_ow2_asm_asm",
"@rules_android_maven//:org_ow2_asm_asm_commons",
"@maven//:com_android_tools_r8",
"@maven//:com_beust_jcommander",
"@maven//:com_google_code_findbugs_jsr305",
"@maven//:com_google_guava_guava",
"@maven//:org_ow2_asm_asm",
"@maven//:org_ow2_asm_asm_commons",
],
)

Expand All @@ -59,7 +59,7 @@ java_library(
],
deps = [
":utils",
"@rules_android_maven//:com_google_code_findbugs_jsr305",
"@maven//:com_google_code_findbugs_jsr305",
],
)

Expand Down
8 changes: 4 additions & 4 deletions src/tools/java/com/google/devtools/build/android/resources/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ java_library(
"@android_ide_common_30_1_3//:com_android_tools_sdk_common",
"@android_ide_common_30_1_3//:com_android_tools_repository",
"@android_ide_common_30_1_3//:com_android_tools_build_builder",
"@rules_android_maven//:com_google_code_findbugs_jsr305",
"@rules_android_maven//:com_google_guava_guava",
"@rules_android_maven//:org_ow2_asm_asm",
"@rules_android_maven//:org_ow2_asm_asm_commons",
"@maven//:com_google_code_findbugs_jsr305",
"@maven//:com_google_guava_guava",
"@maven//:org_ow2_asm_asm",
"@maven//:org_ow2_asm_asm_commons",
"//src/tools/java/com/google/devtools/build/android:android_common_30_1_3",
"//src/tools/java/com/google/devtools/build/android:dependency_info",
],
Expand Down
2 changes: 1 addition & 1 deletion src/tools/java/com/google/devtools/build/android/sandboxedsdktoolbox/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ java_library(
"//src/tools/java/com/google/devtools/build/android/sandboxedsdktoolbox/sdkdependenciesmanifest",
"//src/tools/java/com/google/devtools/build/android/sandboxedsdktoolbox/sdksplitproperties",
"//src/tools/java/com/google/devtools/build/android/sandboxedsdktoolbox/validatemodulesconfig",
"@rules_android_maven//:info_picocli_picocli",
"@maven//:info_picocli_picocli",
],
)

Expand Down
4 changes: 2 additions & 2 deletions src/tools/java/com/google/devtools/build/android/sandboxedsdktoolbox/apidescriptors/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ java_library(
name = "apidescriptors",
srcs = glob(["*.java"]),
deps = [
"@rules_android_maven//:androidx_privacysandbox_tools_tools_apipackager",
"@rules_android_maven//:info_picocli_picocli",
"@maven//:androidx_privacysandbox_tools_tools_apipackager",
"@maven//:info_picocli_picocli",
],
)
4 changes: 2 additions & 2 deletions src/tools/java/com/google/devtools/build/android/sandboxedsdktoolbox/clientsources/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ java_library(
name = "clientsources",
srcs = glob(["*.java"]),
deps = [
"@rules_android_maven//:androidx_privacysandbox_tools_tools_apigenerator",
"@rules_android_maven//:info_picocli_picocli",
"@maven//:androidx_privacysandbox_tools_tools_apigenerator",
"@maven//:info_picocli_picocli",
],
)
Loading