From 3e2828164242b0e5974027432bb32e8bc064e894 Mon Sep 17 00:00:00 2001 From: Ted Xie Date: Wed, 3 Dec 2025 17:37:21 -0500 Subject: [PATCH] Rename `@rules_android_maven` to `@maven`. There is some kind of issue with rules_jvm_external's maven namespacing. See: * https://github.com/bazelbuild/bazel-worker-api/issues/11 * https://github.com/bazelbuild/rules_android/issues/410 NOTE: This will force projects that depend on rules_android to upgrade to at least our version of Maven dependencies. Fixes #410 --- MODULE.bazel | 18 +- bzlmod_extensions/apksig.BUILD | 4 +- .../com/google/devtools/build/android/BUILD | 56 +++---- .../build/android/desugar/dependencies/BUILD | 4 +- .../devtools/build/android/desugar/io/BUILD | 18 +- .../build/android/desugar/langmodel/BUILD | 14 +- .../devtools/build/android/desugar/scan/BUILD | 12 +- .../google/devtools/build/android/dexer/BUILD | 24 +-- .../devtools/build/android/idlclass/BUILD | 6 +- .../devtools/build/android/junctions/BUILD | 4 +- .../google/devtools/build/android/proto/BUILD | 2 +- .../google/devtools/build/android/r8/BUILD | 14 +- .../devtools/build/android/resources/BUILD | 8 +- .../build/android/sandboxedsdktoolbox/BUILD | 2 +- .../sandboxedsdktoolbox/apidescriptors/BUILD | 4 +- .../sandboxedsdktoolbox/clientsources/BUILD | 4 +- .../android/sandboxedsdktoolbox/info/BUILD | 6 +- .../android/sandboxedsdktoolbox/mixin/BUILD | 4 +- .../sandboxedsdktoolbox/proguardspecs/BUILD | 2 +- .../runtimeenabledsdkconfig/BUILD | 8 +- .../sdkdependenciesmanifest/BUILD | 4 +- .../sdksplitproperties/BUILD | 10 +- .../validatemodulesconfig/BUILD | 2 +- .../devtools/build/android/ziputils/BUILD | 6 +- .../com/google/devtools/build/android/BUILD | 154 +++++++++--------- .../build/android/desugar/dependencies/BUILD | 6 +- .../google/devtools/build/android/dexer/BUILD | 8 +- .../devtools/build/android/idlclass/BUILD | 6 +- .../devtools/build/android/junctions/BUILD | 4 +- .../google/devtools/build/android/r8/BUILD | 10 +- .../devtools/build/android/r8/desugar/BUILD | 8 +- .../devtools/build/android/resources/BUILD | 10 +- .../sandboxedsdktoolbox/apidescriptors/BUILD | 6 +- .../apidescriptors/testlibrary/BUILD | 2 +- .../sandboxedsdktoolbox/proguardspecs/BUILD | 8 +- .../runtimeenabledsdkconfig/BUILD | 20 +-- .../sdkdependenciesmanifest/BUILD | 8 +- .../sdksplitproperties/BUILD | 12 +- .../android/sandboxedsdktoolbox/utils/BUILD | 2 +- .../validatemodulesconfig/BUILD | 8 +- .../google/devtools/build/android/xml/BUILD | 16 +- .../devtools/build/android/ziputils/BUILD | 8 +- test/rules/android_local_test/BUILD | 8 +- .../java/com/starlark_resources/BUILD | 66 ++++---- test/rules/android_local_test/non_java/BUILD | 8 +- test/utils/java/com/google/BUILD | 8 +- tools/android/BUILD | 52 +++--- 47 files changed, 337 insertions(+), 337 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index 19a49858f..6376c7d78 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -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") @@ -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", @@ -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", @@ -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", @@ -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") diff --git a/bzlmod_extensions/apksig.BUILD b/bzlmod_extensions/apksig.BUILD index ae35cc17f..553579593 100644 --- a/bzlmod_extensions/apksig.BUILD +++ b/bzlmod_extensions/apksig.BUILD @@ -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", ], ) diff --git a/src/tools/java/com/google/devtools/build/android/BUILD b/src/tools/java/com/google/devtools/build/android/BUILD index fd3282074..ab60fd5ca 100644 --- a/src/tools/java/com/google/devtools/build/android/BUILD +++ b/src/tools/java/com/google/devtools/build/android/BUILD @@ -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", ], ) @@ -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", @@ -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", @@ -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", @@ -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", ], ) @@ -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", ], ) diff --git a/src/tools/java/com/google/devtools/build/android/desugar/dependencies/BUILD b/src/tools/java/com/google/devtools/build/android/desugar/dependencies/BUILD index 1a483ce3e..e42850aa1 100644 --- a/src/tools/java/com/google/devtools/build/android/desugar/dependencies/BUILD +++ b/src/tools/java/com/google/devtools/build/android/desugar/dependencies/BUILD @@ -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", ], ) diff --git a/src/tools/java/com/google/devtools/build/android/desugar/io/BUILD b/src/tools/java/com/google/devtools/build/android/desugar/io/BUILD index 9a87baf8d..d31c8dcf6 100644 --- a/src/tools/java/com/google/devtools/build/android/desugar/io/BUILD +++ b/src/tools/java/com/google/devtools/build/android/desugar/io/BUILD @@ -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", ], ) diff --git a/src/tools/java/com/google/devtools/build/android/desugar/langmodel/BUILD b/src/tools/java/com/google/devtools/build/android/desugar/langmodel/BUILD index f81cf5726..711cfe5c4 100644 --- a/src/tools/java/com/google/devtools/build/android/desugar/langmodel/BUILD +++ b/src/tools/java/com/google/devtools/build/android/desugar/langmodel/BUILD @@ -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", ], ) diff --git a/src/tools/java/com/google/devtools/build/android/desugar/scan/BUILD b/src/tools/java/com/google/devtools/build/android/desugar/scan/BUILD index c75f57565..85de71836 100644 --- a/src/tools/java/com/google/devtools/build/android/desugar/scan/BUILD +++ b/src/tools/java/com/google/devtools/build/android/desugar/scan/BUILD @@ -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", ], ) diff --git a/src/tools/java/com/google/devtools/build/android/dexer/BUILD b/src/tools/java/com/google/devtools/build/android/dexer/BUILD index 72dcec66f..43767f344 100644 --- a/src/tools/java/com/google/devtools/build/android/dexer/BUILD +++ b/src/tools/java/com/google/devtools/build/android/dexer/BUILD @@ -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", @@ -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", ], ) @@ -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", ], ) diff --git a/src/tools/java/com/google/devtools/build/android/idlclass/BUILD b/src/tools/java/com/google/devtools/build/android/idlclass/BUILD index ea4a7bf1e..4a266496b 100644 --- a/src/tools/java/com/google/devtools/build/android/idlclass/BUILD +++ b/src/tools/java/com/google/devtools/build/android/idlclass/BUILD @@ -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", ], ) diff --git a/src/tools/java/com/google/devtools/build/android/junctions/BUILD b/src/tools/java/com/google/devtools/build/android/junctions/BUILD index 82e09148f..d5127cfd2 100644 --- a/src/tools/java/com/google/devtools/build/android/junctions/BUILD +++ b/src/tools/java/com/google/devtools/build/android/junctions/BUILD @@ -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", ], ) diff --git a/src/tools/java/com/google/devtools/build/android/proto/BUILD b/src/tools/java/com/google/devtools/build/android/proto/BUILD index f71332eb0..7878d7149 100644 --- a/src/tools/java/com/google/devtools/build/android/proto/BUILD +++ b/src/tools/java/com/google/devtools/build/android/proto/BUILD @@ -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 > $@", diff --git a/src/tools/java/com/google/devtools/build/android/r8/BUILD b/src/tools/java/com/google/devtools/build/android/r8/BUILD index 19b8a62c1..d1ffddf9f 100644 --- a/src/tools/java/com/google/devtools/build/android/r8/BUILD +++ b/src/tools/java/com/google/devtools/build/android/r8/BUILD @@ -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", ], ) @@ -59,7 +59,7 @@ java_library( ], deps = [ ":utils", - "@rules_android_maven//:com_google_code_findbugs_jsr305", + "@maven//:com_google_code_findbugs_jsr305", ], ) diff --git a/src/tools/java/com/google/devtools/build/android/resources/BUILD b/src/tools/java/com/google/devtools/build/android/resources/BUILD index 72b99681b..9cff7dbb4 100644 --- a/src/tools/java/com/google/devtools/build/android/resources/BUILD +++ b/src/tools/java/com/google/devtools/build/android/resources/BUILD @@ -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", ], diff --git a/src/tools/java/com/google/devtools/build/android/sandboxedsdktoolbox/BUILD b/src/tools/java/com/google/devtools/build/android/sandboxedsdktoolbox/BUILD index 4e24a11b5..da4628982 100644 --- a/src/tools/java/com/google/devtools/build/android/sandboxedsdktoolbox/BUILD +++ b/src/tools/java/com/google/devtools/build/android/sandboxedsdktoolbox/BUILD @@ -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", ], ) diff --git a/src/tools/java/com/google/devtools/build/android/sandboxedsdktoolbox/apidescriptors/BUILD b/src/tools/java/com/google/devtools/build/android/sandboxedsdktoolbox/apidescriptors/BUILD index f13cbe2c0..a9cc3cf63 100644 --- a/src/tools/java/com/google/devtools/build/android/sandboxedsdktoolbox/apidescriptors/BUILD +++ b/src/tools/java/com/google/devtools/build/android/sandboxedsdktoolbox/apidescriptors/BUILD @@ -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", ], ) diff --git a/src/tools/java/com/google/devtools/build/android/sandboxedsdktoolbox/clientsources/BUILD b/src/tools/java/com/google/devtools/build/android/sandboxedsdktoolbox/clientsources/BUILD index 5037230fb..2d5c00d9a 100644 --- a/src/tools/java/com/google/devtools/build/android/sandboxedsdktoolbox/clientsources/BUILD +++ b/src/tools/java/com/google/devtools/build/android/sandboxedsdktoolbox/clientsources/BUILD @@ -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", ], ) diff --git a/src/tools/java/com/google/devtools/build/android/sandboxedsdktoolbox/info/BUILD b/src/tools/java/com/google/devtools/build/android/sandboxedsdktoolbox/info/BUILD index 91d232583..b1c528b1b 100644 --- a/src/tools/java/com/google/devtools/build/android/sandboxedsdktoolbox/info/BUILD +++ b/src/tools/java/com/google/devtools/build/android/sandboxedsdktoolbox/info/BUILD @@ -12,8 +12,8 @@ java_library( name = "info", srcs = glob(["*.java"]), deps = [ - "@rules_android_maven//:com_android_tools_build_bundletool", - "@rules_android_maven//:com_google_protobuf_protobuf_java", - "@rules_android_maven//:com_google_protobuf_protobuf_java_util", + "@maven//:com_android_tools_build_bundletool", + "@maven//:com_google_protobuf_protobuf_java", + "@maven//:com_google_protobuf_protobuf_java_util", ], ) diff --git a/src/tools/java/com/google/devtools/build/android/sandboxedsdktoolbox/mixin/BUILD b/src/tools/java/com/google/devtools/build/android/sandboxedsdktoolbox/mixin/BUILD index 250a95b84..cd1d957ef 100644 --- a/src/tools/java/com/google/devtools/build/android/sandboxedsdktoolbox/mixin/BUILD +++ b/src/tools/java/com/google/devtools/build/android/sandboxedsdktoolbox/mixin/BUILD @@ -13,7 +13,7 @@ java_library( srcs = glob(["*.java"]), deps = [ "//src/tools/java/com/google/devtools/build/android/sandboxedsdktoolbox/info", - "@rules_android_maven//:com_google_guava_guava", - "@rules_android_maven//:info_picocli_picocli", + "@maven//:com_google_guava_guava", + "@maven//:info_picocli_picocli", ], ) diff --git a/src/tools/java/com/google/devtools/build/android/sandboxedsdktoolbox/proguardspecs/BUILD b/src/tools/java/com/google/devtools/build/android/sandboxedsdktoolbox/proguardspecs/BUILD index 8b830249b..8e78faf4b 100644 --- a/src/tools/java/com/google/devtools/build/android/sandboxedsdktoolbox/proguardspecs/BUILD +++ b/src/tools/java/com/google/devtools/build/android/sandboxedsdktoolbox/proguardspecs/BUILD @@ -14,6 +14,6 @@ java_library( srcs = ["GenerateSdkProguardSpecsCommand.java"], deps = [ "//src/tools/java/com/google/devtools/build/android/sandboxedsdktoolbox/info", - "@rules_android_maven//:info_picocli_picocli", + "@maven//:info_picocli_picocli", ], ) diff --git a/src/tools/java/com/google/devtools/build/android/sandboxedsdktoolbox/runtimeenabledsdkconfig/BUILD b/src/tools/java/com/google/devtools/build/android/sandboxedsdktoolbox/runtimeenabledsdkconfig/BUILD index 6cad2c23b..cd4ae20f2 100644 --- a/src/tools/java/com/google/devtools/build/android/sandboxedsdktoolbox/runtimeenabledsdkconfig/BUILD +++ b/src/tools/java/com/google/devtools/build/android/sandboxedsdktoolbox/runtimeenabledsdkconfig/BUILD @@ -14,9 +14,9 @@ java_library( deps = [ "//src/tools/java/com/google/devtools/build/android/sandboxedsdktoolbox/info", "//src/tools/java/com/google/devtools/build/android/sandboxedsdktoolbox/mixin", - "@rules_android_maven//:com_android_tools_build_bundletool", - "@rules_android_maven//:com_google_guava_guava", - "@rules_android_maven//:com_google_protobuf_protobuf_java", - "@rules_android_maven//:info_picocli_picocli", + "@maven//:com_android_tools_build_bundletool", + "@maven//:com_google_guava_guava", + "@maven//:com_google_protobuf_protobuf_java", + "@maven//:info_picocli_picocli", ], ) diff --git a/src/tools/java/com/google/devtools/build/android/sandboxedsdktoolbox/sdkdependenciesmanifest/BUILD b/src/tools/java/com/google/devtools/build/android/sandboxedsdktoolbox/sdkdependenciesmanifest/BUILD index d087b2cac..605b376a2 100644 --- a/src/tools/java/com/google/devtools/build/android/sandboxedsdktoolbox/sdkdependenciesmanifest/BUILD +++ b/src/tools/java/com/google/devtools/build/android/sandboxedsdktoolbox/sdkdependenciesmanifest/BUILD @@ -14,7 +14,7 @@ java_library( deps = [ "//src/tools/java/com/google/devtools/build/android/sandboxedsdktoolbox/info", "//src/tools/java/com/google/devtools/build/android/sandboxedsdktoolbox/mixin", - "@rules_android_maven//:com_google_guava_guava", - "@rules_android_maven//:info_picocli_picocli", + "@maven//:com_google_guava_guava", + "@maven//:info_picocli_picocli", ], ) diff --git a/src/tools/java/com/google/devtools/build/android/sandboxedsdktoolbox/sdksplitproperties/BUILD b/src/tools/java/com/google/devtools/build/android/sandboxedsdktoolbox/sdksplitproperties/BUILD index 2241b5af4..68864fe53 100644 --- a/src/tools/java/com/google/devtools/build/android/sandboxedsdktoolbox/sdksplitproperties/BUILD +++ b/src/tools/java/com/google/devtools/build/android/sandboxedsdktoolbox/sdksplitproperties/BUILD @@ -14,10 +14,10 @@ java_library( deps = [ "//src/tools/java/com/google/devtools/build/android/sandboxedsdktoolbox/info", "//src/tools/java/com/google/devtools/build/android/sandboxedsdktoolbox/mixin", - "@rules_android_maven//:com_android_tools_build_bundletool", - "@rules_android_maven//:com_google_guava_guava", - "@rules_android_maven//:com_google_protobuf_protobuf_java", - "@rules_android_maven//:com_google_protobuf_protobuf_java_util", - "@rules_android_maven//:info_picocli_picocli", + "@maven//:com_android_tools_build_bundletool", + "@maven//:com_google_guava_guava", + "@maven//:com_google_protobuf_protobuf_java", + "@maven//:com_google_protobuf_protobuf_java_util", + "@maven//:info_picocli_picocli", ], ) diff --git a/src/tools/java/com/google/devtools/build/android/sandboxedsdktoolbox/validatemodulesconfig/BUILD b/src/tools/java/com/google/devtools/build/android/sandboxedsdktoolbox/validatemodulesconfig/BUILD index e1f0509c8..0eef9de67 100644 --- a/src/tools/java/com/google/devtools/build/android/sandboxedsdktoolbox/validatemodulesconfig/BUILD +++ b/src/tools/java/com/google/devtools/build/android/sandboxedsdktoolbox/validatemodulesconfig/BUILD @@ -14,6 +14,6 @@ java_library( srcs = glob(["*.java"]), deps = [ "//src/tools/java/com/google/devtools/build/android/sandboxedsdktoolbox/info", - "@rules_android_maven//:info_picocli_picocli", + "@maven//:info_picocli_picocli", ], ) diff --git a/src/tools/java/com/google/devtools/build/android/ziputils/BUILD b/src/tools/java/com/google/devtools/build/android/ziputils/BUILD index 5445f2681..78f551dfd 100644 --- a/src/tools/java/com/google/devtools/build/android/ziputils/BUILD +++ b/src/tools/java/com/google/devtools/build/android/ziputils/BUILD @@ -22,9 +22,9 @@ java_library( deps = [ "//src/tools/java/com/google/devtools/build/android:android_options_utils", "//tools/android:error_prone", - "@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", ], ) diff --git a/src/tools/javatests/com/google/devtools/build/android/BUILD b/src/tools/javatests/com/google/devtools/build/android/BUILD index c9e8dade3..a21bd28dd 100644 --- a/src/tools/javatests/com/google/devtools/build/android/BUILD +++ b/src/tools/javatests/com/google/devtools/build/android/BUILD @@ -26,9 +26,9 @@ java_test( "//src/tools/java/com/google/devtools/build/android:android_builder_lib", "//src/tools/java/com/google/devtools/build/android:android_common_30_1_3", "//src/tools/java/com/google/devtools/build/android:android_options_utils", - "@rules_android_maven//:com_beust_jcommander", - "@rules_android_maven//:com_google_truth_truth", - "@rules_android_maven//:junit_junit", + "@maven//:com_beust_jcommander", + "@maven//:com_google_truth_truth", + "@maven//:junit_junit", ], ) @@ -38,9 +38,9 @@ java_test( srcs = ["AndroidResourceOutputsTest.java"], deps = [ "//src/tools/java/com/google/devtools/build/android:android_builder_lib", - "@rules_android_maven//:com_google_jimfs_jimfs", - "@rules_android_maven//:com_google_truth_truth", - "@rules_android_maven//:junit_junit", + "@maven//:com_google_jimfs_jimfs", + "@maven//:com_google_truth_truth", + "@maven//:junit_junit", ], ) @@ -52,9 +52,9 @@ java_test( ":guava", ":test_utils", "//src/tools/java/com/google/devtools/build/android:android_builder_lib", - "@rules_android_maven//:com_google_jimfs_jimfs", - "@rules_android_maven//:com_google_truth_truth", - "@rules_android_maven//:junit_junit", + "@maven//:com_google_jimfs_jimfs", + "@maven//:com_google_truth_truth", + "@maven//:junit_junit", ], ) @@ -65,8 +65,8 @@ java_test( deps = [ ":guava", "//src/tools/java/com/google/devtools/build/android:android_builder_lib", - "@rules_android_maven//:com_google_truth_truth", - "@rules_android_maven//:junit_junit", + "@maven//:com_google_truth_truth", + "@maven//:junit_junit", ], ) @@ -78,9 +78,9 @@ java_test( ":guava", "//src/tools/java/com/google/devtools/build/android:android_builder_lib", "//src/tools/java/com/google/devtools/build/android:android_common_30_1_3", - "@rules_android_maven//:com_google_guava_guava_testlib", - "@rules_android_maven//:com_google_truth_truth", - "@rules_android_maven//:junit_junit", + "@maven//:com_google_guava_guava_testlib", + "@maven//:com_google_truth_truth", + "@maven//:junit_junit", ], ) @@ -93,9 +93,9 @@ java_test( ":test_utils", "//src/tools/java/com/google/devtools/build/android:android_builder_lib", "//src/tools/java/com/google/devtools/build/android:android_common_30_1_3", - "@rules_android_maven//:com_google_jimfs_jimfs", - "@rules_android_maven//:com_google_truth_truth", - "@rules_android_maven//:junit_junit", + "@maven//:com_google_jimfs_jimfs", + "@maven//:com_google_truth_truth", + "@maven//:junit_junit", ], ) @@ -107,9 +107,9 @@ java_test( ":guava", ":test_utils", "//src/tools/java/com/google/devtools/build/android:android_builder_lib", - "@rules_android_maven//:com_google_jimfs_jimfs", - "@rules_android_maven//:com_google_truth_truth", - "@rules_android_maven//:junit_junit", + "@maven//:com_google_jimfs_jimfs", + "@maven//:com_google_truth_truth", + "@maven//:junit_junit", ], ) @@ -122,9 +122,9 @@ java_test( ":test_utils", "//src/tools/java/com/google/devtools/build/android:android_builder_lib", "//src/tools/java/com/google/devtools/build/android:android_common_30_1_3", - "@rules_android_maven//:com_google_jimfs_jimfs", - "@rules_android_maven//:com_google_truth_truth", - "@rules_android_maven//:junit_junit", + "@maven//:com_google_jimfs_jimfs", + "@maven//:com_google_truth_truth", + "@maven//:junit_junit", ], ) @@ -132,7 +132,7 @@ java_library( name = "test_options", srcs = ["TestOptions.java"], deps = [ - "@rules_android_maven//:com_beust_jcommander", + "@maven//:com_beust_jcommander", ], ) @@ -143,9 +143,9 @@ java_test( deps = [ ":test_options", "//src/tools/java/com/google/devtools/build/android:android_options_utils", - "@rules_android_maven//:com_beust_jcommander", - "@rules_android_maven//:com_google_truth_truth", - "@rules_android_maven//:junit_junit", + "@maven//:com_beust_jcommander", + "@maven//:com_google_truth_truth", + "@maven//:junit_junit", ], ) @@ -158,9 +158,9 @@ java_test( ":test_utils", "//src/tools/java/com/google/devtools/build/android:android_builder_lib", "//src/tools/java/com/google/devtools/build/android/resources", - "@rules_android_maven//:com_google_jimfs_jimfs", - "@rules_android_maven//:com_google_truth_truth", - "@rules_android_maven//:junit_junit", + "@maven//:com_google_jimfs_jimfs", + "@maven//:com_google_truth_truth", + "@maven//:junit_junit", ], ) @@ -171,9 +171,9 @@ java_test( deps = [ ":guava", "//src/tools/java/com/google/devtools/build/android:android_builder_lib", - "@rules_android_maven//:com_beust_jcommander", - "@rules_android_maven//:com_google_truth_truth", - "@rules_android_maven//:junit_junit", + "@maven//:com_beust_jcommander", + "@maven//:com_google_truth_truth", + "@maven//:junit_junit", ], ) @@ -187,9 +187,9 @@ java_test( "//src/tools/java/com/google/devtools/build/android:android_builder_lib", "//src/tools/java/com/google/devtools/build/android:android_common_30_1_3", "//src/tools/java/com/google/devtools/build/android/resources", - "@rules_android_maven//:com_google_jimfs_jimfs", - "@rules_android_maven//:com_google_truth_truth", - "@rules_android_maven//:junit_junit", + "@maven//:com_google_jimfs_jimfs", + "@maven//:com_google_truth_truth", + "@maven//:junit_junit", ], ) @@ -199,9 +199,9 @@ java_test( srcs = ["DataSourceTest.java"], deps = [ "//src/tools/java/com/google/devtools/build/android:android_builder_lib", - "@rules_android_maven//:com_google_jimfs_jimfs", - "@rules_android_maven//:com_google_truth_truth", - "@rules_android_maven//:junit_junit", + "@maven//:com_google_jimfs_jimfs", + "@maven//:com_google_truth_truth", + "@maven//:junit_junit", ], ) @@ -213,9 +213,9 @@ java_test( ":guava", "//src/tools/java/com/google/devtools/build/android:android_builder_lib", "//src/tools/java/com/google/devtools/build/android/resources", - "@rules_android_maven//:com_google_jimfs_jimfs", - "@rules_android_maven//:com_google_truth_truth", - "@rules_android_maven//:junit_junit", + "@maven//:com_google_jimfs_jimfs", + "@maven//:com_google_truth_truth", + "@maven//:junit_junit", ], ) @@ -226,9 +226,9 @@ java_test( deps = [ ":guava", "//src/tools/java/com/google/devtools/build/android:android_builder_lib", - "@rules_android_maven//:com_google_jimfs_jimfs", - "@rules_android_maven//:com_google_truth_truth", - "@rules_android_maven//:junit_junit", + "@maven//:com_google_jimfs_jimfs", + "@maven//:com_google_truth_truth", + "@maven//:junit_junit", ], ) @@ -239,8 +239,8 @@ java_test( deps = [ ":guava", "//src/tools/java/com/google/devtools/build/android:android_builder_lib", - "@rules_android_maven//:com_google_truth_truth", - "@rules_android_maven//:junit_junit", + "@maven//:com_google_truth_truth", + "@maven//:junit_junit", ], ) @@ -251,9 +251,9 @@ java_test( deps = [ ":guava", "//src/tools/java/com/google/devtools/build/android:android_builder_lib", - "@rules_android_maven//:com_google_jimfs_jimfs", - "@rules_android_maven//:com_google_truth_truth", - "@rules_android_maven//:junit_junit", + "@maven//:com_google_jimfs_jimfs", + "@maven//:com_google_truth_truth", + "@maven//:junit_junit", ], ) @@ -268,9 +268,9 @@ java_test( ":guava", ":test_utils", "//src/tools/java/com/google/devtools/build/android:android_builder_lib", - "@rules_android_maven//:com_google_code_findbugs_jsr305", - "@rules_android_maven//:com_google_truth_truth", - "@rules_android_maven//:junit_junit", + "@maven//:com_google_code_findbugs_jsr305", + "@maven//:com_google_truth_truth", + "@maven//:junit_junit", ], ) @@ -284,9 +284,9 @@ java_test( "//src/tools/java/com/google/devtools/build/android:android_builder_lib", "//src/tools/java/com/google/devtools/build/android:android_common_30_1_3", "//src/tools/java/com/google/devtools/build/android/resources", - "@rules_android_maven//:com_google_jimfs_jimfs", - "@rules_android_maven//:com_google_truth_truth", - "@rules_android_maven//:junit_junit", + "@maven//:com_google_jimfs_jimfs", + "@maven//:com_google_truth_truth", + "@maven//:junit_junit", ], ) @@ -299,9 +299,9 @@ java_test( "//src/tools/java/com/google/devtools/build/android:android_builder_lib", "//src/tools/java/com/google/devtools/build/android:android_common_30_1_3", "//src/tools/java/com/google/devtools/build/android/resources", - "@rules_android_maven//:com_google_jimfs_jimfs", - "@rules_android_maven//:com_google_truth_truth", - "@rules_android_maven//:junit_junit", + "@maven//:com_google_jimfs_jimfs", + "@maven//:com_google_truth_truth", + "@maven//:junit_junit", ], ) @@ -312,9 +312,9 @@ java_test( deps = [ ":guava", "//src/tools/java/com/google/devtools/build/android:android_builder_lib", - "@rules_android_maven//:com_google_jimfs_jimfs", - "@rules_android_maven//:com_google_truth_truth", - "@rules_android_maven//:junit_junit", + "@maven//:com_google_jimfs_jimfs", + "@maven//:com_google_truth_truth", + "@maven//:junit_junit", ], ) @@ -325,9 +325,9 @@ java_test( deps = [ ":guava", "//src/tools/java/com/google/devtools/build/android:android_builder_lib", - "@rules_android_maven//:com_google_jimfs_jimfs", - "@rules_android_maven//:com_google_truth_truth", - "@rules_android_maven//:junit_junit", + "@maven//:com_google_jimfs_jimfs", + "@maven//:com_google_truth_truth", + "@maven//:junit_junit", ], ) @@ -338,9 +338,9 @@ java_test( deps = [ ":guava", "//src/tools/java/com/google/devtools/build/android:android_builder_lib", - "@rules_android_maven//:com_google_jimfs_jimfs", - "@rules_android_maven//:com_google_truth_truth", - "@rules_android_maven//:junit_junit", + "@maven//:com_google_jimfs_jimfs", + "@maven//:com_google_truth_truth", + "@maven//:junit_junit", ], ) @@ -358,8 +358,8 @@ java_test( deps = [ ":guava", "//src/tools/java/com/google/devtools/build/android:android_builder_lib", - "@rules_android_maven//:com_google_truth_truth", - "@rules_android_maven//:junit_junit", + "@maven//:com_google_truth_truth", + "@maven//:junit_junit", ], ) @@ -367,7 +367,7 @@ java_library( name = "error_prone_annotations", testonly = 1, exports = [ - "@rules_android_maven//:com_google_errorprone_error_prone_annotations", + "@maven//:com_google_errorprone_error_prone_annotations", ], ) @@ -376,8 +376,8 @@ java_library( testonly = 1, exports = [ ":error_prone_annotations", - "@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", ], ) @@ -393,9 +393,9 @@ java_library( "//src/tools/java/com/google/devtools/build/android:android_builder_lib", "//src/tools/java/com/google/devtools/build/android:android_common_30_1_3", "//src/tools/java/com/google/devtools/build/android/resources", - "@rules_android_maven//:com_beust_jcommander", - "@rules_android_maven//:com_google_errorprone_error_prone_annotations", - "@rules_android_maven//:com_google_guava_guava", - "@rules_android_maven//:com_google_truth_truth", + "@maven//:com_beust_jcommander", + "@maven//:com_google_errorprone_error_prone_annotations", + "@maven//:com_google_guava_guava", + "@maven//:com_google_truth_truth", ], ) diff --git a/src/tools/javatests/com/google/devtools/build/android/desugar/dependencies/BUILD b/src/tools/javatests/com/google/devtools/build/android/desugar/dependencies/BUILD index 78ab19ad8..52a297fa8 100644 --- a/src/tools/javatests/com/google/devtools/build/android/desugar/dependencies/BUILD +++ b/src/tools/javatests/com/google/devtools/build/android/desugar/dependencies/BUILD @@ -23,8 +23,8 @@ java_test( deps = [ "//src/tools/java/com/google/devtools/build/android/desugar/dependencies", "//third_party/bazel/src/main/protobuf:desugar_deps_java_proto", - "@rules_android_maven//:com_google_guava_guava", - "@rules_android_maven//:com_google_truth_truth", - "@rules_android_maven//:junit_junit", + "@maven//:com_google_guava_guava", + "@maven//:com_google_truth_truth", + "@maven//:junit_junit", ], ) diff --git a/src/tools/javatests/com/google/devtools/build/android/dexer/BUILD b/src/tools/javatests/com/google/devtools/build/android/dexer/BUILD index eec6f6028..05c2a10d9 100644 --- a/src/tools/javatests/com/google/devtools/build/android/dexer/BUILD +++ b/src/tools/javatests/com/google/devtools/build/android/dexer/BUILD @@ -39,10 +39,10 @@ java_library( ":dexbuilder_import", "//src/tools/java/com/google/devtools/build/android/dexer:DexFileSplitter_lib", "//src/tools/java/com/google/devtools/build/android/r8:dexbuilder_deploy.jar", - "@rules_android_maven//:com_google_guava_guava", - "@rules_android_maven//:com_google_truth_truth", - "@rules_android_maven//:junit_junit", - "@rules_android_maven//:org_mockito_mockito_core", + "@maven//:com_google_guava_guava", + "@maven//:com_google_truth_truth", + "@maven//:junit_junit", + "@maven//:org_mockito_mockito_core", "@rules_java//java/runfiles", ], ) diff --git a/src/tools/javatests/com/google/devtools/build/android/idlclass/BUILD b/src/tools/javatests/com/google/devtools/build/android/idlclass/BUILD index 6d4d8509d..52e24f3b9 100644 --- a/src/tools/javatests/com/google/devtools/build/android/idlclass/BUILD +++ b/src/tools/javatests/com/google/devtools/build/android/idlclass/BUILD @@ -19,8 +19,8 @@ java_test( deps = [ "//src/tools/java/com/google/devtools/build/android/idlclass:idlclass_lib", "//third_party/bazel/src/main/protobuf:java_compilation_java_proto", - "@rules_android_maven//:com_google_guava_guava", - "@rules_android_maven//:com_google_truth_truth", - "@rules_android_maven//:junit_junit", + "@maven//:com_google_guava_guava", + "@maven//:com_google_truth_truth", + "@maven//:junit_junit", ], ) diff --git a/src/tools/javatests/com/google/devtools/build/android/junctions/BUILD b/src/tools/javatests/com/google/devtools/build/android/junctions/BUILD index b86593614..f8248a8a5 100644 --- a/src/tools/javatests/com/google/devtools/build/android/junctions/BUILD +++ b/src/tools/javatests/com/google/devtools/build/android/junctions/BUILD @@ -25,7 +25,7 @@ java_test( }), deps = [ "//src/tools/java/com/google/devtools/build/android/junctions", - "@rules_android_maven//:com_google_truth_truth", - "@rules_android_maven//:junit_junit", + "@maven//:com_google_truth_truth", + "@maven//:junit_junit", ], ) diff --git a/src/tools/javatests/com/google/devtools/build/android/r8/BUILD b/src/tools/javatests/com/google/devtools/build/android/r8/BUILD index c60e3deee..40138d490 100644 --- a/src/tools/javatests/com/google/devtools/build/android/r8/BUILD +++ b/src/tools/javatests/com/google/devtools/build/android/r8/BUILD @@ -30,11 +30,11 @@ java_library( }), deps = [ "//src/tools/java/com/google/devtools/build/android/r8", - "@rules_android_maven//:com_android_tools_r8", - "@rules_android_maven//:com_beust_jcommander", - "@rules_android_maven//:com_google_guava_guava", - "@rules_android_maven//:com_google_truth_truth", - "@rules_android_maven//:junit_junit", + "@maven//:com_android_tools_r8", + "@maven//:com_beust_jcommander", + "@maven//:com_google_guava_guava", + "@maven//:com_google_truth_truth", + "@maven//:junit_junit", "@rules_java//java/runfiles", ], ) diff --git a/src/tools/javatests/com/google/devtools/build/android/r8/desugar/BUILD b/src/tools/javatests/com/google/devtools/build/android/r8/desugar/BUILD index 9671dc14b..e0172379b 100644 --- a/src/tools/javatests/com/google/devtools/build/android/r8/desugar/BUILD +++ b/src/tools/javatests/com/google/devtools/build/android/r8/desugar/BUILD @@ -35,10 +35,10 @@ java_test( deps = [ "//src/tools/java/com/google/devtools/build/android/r8", "//third_party/bazel/src/main/protobuf:desugar_deps_java_proto", - "@rules_android_maven//:com_google_guava_guava", - "@rules_android_maven//:com_google_truth_truth", - "@rules_android_maven//:junit_junit", - "@rules_android_maven//:org_ow2_asm_asm", + "@maven//:com_google_guava_guava", + "@maven//:com_google_truth_truth", + "@maven//:junit_junit", + "@maven//:org_ow2_asm_asm", ], ) diff --git a/src/tools/javatests/com/google/devtools/build/android/resources/BUILD b/src/tools/javatests/com/google/devtools/build/android/resources/BUILD index 58a32f44e..2a3ad8563 100644 --- a/src/tools/javatests/com/google/devtools/build/android/resources/BUILD +++ b/src/tools/javatests/com/google/devtools/build/android/resources/BUILD @@ -19,14 +19,14 @@ java_test( "**/*.java", ]), runtime_deps = [ - "@rules_android_maven//:com_google_guava_guava", + "@maven//:com_google_guava_guava", ], deps = [ "//src/tools/java/com/google/devtools/build/android:android_common_30_1_3", "//src/tools/java/com/google/devtools/build/android/resources", - "@rules_android_maven//:com_google_guava_failureaccess", - "@rules_android_maven//:com_google_guava_guava", - "@rules_android_maven//:com_google_truth_truth", - "@rules_android_maven//:junit_junit", + "@maven//:com_google_guava_failureaccess", + "@maven//:com_google_guava_guava", + "@maven//:com_google_truth_truth", + "@maven//:junit_junit", ], ) diff --git a/src/tools/javatests/com/google/devtools/build/android/sandboxedsdktoolbox/apidescriptors/BUILD b/src/tools/javatests/com/google/devtools/build/android/sandboxedsdktoolbox/apidescriptors/BUILD index 7365ecc74..0d04ba48e 100644 --- a/src/tools/javatests/com/google/devtools/build/android/sandboxedsdktoolbox/apidescriptors/BUILD +++ b/src/tools/javatests/com/google/devtools/build/android/sandboxedsdktoolbox/apidescriptors/BUILD @@ -17,8 +17,8 @@ java_test( ], deps = [ "//src/tools/javatests/com/google/devtools/build/android/sandboxedsdktoolbox/utils", - "@rules_android_maven//:com_google_guava_guava", - "@rules_android_maven//:com_google_truth_truth", - "@rules_android_maven//:junit_junit", + "@maven//:com_google_guava_guava", + "@maven//:com_google_truth_truth", + "@maven//:junit_junit", ], ) diff --git a/src/tools/javatests/com/google/devtools/build/android/sandboxedsdktoolbox/apidescriptors/testlibrary/BUILD b/src/tools/javatests/com/google/devtools/build/android/sandboxedsdktoolbox/apidescriptors/testlibrary/BUILD index e208cb54d..e7b2e57df 100644 --- a/src/tools/javatests/com/google/devtools/build/android/sandboxedsdktoolbox/apidescriptors/testlibrary/BUILD +++ b/src/tools/javatests/com/google/devtools/build/android/sandboxedsdktoolbox/apidescriptors/testlibrary/BUILD @@ -13,6 +13,6 @@ android_library( name = "testlibrary", srcs = glob(["**/*.java"]), deps = [ - "@rules_android_maven//:androidx_privacysandbox_tools_tools", + "@maven//:androidx_privacysandbox_tools_tools", ], ) diff --git a/src/tools/javatests/com/google/devtools/build/android/sandboxedsdktoolbox/proguardspecs/BUILD b/src/tools/javatests/com/google/devtools/build/android/sandboxedsdktoolbox/proguardspecs/BUILD index 3311be8c5..97a4c449c 100644 --- a/src/tools/javatests/com/google/devtools/build/android/sandboxedsdktoolbox/proguardspecs/BUILD +++ b/src/tools/javatests/com/google/devtools/build/android/sandboxedsdktoolbox/proguardspecs/BUILD @@ -14,9 +14,9 @@ java_test( srcs = ["GenerateSdkProguardSpecsCommandTest.java"], deps = [ "//src/tools/javatests/com/google/devtools/build/android/sandboxedsdktoolbox/utils", - "@rules_android_maven//:com_android_tools_build_bundletool", - "@rules_android_maven//:com_google_protobuf_protobuf_java_util", - "@rules_android_maven//:com_google_truth_truth", - "@rules_android_maven//:junit_junit", + "@maven//:com_android_tools_build_bundletool", + "@maven//:com_google_protobuf_protobuf_java_util", + "@maven//:com_google_truth_truth", + "@maven//:junit_junit", ], ) diff --git a/src/tools/javatests/com/google/devtools/build/android/sandboxedsdktoolbox/runtimeenabledsdkconfig/BUILD b/src/tools/javatests/com/google/devtools/build/android/sandboxedsdktoolbox/runtimeenabledsdkconfig/BUILD index d66bfc10f..d14b36c96 100644 --- a/src/tools/javatests/com/google/devtools/build/android/sandboxedsdktoolbox/runtimeenabledsdkconfig/BUILD +++ b/src/tools/javatests/com/google/devtools/build/android/sandboxedsdktoolbox/runtimeenabledsdkconfig/BUILD @@ -15,11 +15,11 @@ java_test( data = glob(["testdata/*"]), deps = [ "//src/tools/javatests/com/google/devtools/build/android/sandboxedsdktoolbox/utils", - "@rules_android_maven//:com_android_tools_build_bundletool", - "@rules_android_maven//:com_google_guava_guava", - "@rules_android_maven//:com_google_protobuf_protobuf_java", - "@rules_android_maven//:com_google_truth_truth", - "@rules_android_maven//:junit_junit", + "@maven//:com_android_tools_build_bundletool", + "@maven//:com_google_guava_guava", + "@maven//:com_google_protobuf_protobuf_java", + "@maven//:com_google_truth_truth", + "@maven//:junit_junit", ], ) @@ -29,10 +29,10 @@ java_test( srcs = ["GenerateRuntimeEnabledSdkTableCommandTest.java"], deps = [ "//src/tools/javatests/com/google/devtools/build/android/sandboxedsdktoolbox/utils", - "@rules_android_maven//:com_android_tools_build_bundletool", - "@rules_android_maven//:com_google_guava_guava", - "@rules_android_maven//:com_google_protobuf_protobuf_java_util", - "@rules_android_maven//:com_google_truth_truth", - "@rules_android_maven//:junit_junit", + "@maven//:com_android_tools_build_bundletool", + "@maven//:com_google_guava_guava", + "@maven//:com_google_protobuf_protobuf_java_util", + "@maven//:com_google_truth_truth", + "@maven//:junit_junit", ], ) diff --git a/src/tools/javatests/com/google/devtools/build/android/sandboxedsdktoolbox/sdkdependenciesmanifest/BUILD b/src/tools/javatests/com/google/devtools/build/android/sandboxedsdktoolbox/sdkdependenciesmanifest/BUILD index 00dc34830..330668dde 100644 --- a/src/tools/javatests/com/google/devtools/build/android/sandboxedsdktoolbox/sdkdependenciesmanifest/BUILD +++ b/src/tools/javatests/com/google/devtools/build/android/sandboxedsdktoolbox/sdkdependenciesmanifest/BUILD @@ -15,9 +15,9 @@ java_test( data = glob(["testdata/*"]), deps = [ "//src/tools/javatests/com/google/devtools/build/android/sandboxedsdktoolbox/utils", - "@rules_android_maven//:com_android_tools_build_bundletool", - "@rules_android_maven//:com_google_protobuf_protobuf_java_util", - "@rules_android_maven//:com_google_truth_truth", - "@rules_android_maven//:junit_junit", + "@maven//:com_android_tools_build_bundletool", + "@maven//:com_google_protobuf_protobuf_java_util", + "@maven//:com_google_truth_truth", + "@maven//:junit_junit", ], ) diff --git a/src/tools/javatests/com/google/devtools/build/android/sandboxedsdktoolbox/sdksplitproperties/BUILD b/src/tools/javatests/com/google/devtools/build/android/sandboxedsdktoolbox/sdksplitproperties/BUILD index 63fa85bfd..8a6c1ac67 100644 --- a/src/tools/javatests/com/google/devtools/build/android/sandboxedsdktoolbox/sdksplitproperties/BUILD +++ b/src/tools/javatests/com/google/devtools/build/android/sandboxedsdktoolbox/sdksplitproperties/BUILD @@ -15,11 +15,11 @@ java_test( data = glob(["testdata/*"]), deps = [ "//src/tools/javatests/com/google/devtools/build/android/sandboxedsdktoolbox/utils", - "@rules_android_maven//:com_android_tools_build_bundletool", - "@rules_android_maven//:com_google_guava_guava", - "@rules_android_maven//:com_google_protobuf_protobuf_java", - "@rules_android_maven//:com_google_protobuf_protobuf_java_util", - "@rules_android_maven//:com_google_truth_truth", - "@rules_android_maven//:junit_junit", + "@maven//:com_android_tools_build_bundletool", + "@maven//:com_google_guava_guava", + "@maven//:com_google_protobuf_protobuf_java", + "@maven//:com_google_protobuf_protobuf_java_util", + "@maven//:com_google_truth_truth", + "@maven//:junit_junit", ], ) diff --git a/src/tools/javatests/com/google/devtools/build/android/sandboxedsdktoolbox/utils/BUILD b/src/tools/javatests/com/google/devtools/build/android/sandboxedsdktoolbox/utils/BUILD index a261c8472..ebc8db3c9 100644 --- a/src/tools/javatests/com/google/devtools/build/android/sandboxedsdktoolbox/utils/BUILD +++ b/src/tools/javatests/com/google/devtools/build/android/sandboxedsdktoolbox/utils/BUILD @@ -13,6 +13,6 @@ java_library( srcs = glob(["*.java"]), deps = [ "//src/tools/java/com/google/devtools/build/android/sandboxedsdktoolbox:sandboxed_sdk_toolbox_lib", - "@rules_android_maven//:info_picocli_picocli", + "@maven//:info_picocli_picocli", ], ) diff --git a/src/tools/javatests/com/google/devtools/build/android/sandboxedsdktoolbox/validatemodulesconfig/BUILD b/src/tools/javatests/com/google/devtools/build/android/sandboxedsdktoolbox/validatemodulesconfig/BUILD index a1d2c793a..053dd0444 100644 --- a/src/tools/javatests/com/google/devtools/build/android/sandboxedsdktoolbox/validatemodulesconfig/BUILD +++ b/src/tools/javatests/com/google/devtools/build/android/sandboxedsdktoolbox/validatemodulesconfig/BUILD @@ -14,9 +14,9 @@ java_test( srcs = ["ValidateModulesConfigCommandTest.java"], deps = [ "//src/tools/javatests/com/google/devtools/build/android/sandboxedsdktoolbox/utils", - "@rules_android_maven//:com_android_tools_build_bundletool", - "@rules_android_maven//:com_google_protobuf_protobuf_java_util", - "@rules_android_maven//:com_google_truth_truth", - "@rules_android_maven//:junit_junit", + "@maven//:com_android_tools_build_bundletool", + "@maven//:com_google_protobuf_protobuf_java_util", + "@maven//:com_google_truth_truth", + "@maven//:junit_junit", ], ) diff --git a/src/tools/javatests/com/google/devtools/build/android/xml/BUILD b/src/tools/javatests/com/google/devtools/build/android/xml/BUILD index 669bc1e81..561a7217b 100644 --- a/src/tools/javatests/com/google/devtools/build/android/xml/BUILD +++ b/src/tools/javatests/com/google/devtools/build/android/xml/BUILD @@ -15,9 +15,9 @@ java_test( "//src/tools/java/com/google/devtools/build/android:android_builder_lib", "//src/tools/java/com/google/devtools/build/android/proto:resources_java_proto", "//src/tools/java/com/google/devtools/build/android/resources", - "@rules_android_maven//:com_google_errorprone_error_prone_annotations", - "@rules_android_maven//:com_google_truth_truth", - "@rules_android_maven//:junit_junit", + "@maven//:com_google_errorprone_error_prone_annotations", + "@maven//:com_google_truth_truth", + "@maven//:junit_junit", ], ) @@ -28,11 +28,11 @@ java_test( deps = [ "//src/tools/java/com/google/devtools/build/android:android_builder_lib", "//src/tools/java/com/google/devtools/build/android/proto:resources_java_proto", - "@rules_android_maven//:com_google_truth_truth", - "@rules_android_maven//:junit_junit", + "@maven//:com_google_truth_truth", + "@maven//:junit_junit", ], runtime_deps = [ - "@rules_android_maven//:com_google_guava_guava", + "@maven//:com_google_guava_guava", ], ) @@ -43,7 +43,7 @@ java_test( deps = [ "//src/tools/java/com/google/devtools/build/android:android_builder_lib", "//src/tools/java/com/google/devtools/build/android/proto:resources_java_proto", - "@rules_android_maven//:com_google_truth_truth", - "@rules_android_maven//:junit_junit", + "@maven//:com_google_truth_truth", + "@maven//:junit_junit", ], ) diff --git a/src/tools/javatests/com/google/devtools/build/android/ziputils/BUILD b/src/tools/javatests/com/google/devtools/build/android/ziputils/BUILD index 5daaf9cea..8729533b0 100644 --- a/src/tools/javatests/com/google/devtools/build/android/ziputils/BUILD +++ b/src/tools/javatests/com/google/devtools/build/android/ziputils/BUILD @@ -20,9 +20,9 @@ java_test( test_class = "com.google.devtools.build.android.ziputils.AllTests", deps = [ "//src/tools/java/com/google/devtools/build/android/ziputils:ziputils_lib", - "@rules_android_maven//:com_google_code_findbugs_jsr305", - "@rules_android_maven//:com_google_guava_guava", - "@rules_android_maven//:com_google_truth_truth", - "@rules_android_maven//:junit_junit", + "@maven//:com_google_code_findbugs_jsr305", + "@maven//:com_google_guava_guava", + "@maven//:com_google_truth_truth", + "@maven//:junit_junit", ], ) diff --git a/test/rules/android_local_test/BUILD b/test/rules/android_local_test/BUILD index 5bae4ddaa..e6f5e892c 100644 --- a/test/rules/android_local_test/BUILD +++ b/test/rules/android_local_test/BUILD @@ -32,8 +32,8 @@ android_local_test( test_class = "com.google.android.emptytest.EmptyTest", deps = [ "@robolectric//bazel:android-all", - "@rules_android_maven//:androidx_test_ext_junit", - "@rules_android_maven//:junit_junit", + "@maven//:androidx_test_ext_junit", + "@maven//:junit_junit", ], ) @@ -44,8 +44,8 @@ android_local_test( test_class = "com.google.android.emptytest.EmptyTest", deps = [ "@robolectric//bazel:android-all", - "@rules_android_maven//:androidx_test_ext_junit", - "@rules_android_maven//:junit_junit", + "@maven//:androidx_test_ext_junit", + "@maven//:junit_junit", ], ) diff --git a/test/rules/android_local_test/java/com/starlark_resources/BUILD b/test/rules/android_local_test/java/com/starlark_resources/BUILD index 6fd487efd..796798d79 100644 --- a/test/rules/android_local_test/java/com/starlark_resources/BUILD +++ b/test/rules/android_local_test/java/com/starlark_resources/BUILD @@ -25,10 +25,10 @@ android_local_test( test_class = "com.starlark_resources.SampleTest", deps = [ "@robolectric//bazel:android-all", - "@rules_android_maven//:androidx_test_core", - "@rules_android_maven//:androidx_test_ext_junit", - "@rules_android_maven//:junit_junit", - "@rules_android_maven//:org_robolectric_robolectric", + "@maven//:androidx_test_core", + "@maven//:androidx_test_ext_junit", + "@maven//:junit_junit", + "@maven//:org_robolectric_robolectric", ], ) @@ -44,11 +44,11 @@ android_local_test( test_class = "com.starlark_resources.SampleTestWithEnvSetting", deps = [ "@robolectric//bazel:android-all", - "@rules_android_maven//:androidx_test_core", - "@rules_android_maven//:androidx_test_ext_junit", - "@rules_android_maven//:junit_junit", - "@rules_android_maven//:org_hamcrest_hamcrest_core", - "@rules_android_maven//:org_robolectric_robolectric", + "@maven//:androidx_test_core", + "@maven//:androidx_test_ext_junit", + "@maven//:junit_junit", + "@maven//:org_hamcrest_hamcrest_core", + "@maven//:org_robolectric_robolectric", ], ) @@ -76,10 +76,10 @@ android_local_test( deps = [ ":resource_processing", "@robolectric//bazel:android-all", - "@rules_android_maven//:androidx_test_core", - "@rules_android_maven//:androidx_test_ext_junit", - "@rules_android_maven//:junit_junit", - "@rules_android_maven//:org_robolectric_robolectric", + "@maven//:androidx_test_core", + "@maven//:androidx_test_ext_junit", + "@maven//:junit_junit", + "@maven//:org_robolectric_robolectric", ], ) @@ -96,10 +96,10 @@ android_local_test( deps = [ ":resource_processing", "@robolectric//bazel:android-all", - "@rules_android_maven//:androidx_test_core", - "@rules_android_maven//:androidx_test_ext_junit", - "@rules_android_maven//:junit_junit", - "@rules_android_maven//:org_robolectric_robolectric", + "@maven//:androidx_test_core", + "@maven//:androidx_test_ext_junit", + "@maven//:junit_junit", + "@maven//:org_robolectric_robolectric", ], ) @@ -125,10 +125,10 @@ android_local_test( deps = [ ":resources_with_dep_with_res", "@robolectric//bazel:android-all", - "@rules_android_maven//:androidx_test_core", - "@rules_android_maven//:androidx_test_ext_junit", - "@rules_android_maven//:junit_junit", - "@rules_android_maven//:org_robolectric_robolectric", + "@maven//:androidx_test_core", + "@maven//:androidx_test_ext_junit", + "@maven//:junit_junit", + "@maven//:org_robolectric_robolectric", ], ) @@ -153,10 +153,10 @@ android_local_test( deps = [ ":resource_processing_with_neverlink", "@robolectric//bazel:android-all", - "@rules_android_maven//:androidx_test_core", - "@rules_android_maven//:androidx_test_ext_junit", - "@rules_android_maven//:junit_junit", - "@rules_android_maven//:org_robolectric_robolectric", + "@maven//:androidx_test_core", + "@maven//:androidx_test_ext_junit", + "@maven//:junit_junit", + "@maven//:org_robolectric_robolectric", ], ) @@ -169,10 +169,10 @@ android_local_test( test_class = "com.starlark_resources.SampleTest", deps = [ "@robolectric//bazel:android-all", - "@rules_android_maven//:androidx_test_core", - "@rules_android_maven//:androidx_test_ext_junit", - "@rules_android_maven//:junit_junit", - "@rules_android_maven//:org_robolectric_robolectric", + "@maven//:androidx_test_core", + "@maven//:androidx_test_ext_junit", + "@maven//:junit_junit", + "@maven//:org_robolectric_robolectric", ], ) @@ -184,9 +184,9 @@ android_local_test( test_class = "com.starlark_resources.SampleTest", deps = [ "@robolectric//bazel:android-all", - "@rules_android_maven//:androidx_test_core", - "@rules_android_maven//:androidx_test_ext_junit", - "@rules_android_maven//:junit_junit", - "@rules_android_maven//:org_robolectric_robolectric", + "@maven//:androidx_test_core", + "@maven//:androidx_test_ext_junit", + "@maven//:junit_junit", + "@maven//:org_robolectric_robolectric", ], ) diff --git a/test/rules/android_local_test/non_java/BUILD b/test/rules/android_local_test/non_java/BUILD index e3f10b78e..6983e1ad9 100644 --- a/test/rules/android_local_test/non_java/BUILD +++ b/test/rules/android_local_test/non_java/BUILD @@ -36,10 +36,10 @@ android_local_test( deps = [ ":resource_processing", "@robolectric//bazel:android-all", - "@rules_android_maven//:androidx_test_core", - "@rules_android_maven//:androidx_test_ext_junit", - "@rules_android_maven//:junit_junit", - "@rules_android_maven//:org_robolectric_robolectric", + "@maven//:androidx_test_core", + "@maven//:androidx_test_ext_junit", + "@maven//:junit_junit", + "@maven//:org_robolectric_robolectric", ], ) diff --git a/test/utils/java/com/google/BUILD b/test/utils/java/com/google/BUILD index 00f62bf47..8bcc72dd3 100644 --- a/test/utils/java/com/google/BUILD +++ b/test/utils/java/com/google/BUILD @@ -11,9 +11,9 @@ java_binary( name = "RClassChecker", srcs = ["RClassChecker.java"], deps = [ - "@rules_android_maven//:com_beust_jcommander", - "@rules_android_maven//:com_google_flogger_flogger", - "@rules_android_maven//:com_google_flogger_flogger_system_backend", - "@rules_android_maven//:com_google_guava_guava", + "@maven//:com_beust_jcommander", + "@maven//:com_google_flogger_flogger", + "@maven//:com_google_flogger_flogger_system_backend", + "@maven//:com_google_guava_guava", ], ) diff --git a/tools/android/BUILD b/tools/android/BUILD index 241ca1619..23f6d3786 100644 --- a/tools/android/BUILD +++ b/tools/android/BUILD @@ -52,7 +52,7 @@ java_binary( name = "bundletool", main_class = "com.android.tools.build.bundletool.BundleToolMain", visibility = ["//visibility:public"], - runtime_deps = ["@rules_android_maven//:com_android_tools_build_bundletool"], + runtime_deps = ["@maven//:com_android_tools_build_bundletool"], ) java_plugin( @@ -80,11 +80,11 @@ alias( genrule( name = "full_desugar_jdk_libs_config_json", srcs = [ - "@rules_android_maven//:com_android_tools_desugar_jdk_libs_configuration_nio", + "@maven//:com_android_tools_desugar_jdk_libs_configuration_nio", ], outs = ["full_desugar_jdk_libs_config.json"], cmd = "unzip -q -c " + - "$(location @rules_android_maven//:com_android_tools_desugar_jdk_libs_configuration_nio) " + + "$(location @maven//:com_android_tools_desugar_jdk_libs_configuration_nio) " + "META-INF/desugar/d8/desugar.json > $@", visibility = ["//visibility:public"], ) @@ -92,11 +92,11 @@ genrule( genrule( name = "minimal_desugar_jdk_libs_config_json", srcs = [ - "@rules_android_maven//:com_android_tools_desugar_jdk_libs_configuration_minimal", + "@maven//:com_android_tools_desugar_jdk_libs_configuration_minimal", ], outs = ["minimal_desugar_jdk_libs_config.json"], cmd = "unzip -q -c " + - "$(location @rules_android_maven//:com_android_tools_desugar_jdk_libs_configuration_minimal) " + + "$(location @maven//:com_android_tools_desugar_jdk_libs_configuration_minimal) " + "META-INF/desugar/d8/desugar.json > $@", ) @@ -134,9 +134,9 @@ genrule( genrule( name = "desugared_jdk_libs_from_maven_jar", srcs = select({ - "full_desugaring": ["@rules_android_maven//:com_android_tools_desugar_jdk_libs_nio"], - "minimal_desugaring": ["@rules_android_maven//:com_android_tools_desugar_jdk_libs_minimal"], - "//conditions:default": ["@rules_android_maven//:com_android_tools_desugar_jdk_libs_nio"], + "full_desugaring": ["@maven//:com_android_tools_desugar_jdk_libs_nio"], + "minimal_desugaring": ["@maven//:com_android_tools_desugar_jdk_libs_minimal"], + "//conditions:default": ["@maven//:com_android_tools_desugar_jdk_libs_nio"], }), outs = ["desugared_jdk_libs_from_maven.jar"], cmd = "cp $< $@", @@ -146,7 +146,7 @@ run_singlejar( name = "desugar_jdk_libs_all", srcs = [ ":desugared_jdk_libs_from_maven_jar", - "@rules_android_maven//:com_android_tools_desugar_jdk_libs_configuration", + "@maven//:com_android_tools_desugar_jdk_libs_configuration", ], out = "desugar_jdk_libs_all.jar", ) @@ -255,7 +255,7 @@ java_binary( jvm_flags = _JVM_FLAGS, main_class = "com.android.tools.r8.D8", visibility = ["//visibility:public"], - runtime_deps = ["@rules_android_maven//:com_android_tools_r8"], + runtime_deps = ["@maven//:com_android_tools_r8"], ) java_binary( @@ -263,7 +263,7 @@ java_binary( jvm_flags = _JVM_FLAGS, main_class = "com.android.tools.r8.R8", visibility = ["//visibility:public"], - runtime_deps = ["@rules_android_maven//:com_android_tools_r8"], + runtime_deps = ["@maven//:com_android_tools_r8"], ) java_binary( @@ -271,14 +271,14 @@ java_binary( jvm_flags = _JVM_FLAGS, main_class = "com.android.tools.r8.tracereferences.TraceReferences", visibility = ["//visibility:public"], - runtime_deps = ["@rules_android_maven//:com_android_tools_r8"], + runtime_deps = ["@maven//:com_android_tools_r8"], ) java_binary( name = "resource_shrinker", main_class = "com.android.build.shrinker.ResourceShrinkerCli", visibility = ["//visibility:public"], - runtime_deps = ["@rules_android_maven//:com_android_tools_build_gradle"], + runtime_deps = ["@maven//:com_android_tools_build_gradle"], ) alias( @@ -352,7 +352,7 @@ java_binary( "-Xmx8g", ], main_class = "com.android.tools.r8.GlobalSyntheticsGenerator", - runtime_deps = ["@rules_android_maven//:com_android_tools_r8"], + runtime_deps = ["@maven//:com_android_tools_r8"], ) alias( @@ -499,15 +499,15 @@ java_binary( main_class = "com.android.tools.deployer.DeployerRunner", visibility = ["//visibility:public"], runtime_deps = [ - "@rules_android_maven//:com_android_tools_apkdeployer_apkdeployer", + "@maven//:com_android_tools_apkdeployer_apkdeployer", ], ) java_library( name = "auto_service_lib", exports = [ - "@rules_android_maven//:com_google_auto_service_auto_service", - "@rules_android_maven//:com_google_auto_service_auto_service_annotations", + "@maven//:com_google_auto_service_auto_service", + "@maven//:com_google_auto_service_auto_service_annotations", ], ) @@ -515,7 +515,7 @@ java_library( name = "autovalue_lib", exports = [ ":auto_service_lib", - "@rules_android_maven//:com_google_auto_auto_common", + "@maven//:com_google_auto_auto_common", ], ) @@ -523,7 +523,7 @@ java_plugin( name = "autovalue_plugin", processor_class = "com.google.auto.value.processor.AutoValueProcessor", deps = [ - "@rules_android_maven//:com_google_auto_value_auto_value", + "@maven//:com_google_auto_value_auto_value", ], ) @@ -531,7 +531,7 @@ java_plugin( name = "auto_annotation_plugin", processor_class = "com.google.auto.value.processor.AutoAnnotationProcessor", deps = [ - "@rules_android_maven//:com_google_auto_value_auto_value", + "@maven//:com_google_auto_value_auto_value", ], ) @@ -539,14 +539,14 @@ java_plugin( name = "auto_builder_plugin", processor_class = "com.google.auto.value.processor.AutoBuilderProcessor", deps = [ - "@rules_android_maven//:com_google_auto_value_auto_value", + "@maven//:com_google_auto_value_auto_value", ], ) java_library( name = "auto_value_api", exports = [ - "@rules_android_maven//:com_google_auto_value_auto_value_annotations", + "@maven//:com_google_auto_value_auto_value_annotations", ], ) @@ -566,8 +566,8 @@ java_library( java_library( name = "error_prone_annotations", exports = [ - "@rules_android_maven//:com_google_errorprone_error_prone_annotations", - "@rules_android_maven//:com_google_errorprone_error_prone_type_annotations", + "@maven//:com_google_errorprone_error_prone_annotations", + "@maven//:com_google_errorprone_error_prone_type_annotations", ], ) @@ -575,8 +575,8 @@ java_library( name = "error_prone", exports = [ ":error_prone_annotations", - "@rules_android_maven//:com_google_errorprone_error_prone_check_api", - "@rules_android_maven//:com_google_errorprone_error_prone_core", + "@maven//:com_google_errorprone_error_prone_check_api", + "@maven//:com_google_errorprone_error_prone_core", ], )