Update to androidx.annotation-jvm 1.6.0

androidx.annotation:1.6.0 is missing class data,
so use  androidx.annotation-jvm instead.
See https://issuetracker.google.com/291319706

This change is a precursor to updating to androidx.window:1.1.0/

PiperOrigin-RevId: 548236408

Author: brettchabot

WORKSPACE

@@ -79,7 +79,7 @@ grpc_java_repositories()
 maven_install(
     name = "maven",
     artifacts = [
-        "androidx.annotation:annotation:" + ANDROIDX_ANNOTATION_VERSION,
+        "androidx.annotation:annotation-jvm:" + 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 = [
-        "@maven//:androidx_annotation_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.2.0"
+ANDROIDX_ANNOTATION_VERSION = "1.6.0"
 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

@@ -49,7 +49,7 @@ kt_android_library(
         "//annotation",
         "//runner/monitor",
         "//services/storage",
-        "@maven//:androidx_annotation_annotation",
+        "@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",
+        "@maven//:androidx_annotation_annotation_jvm",
         "@maven//:com_google_guava_guava",
         "@maven//:junit_junit",
     ],

espresso/core/java/androidx/test/espresso/BUILD

@@ -81,7 +81,7 @@ android_library(
         "//espresso/core/java/androidx/test/espresso/util/concurrent",
         "//opensource/dagger",
         "//runner/android_junit_runner",
-        "@maven//:androidx_annotation_annotation",
+        "@maven//:androidx_annotation_annotation_jvm",
         "@maven//:androidx_concurrent_concurrent_futures",
         "@maven//:javax_inject_javax_inject",
         "@maven//:org_hamcrest_hamcrest_core",
@@ -112,7 +112,7 @@ android_library(
         "//espresso/core/java/androidx/test/espresso/util/concurrent",
         "//opensource/dagger",
         "//runner/android_junit_runner",
-        "@maven//:androidx_annotation_annotation",
+        "@maven//:androidx_annotation_annotation_jvm",
         "@maven//:javax_inject_javax_inject",
         "@maven//:org_hamcrest_hamcrest_core",
     ],
@@ -160,7 +160,7 @@ android_library(
         "//espresso/core/java/androidx/test/espresso/util/concurrent",
         "//espresso/idling_resource/java/androidx/test/espresso:idling_resource_internal",
         "//runner/monitor",
-        "@maven//:androidx_annotation_annotation",
+        "@maven//:androidx_annotation_annotation_jvm",
         "@maven//:com_google_code_findbugs_jsr305",
         "@maven//:org_hamcrest_hamcrest_core",
         "@maven//:org_hamcrest_hamcrest_library",
@@ -186,7 +186,7 @@ android_library(
         "//annotation",
         "//espresso/core/java/androidx/test/espresso/util",
         "//runner/monitor",
-        "@maven//:androidx_annotation_annotation",
+        "@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

@@ -26,7 +26,7 @@ android_library(
         "//espresso/core/java/androidx/test/espresso/matcher",
         "//espresso/core/java/androidx/test/espresso/util",
         "//runner/monitor",
-        "@maven//:androidx_annotation_annotation",
+        "@maven//:androidx_annotation_annotation_jvm",
         "@maven//:org_jetbrains_kotlin_kotlin_stdlib",
     ],
 )
@@ -47,7 +47,7 @@ android_library(
         "//espresso/core/java/androidx/test/espresso/util",
         "//espresso/idling_resource/java/androidx/test/espresso:idling_resource",
         "//runner/android_junit_runner",
-        "@maven//:androidx_annotation_annotation",
+        "@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

@@ -26,7 +26,7 @@ android_library(
         "//espresso/core/java/androidx/test/espresso/remote/annotation:remote_msg_annotations",
         "//espresso/core/java/androidx/test/espresso/util",
         "//runner/monitor",
-        "@maven//:androidx_annotation_annotation",
+        "@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

@@ -40,7 +40,7 @@ android_library(
         "//espresso/idling_resource/java/androidx/test/espresso:idling_resource",
         "//opensource/dagger",
         "//runner/android_junit_runner",
-        "@maven//:androidx_annotation_annotation",
+        "@maven//:androidx_annotation_annotation_jvm",
         "@maven//:javax_inject_javax_inject",
         "@maven//:org_hamcrest_hamcrest_core",
         "@maven//:org_jetbrains_kotlin_kotlin_stdlib",
@@ -71,7 +71,7 @@ android_library(
         "//espresso/core/java/androidx/test/espresso/util",
         "//espresso/idling_resource/java/androidx/test/espresso:idling_resource_internal",
         "//runner/monitor",
-        "@maven//:androidx_annotation_annotation",
+        "@maven//:androidx_annotation_annotation_jvm",
         "@maven//:javax_inject_javax_inject",
         "@maven//:org_jetbrains_kotlin_kotlin_stdlib",
     ],
@@ -105,7 +105,7 @@ android_library(
         "//opensource/dagger",
         "//runner/monitor",
         "//services/storage/java/androidx/test/services/storage",
-        "@maven//:androidx_annotation_annotation",
+        "@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",
+        "@maven//:androidx_annotation_annotation_jvm",
     ],
 )