From e9dc377d19942ee83db42497abea25500e4cad26 Mon Sep 17 00:00:00 2001 From: Eric Chang Date: Thu, 28 Jul 2022 15:36:06 -0700 Subject: [PATCH] Replace dependency on javax.annotation:jsr250-api:1.0 with javax.annotation:javax.annotation-api:1.3.2. Fixes #3480. RELNOTES=Fix #3480. Replace dependency on javax.annotation:jsr250-api:1.0 with javax.annotation:javax.annotation-api:1.3.2. PiperOrigin-RevId: 463942838 --- BUILD | 2 +- WORKSPACE | 2 +- java/dagger/hilt/BUILD | 2 +- java/dagger/hilt/android/BUILD | 2 +- java/dagger/hilt/android/processor/BUILD | 2 +- java/dagger/hilt/android/testing/BUILD | 2 +- java/dagger/hilt/processor/BUILD | 2 +- third_party/java/jsr250_annotations/BUILD | 2 +- workspace_defs.bzl | 4 ++-- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/BUILD b/BUILD index a22ba7a24e7..d81eca95c40 100644 --- a/BUILD +++ b/BUILD @@ -101,7 +101,7 @@ android_library( name = "android_local_test_exports", exports = [ # TODO(bcorso): see if we can remove jsr250 dep from autovalue to prevent this. - "@maven//:javax_annotation_jsr250_api", # For @Generated + "@maven//:javax_annotation_javax_annotation_api", # For @Generated "@maven//:org_robolectric_shadows_framework", # For ActivityController "@maven//:androidx_lifecycle_lifecycle_common", # For Lifecycle.State "@maven//:androidx_activity_activity", # For ComponentActivity diff --git a/WORKSPACE b/WORKSPACE index 0cc004f842f..31ee4cd816a 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -251,7 +251,7 @@ maven_install( "io.grpc:grpc-netty:%s" % GRPC_VERSION, "io.grpc:grpc-protobuf:%s" % GRPC_VERSION, "jakarta.inject:jakarta.inject-api:2.0.1", - "javax.annotation:jsr250-api:1.0", + "javax.annotation:javax.annotation-api:1.3.2", "javax.inject:javax.inject:1", "javax.inject:javax.inject-tck:1", "junit:junit:4.13", diff --git a/java/dagger/hilt/BUILD b/java/dagger/hilt/BUILD index da5f7c5ae8f..8ae8e9861ba 100644 --- a/java/dagger/hilt/BUILD +++ b/java/dagger/hilt/BUILD @@ -232,7 +232,7 @@ gen_maven_artifact( ], artifact_target_maven_deps_banned = [ "com.google.guava:guava", - "javax.annotation:jsr250-api", + "javax.annotation:javax.annotation-api", ], javadoc_exclude_packages = [ "dagger.hilt.internal", diff --git a/java/dagger/hilt/android/BUILD b/java/dagger/hilt/android/BUILD index 003a8a3cee7..4dc2e9f2ed1 100644 --- a/java/dagger/hilt/android/BUILD +++ b/java/dagger/hilt/android/BUILD @@ -214,7 +214,7 @@ gen_maven_artifact( ], artifact_target_maven_deps_banned = [ "com.google.guava:guava", - "javax.annotation:jsr250-api", + "javax.annotation:javax.annotation-api", ], javadoc_android_api_level = 32, javadoc_exclude_packages = [ diff --git a/java/dagger/hilt/android/processor/BUILD b/java/dagger/hilt/android/processor/BUILD index 1dba4e47cae..a4b0ccf3eae 100644 --- a/java/dagger/hilt/android/processor/BUILD +++ b/java/dagger/hilt/android/processor/BUILD @@ -84,7 +84,7 @@ gen_maven_artifact( "com.google.guava:failureaccess", "com.google.guava:guava", "com.squareup:javapoet", - "javax.annotation:jsr250-api", + "javax.annotation:javax.annotation-api", "javax.inject:javax.inject", "net.ltgt.gradle.incap:incap", "org.jetbrains.kotlin:kotlin-stdlib", diff --git a/java/dagger/hilt/android/testing/BUILD b/java/dagger/hilt/android/testing/BUILD index 09b9cdefee4..5333a57b721 100644 --- a/java/dagger/hilt/android/testing/BUILD +++ b/java/dagger/hilt/android/testing/BUILD @@ -235,7 +235,7 @@ gen_maven_artifact( ], artifact_target_maven_deps_banned = [ "com.google.guava:guava", - "javax.annotation:jsr250-api", + "javax.annotation:javax.annotation-api", ], javadoc_android_api_level = 32, javadoc_exclude_packages = [ diff --git a/java/dagger/hilt/processor/BUILD b/java/dagger/hilt/processor/BUILD index 868ab09028c..4575e03aa56 100644 --- a/java/dagger/hilt/processor/BUILD +++ b/java/dagger/hilt/processor/BUILD @@ -106,7 +106,7 @@ gen_maven_artifact( "com.google.guava:failureaccess", "com.google.guava:guava", "com.squareup:javapoet", - "javax.annotation:jsr250-api", + "javax.annotation:javax.annotation-api", "javax.inject:javax.inject", "net.ltgt.gradle.incap:incap", "org.jetbrains.kotlin:kotlin-stdlib", diff --git a/third_party/java/jsr250_annotations/BUILD b/third_party/java/jsr250_annotations/BUILD index effdea89250..8a5b3ec2278 100644 --- a/third_party/java/jsr250_annotations/BUILD +++ b/third_party/java/jsr250_annotations/BUILD @@ -18,5 +18,5 @@ package(default_visibility = ["//:src"]) alias( name = "jsr250_annotations", - actual = "@maven//:javax_annotation_jsr250_api", + actual = "@maven//:javax_annotation_javax_annotation_api", ) diff --git a/workspace_defs.bzl b/workspace_defs.bzl index 9229782010a..76520ec6813 100644 --- a/workspace_defs.bzl +++ b/workspace_defs.bzl @@ -39,7 +39,7 @@ DAGGER_ANDROID_ARTIFACTS = [ HILT_ANDROID_ARTIFACTS = [ "androidx.test:core:1.1.0", # Export for ApplicationProvider - "javax.annotation:jsr250-api:1.0", # Export for @Generated + "javax.annotation:javax.annotation-api:1.3.2", # Export for @Generated "androidx.annotation:annotation:1.1.0", # Export for @CallSuper/@Nullable "com.google.dagger:dagger:" + _VERSION, "com.google.dagger:dagger-compiler:" + _VERSION, @@ -183,7 +183,7 @@ def hilt_android_rules(repo_name = "@maven"): "%s//:androidx_annotation_annotation" % repo_name, # For @CallSuper "%s//:com_google_dagger_hilt_android" % repo_name, "%s//:com_google_dagger_hilt_core" % repo_name, - "%s//:javax_annotation_jsr250_api" % repo_name, # For @Generated + "%s//:javax_annotation_javax_annotation_api" % repo_name, # For @Generated ], )