Bump androidx.annotation:annotation for Dagger/Hilt androidx deps and remove explicit dep of the -jvm variant.

Fixes #4917

RELNOTES=Removes the explicit dependency to androidx.annotation:annotation-jvm and to a beta version of it.
PiperOrigin-RevId: 795514434

Author: danysantiago

MODULE.bazel

@@ -97,7 +97,7 @@ maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
 
 maven.install(
     artifacts = [
-        "androidx.annotation:annotation:1.1.0",
+        "androidx.annotation:annotation:1.7.0",
         "androidx.annotation:annotation-experimental:1.3.1",
         "androidx.appcompat:appcompat:1.3.1",
         "androidx.activity:activity:1.5.1",

dagger-android-support/BUILD

@@ -34,7 +34,6 @@ gen_maven_artifact(
     artifact_target_maven_deps = [
         "androidx.activity:activity:aar",
         "androidx.annotation:annotation",
-        "androidx.annotation:annotation-jvm",
         "androidx.appcompat:appcompat:aar",
         "androidx.fragment:fragment:aar",
         "androidx.lifecycle:lifecycle-common",

dagger-android/BUILD

@@ -33,7 +33,6 @@ gen_maven_artifact(
     artifact_target = "//dagger-android/main/java/dagger/android:android",
     artifact_target_maven_deps = [
         "androidx.annotation:annotation",
-        "androidx.annotation:annotation-jvm",
         "com.google.dagger:dagger",
         "com.google.dagger:dagger-lint-aar",
     ],

hilt-android-testing/BUILD

@@ -90,7 +90,6 @@ gen_maven_artifact(
     artifact_target_maven_deps = [
         "androidx.activity:activity:aar",
         "androidx.annotation:annotation",
-        "androidx.annotation:annotation-jvm",
         "androidx.annotation:annotation-experimental:aar",
         "androidx.fragment:fragment:aar",
         "androidx.lifecycle:lifecycle-common",

hilt-android/BUILD

@@ -108,7 +108,6 @@ gen_maven_artifact(
     artifact_target_maven_deps = [
         "androidx.activity:activity:aar",
         "androidx.annotation:annotation",
-        "androidx.annotation:annotation-jvm",
         "androidx.annotation:annotation-experimental:aar",
         "androidx.fragment:fragment:aar",
         "androidx.lifecycle:lifecycle-common",

maven_install.json

@@ -1,9 +1,8 @@
 {
   "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL",
-  "__INPUT_ARTIFACTS_HASH": 1584493936,
-  "__RESOLVED_ARTIFACTS_HASH": 555303871,
+  "__INPUT_ARTIFACTS_HASH": -1514565718,
+  "__RESOLVED_ARTIFACTS_HASH": -1153075347,
   "conflict_resolution": {
-    "androidx.annotation:annotation:1.1.0": "androidx.annotation:annotation:1.7.0-beta01",
     "androidx.test:monitor:1.4.0": "androidx.test:monitor:1.7.2",
     "com.google.auto.value:auto-value-annotations:1.9": "com.google.auto.value:auto-value-annotations:1.11.0",
     "com.google.code.findbugs:jsr305:3.0.1": "com.google.code.findbugs:jsr305:3.0.2",
@@ -51,7 +50,7 @@
       "shasums": {
         "jar": "b11676837cad011a5285d6074418649107ef25eba17131517e9557ef8c9984ed"
       },
-      "version": "1.7.0-beta01"
+      "version": "1.7.0"
     },
     "androidx.annotation:annotation-experimental:aar": {
       "shasums": {
@@ -63,7 +62,7 @@
       "shasums": {
         "jar": "e36b8e4b8393a4adc74e3d4ab22ad5a36396f0cea2e40b5734eae14937dfd224"
       },
-      "version": "1.7.0-beta01"
+      "version": "1.7.0"
     },
     "androidx.appcompat:appcompat-resources:aar": {
       "shasums": {

third_party/java/androidx/annotation/BUILD

@@ -18,9 +18,15 @@ load("@rules_java//java:defs.bzl", "java_library")
 
 package(default_visibility = ["//:src"])
 
+# Alias target for androidx.annotation
+# Ideally libraries could directly depend on @maven//:androidx_annotation_annotation but:
+# 1. Directly depending on annotation doesn't work since it contains no classes,
+# and results in missing symbol errors.'
+# 2. Directly depending on annotation-jvm doesn't work since that can result in
+# duplicate class errors when transitive dependencies depend on older versions
+# of androidx.annotation
 java_library(
     name = "annotation",
-    # TODO(bcorso): Why do we need both of these?
     exports = [
         "@maven//:androidx_annotation_annotation",
         "@maven//:androidx_annotation_annotation_jvm",

tools/maven/maven.bzl

@@ -25,6 +25,13 @@ SHADED_MAVEN_DEPS = [
     "com.squareup:kotlinpoet-javapoet",
 ]
 
+EXCLUDED_MAVEN_DEPS = SHADED_MAVEN_DEPS + [
+    # Due to androidx.annotation:annotation being a redirtect to androidx.annotation:annotation-jvm,
+    # we exclude the transitive dep during validation as it will be required because the alias in
+    # third_party/java/androidx/annotation/BUILD.oss exports both.
+    "androidx.annotation:annotation-jvm",
+]
+
 def dagger_pom_file(name, targets, artifact_name, artifact_id, packaging = None, **kwargs):
     pom_file(
         name = name,
@@ -337,8 +344,8 @@ def _validate_maven_deps_impl(ctx):
     actual_maven_deps = [_strip_artifact_version(artifact) for artifact in maven_nearest_artifacts]
     _validate_list(
         "artifact_target_maven_deps",
-        # Exclude shaded maven deps from this list since they're not actual dependencies.
-        [dep for dep in actual_maven_deps if dep not in SHADED_MAVEN_DEPS],
+        # Exclude certain maven deps (such as shaded deps since they're not actual dependencies).
+        [dep for dep in actual_maven_deps if dep not in EXCLUDED_MAVEN_DEPS],
         expected_maven_deps,
         ctx.attr.banned_maven_deps,
     )