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

Author: brettchabot

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,

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",
     ],
 )
 

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"

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",

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",
     ],

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",

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",

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",

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",

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",
     ],
 )