Update to androidx.annotation 1.7.0-beta01

And remove workaround to use jvm version since that issue has now been fixed. PiperOrigin-RevId: 558254984
android · Aug 18, 2023 · ffc7a5c · ffc7a5c
1 parent 2936925
commit ffc7a5c
Show file tree

Hide file tree

Showing 81 changed files with 128 additions and 100 deletions.
diff --git a/WORKSPACE b/WORKSPACE
@@ -92,7 +92,7 @@ grpc_java_repositories()
 maven_install(
     name = "maven",
     artifacts = [
-        "androidx.annotation:annotation-jvm:" + ANDROIDX_ANNOTATION_VERSION,
+        "androidx.annotation:annotation:" + ANDROIDX_ANNOTATION_VERSION,
         "androidx.annotation:annotation-experimental:jar:" + ANDROIDX_ANNOTATION_EXPERIMENTAL_VERSION,
         "androidx.appcompat:appcompat:" + ANDROIDX_COMPAT_VERSION,
         "androidx.concurrent:concurrent-futures:" + ANDROIDX_CONCURRENT_VERSION,

diff --git a/annotation/java/androidx/test/annotation/BUILD b/annotation/java/androidx/test/annotation/BUILD
@@ -21,8 +21,8 @@ android_library(
     manifest = "AndroidManifest.xml",
     tags = ["alt_dep=//annotation"],
     deps = [
+        "//opensource/androidx:annotation",
         "@maven//:androidx_annotation_annotation_experimental",
-        "@maven//:androidx_annotation_annotation_jvm",
     ],
 )
 

diff --git a/build_extensions/axt_versions.bzl b/build_extensions/axt_versions.bzl
@@ -23,7 +23,7 @@ SERVICES_APK_ARTIFACT = "androidx.test.services:test-services:%s" % SERVICES_VER
 ORCHESTRATOR_ARTIFACT = "androidx.test:orchestrator:%s" % ORCHESTRATOR_VERSION
 
 # Maven dependency versions
-ANDROIDX_ANNOTATION_VERSION = "1.6.0"
+ANDROIDX_ANNOTATION_VERSION = "1.7.0-beta01"
 ANDROIDX_ANNOTATION_EXPERIMENTAL_VERSION = "1.1.0"
 ANDROIDX_COMPAT_VERSION = "1.3.1"
 ANDROIDX_CONCURRENT_VERSION = "1.1.0"

diff --git a/core/java/androidx/test/core/BUILD b/core/java/androidx/test/core/BUILD
@@ -47,9 +47,9 @@ kt_android_library(
     deps = [
         ":manifest",
         "//annotation",
+        "//opensource/androidx:annotation",
         "//runner/monitor",
         "//services/storage",
-        "@maven//:androidx_annotation_annotation_jvm",
         "@maven//:androidx_concurrent_concurrent_futures",
         "@maven//:androidx_lifecycle_lifecycle_common",
         "@maven//:androidx_tracing_tracing",

diff --git a/core/javatests/androidx/test/core/app/testing/BUILD b/core/javatests/androidx/test/core/app/testing/BUILD
@@ -21,7 +21,7 @@ kt_android_library(
     resource_files = glob(["res/**"]),
     visibility = ["//visibility:public"],
     deps = [
-        "@maven//:androidx_annotation_annotation_jvm",
+        "//opensource/androidx:annotation",
         "@maven//:com_google_guava_guava",
         "@maven//:junit_junit",
     ],

diff --git a/espresso/core/java/androidx/test/espresso/BUILD b/espresso/core/java/androidx/test/espresso/BUILD
@@ -79,9 +79,9 @@ android_library(
         "//espresso/core/java/androidx/test/espresso/remote:interface",
         "//espresso/core/java/androidx/test/espresso/util",
         "//espresso/core/java/androidx/test/espresso/util/concurrent",
+        "//opensource/androidx:annotation",
         "//opensource/dagger",
         "//runner/android_junit_runner",
-        "@maven//:androidx_annotation_annotation_jvm",
         "@maven//:androidx_concurrent_concurrent_futures",
         "@maven//:javax_inject_javax_inject",
         "@maven//:org_hamcrest_hamcrest_core",
@@ -110,9 +110,9 @@ android_library(
         "//espresso/core/java/androidx/test/espresso/base:idling_resource_registry",
         "//espresso/core/java/androidx/test/espresso/internal/data",
         "//espresso/core/java/androidx/test/espresso/util/concurrent",
+        "//opensource/androidx:annotation",
         "//opensource/dagger",
         "//runner/android_junit_runner",
-        "@maven//:androidx_annotation_annotation_jvm",
         "@maven//:javax_inject_javax_inject",
         "@maven//:org_hamcrest_hamcrest_core",
     ],
@@ -159,8 +159,8 @@ android_library(
         "//espresso/core/java/androidx/test/espresso/util",
         "//espresso/core/java/androidx/test/espresso/util/concurrent",
         "//espresso/idling_resource/java/androidx/test/espresso:idling_resource_internal",
+        "//opensource/androidx:annotation",
         "//runner/monitor",
-        "@maven//:androidx_annotation_annotation_jvm",
         "@maven//:com_google_code_findbugs_jsr305",
         "@maven//:org_hamcrest_hamcrest_core",
         "@maven//:org_hamcrest_hamcrest_library",
@@ -185,8 +185,8 @@ android_library(
     deps = [
         "//annotation",
         "//espresso/core/java/androidx/test/espresso/util",
+        "//opensource/androidx:annotation",
         "//runner/monitor",
-        "@maven//:androidx_annotation_annotation_jvm",
         "@maven//:com_google_errorprone_error_prone_annotations",
         "@maven//:org_hamcrest_hamcrest_core",
         "@maven//:org_jetbrains_kotlin_kotlin_stdlib",

diff --git a/espresso/core/java/androidx/test/espresso/action/BUILD b/espresso/core/java/androidx/test/espresso/action/BUILD
@@ -25,8 +25,8 @@ android_library(
     deps = [
         "//espresso/core/java/androidx/test/espresso/matcher",
         "//espresso/core/java/androidx/test/espresso/util",
+        "//opensource/androidx:annotation",
         "//runner/monitor",
-        "@maven//:androidx_annotation_annotation_jvm",
         "@maven//:org_jetbrains_kotlin_kotlin_stdlib",
     ],
 )
@@ -46,8 +46,8 @@ android_library(
         "//espresso/core/java/androidx/test/espresso/remote/annotation:remote_msg_annotations",
         "//espresso/core/java/androidx/test/espresso/util",
         "//espresso/idling_resource/java/androidx/test/espresso:idling_resource",
+        "//opensource/androidx:annotation",
         "//runner/android_junit_runner",
-        "@maven//:androidx_annotation_annotation_jvm",
         "@maven//:com_google_errorprone_error_prone_annotations",
         "@maven//:org_hamcrest_hamcrest_core",
         "@maven//:org_hamcrest_hamcrest_library",

diff --git a/espresso/core/java/androidx/test/espresso/assertion/BUILD b/espresso/core/java/androidx/test/espresso/assertion/BUILD
@@ -25,8 +25,8 @@ android_library(
         "//espresso/core/java/androidx/test/espresso/matcher",
         "//espresso/core/java/androidx/test/espresso/remote/annotation:remote_msg_annotations",
         "//espresso/core/java/androidx/test/espresso/util",
+        "//opensource/androidx:annotation",
         "//runner/monitor",
-        "@maven//:androidx_annotation_annotation_jvm",
         "@maven//:junit_junit",
         "@maven//:org_hamcrest_hamcrest_core",
         "@maven//:org_hamcrest_hamcrest_library",

diff --git a/espresso/core/java/androidx/test/espresso/base/BUILD b/espresso/core/java/androidx/test/espresso/base/BUILD
@@ -38,9 +38,9 @@ android_library(
         "//espresso/core/java/androidx/test/espresso/util",
         "//espresso/core/java/androidx/test/espresso/util/concurrent",
         "//espresso/idling_resource/java/androidx/test/espresso:idling_resource",
+        "//opensource/androidx:annotation",
         "//opensource/dagger",
         "//runner/android_junit_runner",
-        "@maven//:androidx_annotation_annotation_jvm",
         "@maven//:javax_inject_javax_inject",
         "@maven//:org_hamcrest_hamcrest_core",
         "@maven//:org_jetbrains_kotlin_kotlin_stdlib",
@@ -70,8 +70,8 @@ android_library(
         "//espresso/core/java/androidx/test/espresso:interface",
         "//espresso/core/java/androidx/test/espresso/util",
         "//espresso/idling_resource/java/androidx/test/espresso:idling_resource_internal",
+        "//opensource/androidx:annotation",
         "//runner/monitor",
-        "@maven//:androidx_annotation_annotation_jvm",
         "@maven//:javax_inject_javax_inject",
         "@maven//:org_jetbrains_kotlin_kotlin_stdlib",
     ],
@@ -102,10 +102,10 @@ android_library(
         "//espresso/core/java/androidx/test/espresso:interface",
         "//espresso/core/java/androidx/test/espresso/internal/inject",
         "//espresso/core/java/androidx/test/espresso/util",
+        "//opensource/androidx:annotation",
         "//opensource/dagger",
         "//runner/monitor",
         "//services/storage/java/androidx/test/services/storage",
-        "@maven//:androidx_annotation_annotation_jvm",
         "@maven//:javax_inject_javax_inject",
         "@maven//:junit_junit",
         "@maven//:org_hamcrest_hamcrest_core",

diff --git a/espresso/core/java/androidx/test/espresso/core/internal/deps/dagger/BUILD b/espresso/core/java/androidx/test/espresso/core/internal/deps/dagger/BUILD
@@ -12,6 +12,6 @@ java_library(
     name = "dagger",
     srcs = glob(["*java"]),
     deps = [
-        "@maven//:androidx_annotation_annotation_jvm",
+        "//opensource/androidx:annotation",
     ],
 )
diff --git a/espresso/core/java/androidx/test/espresso/core/internal/deps/guava/base/BUILD b/espresso/core/java/androidx/test/espresso/core/internal/deps/guava/base/BUILD
@@ -14,8 +14,8 @@ android_library(
     name = "base",
     srcs = glob(["*java"]),
     deps = [
+        "//opensource/androidx:annotation",
         "//runner/monitor",
-        "@maven//:androidx_annotation_annotation_jvm",
         "@maven//:org_jetbrains_kotlin_kotlin_stdlib",
     ],
 )
diff --git a/espresso/core/java/androidx/test/espresso/internal/data/BUILD b/espresso/core/java/androidx/test/espresso/internal/data/BUILD
@@ -16,7 +16,7 @@ android_library(
     deps = [
         "//espresso/core/java/androidx/test/espresso/action",
         "//espresso/core/java/androidx/test/espresso/internal/data/model",
+        "//opensource/androidx:annotation",
         "//runner/monitor",
-        "@maven//:androidx_annotation_annotation_jvm",
     ],
 )
diff --git a/espresso/core/java/androidx/test/espresso/internal/data/model/BUILD b/espresso/core/java/androidx/test/espresso/internal/data/model/BUILD
@@ -16,7 +16,7 @@ kt_android_library(
     ]),
     deps = [
         "//espresso/core/java/androidx/test/espresso:framework",
-        "@maven//:androidx_annotation_annotation_jvm",
+        "//opensource/androidx:annotation",
         "@maven//:org_hamcrest_hamcrest_core",
     ],
 )
diff --git a/espresso/core/java/androidx/test/espresso/internal/inject/BUILD b/espresso/core/java/androidx/test/espresso/internal/inject/BUILD
@@ -15,7 +15,7 @@ android_library(
         "//:__subpackages__",
     ],
     deps = [
-        "@maven//:androidx_annotation_annotation_jvm",
+        "//opensource/androidx:annotation",
         "@maven//:javax_inject_javax_inject",
     ],
 )
diff --git a/espresso/core/java/androidx/test/espresso/matcher/BUILD b/espresso/core/java/androidx/test/espresso/matcher/BUILD
@@ -25,8 +25,8 @@ android_library(
         "//espresso/core/java/androidx/test/espresso/remote:interface",
         "//espresso/core/java/androidx/test/espresso/remote/annotation:remote_msg_annotations",
         "//espresso/core/java/androidx/test/espresso/util",
+        "//opensource/androidx:annotation",
         "//runner/android_junit_runner",
-        "@maven//:androidx_annotation_annotation_jvm",
         "@maven//:junit_junit",
         "@maven//:org_hamcrest_hamcrest_core",
         "@maven//:org_hamcrest_hamcrest_library",

diff --git a/espresso/core/java/androidx/test/espresso/remote/BUILD b/espresso/core/java/androidx/test/espresso/remote/BUILD
@@ -31,7 +31,7 @@ android_library(
         "//espresso/core/java/androidx/test/espresso:framework",
         "//espresso/core/java/androidx/test/espresso:interface",
         "//espresso/core/java/androidx/test/espresso/remote/annotation:remote_msg_annotations",
-        "@maven//:androidx_annotation_annotation_jvm",
+        "//opensource/androidx:annotation",
         "@maven//:org_hamcrest_hamcrest_core",
     ],
 )
@@ -47,8 +47,8 @@ android_library(
     visibility = ["//visibility:public"],
     deps = [
         ":exceptions",
+        "//opensource/androidx:annotation",
         "//runner/android_junit_runner",
-        "@maven//:androidx_annotation_annotation_jvm",
     ],
 )
 

diff --git a/espresso/core/java/androidx/test/espresso/screenshot/BUILD b/espresso/core/java/androidx/test/espresso/screenshot/BUILD
@@ -18,7 +18,7 @@ kt_android_library(
         "//espresso/core/java/androidx/test/espresso:interface",
         "//espresso/core/java/androidx/test/espresso:view-interaction",
         "//espresso/core/java/androidx/test/espresso/matcher",
-        "@maven//:androidx_annotation_annotation_jvm",
+        "//opensource/androidx:annotation",
         "@maven//:androidx_concurrent_concurrent_futures",
         "@maven//:org_hamcrest_hamcrest_core",
         "@maven//:org_hamcrest_hamcrest_library",

diff --git a/espresso/core/java/androidx/test/espresso/util/BUILD b/espresso/core/java/androidx/test/espresso/util/BUILD
@@ -18,8 +18,8 @@ kt_android_library(
     ]),
     deps = [
         "//espresso/core/java/androidx/test/espresso/core/internal/deps/guava/base",
+        "//opensource/androidx:annotation",
         "//runner/android_junit_runner",
-        "@maven//:androidx_annotation_annotation_jvm",
         "@maven//:org_hamcrest_hamcrest_core",
         "@maven_listenablefuture//:com_google_guava_listenablefuture",
     ],

diff --git a/espresso/core/java/androidx/test/espresso/util/concurrent/BUILD b/espresso/core/java/androidx/test/espresso/util/concurrent/BUILD
@@ -17,8 +17,8 @@ android_library(
         "*.kt",
     ]),
     deps = [
+        "//opensource/androidx:annotation",
         "//runner/monitor",
-        "@maven//:androidx_annotation_annotation_jvm",
         "@maven_listenablefuture//:com_google_guava_listenablefuture",
     ],
 )
diff --git a/espresso/core/javatests/androidx/test/espresso/BUILD b/espresso/core/javatests/androidx/test/espresso/BUILD
@@ -21,8 +21,8 @@ android_library(
         "//espresso/core/javatests/androidx/test/espresso:__subpackages__",
     ],
     deps = [
+        "//opensource/androidx:annotation",
         "//runner/monitor",
-        "@maven//:androidx_annotation_annotation_jvm",
         "@maven//:org_hamcrest_hamcrest_core",
     ],
 )
@@ -48,10 +48,10 @@ android_app_instrumentation_tests(
         "//espresso/core/java/androidx/test/espresso/remote:interface",
         "//espresso/core/java/androidx/test/espresso/util/concurrent",
         "//ext/junit",
+        "//opensource/androidx:annotation",
         "//runner/android_junit_runner",
         "//runner/rules",
         "//testapps/ui_testapp/java/androidx/test/ui/app:lib_neverlink",
-        "@maven//:androidx_annotation_annotation_jvm",
         "@maven//:androidx_concurrent_concurrent_futures",
         "@maven//:com_google_truth_truth",
         "@maven//:junit_junit",

diff --git a/espresso/core/javatests/androidx/test/espresso/action/BUILD b/espresso/core/javatests/androidx/test/espresso/action/BUILD
@@ -31,12 +31,12 @@ android_app_instrumentation_tests(
         "//espresso/intents/java/androidx/test/espresso/intent:intents",
         "//espresso/intents/java/androidx/test/espresso/intent/matcher",
         "//ext/junit",
+        "//opensource/androidx:annotation",
         "//runner/android_junit_runner",
         "//runner/rules",
         "//services/storage/java/androidx/test/services/storage",
         "//testapps/ui_testapp/java/androidx/test/ui/app:lib_neverlink",
         "//testapps/ui_testapp/javatests/androidx/test/ui/app:test_resources",
-        "@maven//:androidx_annotation_annotation_jvm",
         "@maven//:com_google_truth_truth",
         "@maven//:junit_junit",
         "@maven//:org_hamcrest_hamcrest_core",

diff --git a/espresso/core/javatests/androidx/test/espresso/base/BUILD b/espresso/core/javatests/androidx/test/espresso/base/BUILD
@@ -47,12 +47,12 @@ android_app_instrumentation_tests(
         "//espresso/core/java/androidx/test/espresso/matcher",
         "//espresso/core/javatests/androidx/test/espresso:utils",
         "//ext/junit",
+        "//opensource/androidx:annotation",
         "//runner/android_junit_runner/java/androidx/test:runner",
         "//runner/rules",
         "//services/storage",
         "//testapps/ui_testapp/java/androidx/test/ui/app:lib_neverlink",
         "//testapps/ui_testapp/javatests/androidx/test/ui/app:test_resources",
-        "@maven//:androidx_annotation_annotation_jvm",
         "@maven//:com_google_truth_truth",
         "@maven//:javax_inject_javax_inject",
         "@maven//:junit_junit",

diff --git a/espresso/core/javatests/androidx/test/espresso/matcher/BUILD b/espresso/core/javatests/androidx/test/espresso/matcher/BUILD
@@ -40,11 +40,11 @@ android_app_instrumentation_tests(
         "//espresso/core/java/androidx/test/espresso/assertion",
         "//espresso/core/java/androidx/test/espresso/matcher",
         "//ext/junit",
+        "//opensource/androidx:annotation",
         "//runner/android_junit_runner",
         "//runner/rules",
         "//testapps/ui_testapp/java/androidx/test/ui/app:lib_neverlink",
         "@androidsdk//:legacy_test-30",
-        "@maven//:androidx_annotation_annotation_jvm",
         "@maven//:junit_junit",
         "@maven//:org_hamcrest_hamcrest_core",
         "@maven//:org_hamcrest_hamcrest_library",
@@ -71,11 +71,11 @@ android_app_instrumentation_tests(
         "//espresso/core/java/androidx/test/espresso/assertion",
         "//espresso/core/java/androidx/test/espresso/matcher",
         "//ext/junit",
+        "//opensource/androidx:annotation",
         "//runner/android_junit_runner",
         "//runner/rules",
         "//testapps/ui_testapp/java/androidx/test/ui/app:lib_neverlink",
         "@androidsdk//:legacy_test-30",
-        "@maven//:androidx_annotation_annotation_jvm",
         "@maven//:junit_junit",
         "@maven//:org_hamcrest_hamcrest_core",
         "@maven//:org_hamcrest_hamcrest_library",

diff --git a/espresso/device/java/androidx/test/espresso/device/common/BUILD b/espresso/device/java/androidx/test/espresso/device/common/BUILD
@@ -20,7 +20,7 @@ kt_android_library(
         "*.java",
     ]),
     deps = [
+        "//opensource/androidx:annotation",
         "//runner/monitor",
-        "@maven//:androidx_annotation_annotation_jvm",
     ],
 )
diff --git a/espresso/device/java/androidx/test/espresso/device/controller/BUILD b/espresso/device/java/androidx/test/espresso/device/controller/BUILD
@@ -21,7 +21,7 @@ kt_android_library(
     deps = [
         "//annotation/java/androidx/test/annotation",
         "//espresso/core/java/androidx/test/espresso:interface",
-        "@maven//:androidx_annotation_annotation_jvm",
+        "//opensource/androidx:annotation",
     ],
 )
 
@@ -34,7 +34,7 @@ kt_android_library(
     deps = [
         "//espresso/device/java/androidx/test/espresso/device/common",
         "//espresso/device/java/androidx/test/espresso/device/controller",
+        "//opensource/androidx:annotation",
         "//runner/monitor",
-        "@maven//:androidx_annotation_annotation_jvm",
     ],
 )
diff --git a/espresso/device/java/androidx/test/espresso/device/controller/emulator/BUILD b/espresso/device/java/androidx/test/espresso/device/controller/emulator/BUILD
@@ -19,10 +19,10 @@ kt_android_library(
     deps = [
         "//espresso/device/java/androidx/test/espresso/device/action",
         "//espresso/device/java/androidx/test/espresso/device/controller",
+        "//opensource/androidx:annotation",
         "//opensource/emulator/proto:emulator_controller_java_grpc",
         "//opensource/emulator/proto:emulator_controller_java_proto_lite",
         "//runner/monitor",
-        "@maven//:androidx_annotation_annotation_jvm",
         "@maven//:io_grpc_grpc_okhttp",
         "@maven//:io_grpc_grpc_stub",
         "@maven//:org_apache_tomcat_annotations_api",

diff --git a/espresso/device/java/androidx/test/espresso/device/dagger/BUILD b/espresso/device/java/androidx/test/espresso/device/dagger/BUILD
@@ -19,8 +19,8 @@ kt_android_library(
         "//espresso/device/java/androidx/test/espresso/device/controller",
         "//espresso/device/java/androidx/test/espresso/device/controller:controller_impl",
         "//espresso/device/java/androidx/test/espresso/device/controller/emulator",
+        "//opensource/androidx:annotation",
         "//opensource/dagger",
         "//runner/monitor",
-        "@maven//:androidx_annotation_annotation_jvm",
     ],
 )
diff --git a/espresso/device/java/androidx/test/espresso/device/internal/deps/emulator/BUILD b/espresso/device/java/androidx/test/espresso/device/internal/deps/emulator/BUILD
@@ -16,5 +16,5 @@ android_library(
     name = "emulator",
     testonly = 1,
     srcs = glob(["*.java"]),
-    deps = ["@maven//:androidx_annotation_annotation_jvm"],
+    deps = ["//opensource/androidx:annotation"],
 )
diff --git a/espresso/idling_resource/net/java/androidx/test/espresso/idling/net/BUILD b/espresso/idling_resource/net/java/androidx/test/espresso/idling/net/BUILD
@@ -20,7 +20,7 @@ android_library(
     visibility = ["//visibility:public"],
     deps = [
         "//espresso/idling_resource/java/androidx/test/espresso:idling_resource_internal",
-        "@maven//:androidx_annotation_annotation_jvm",
+        "//opensource/androidx:annotation",
     ],
 )