Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replace dependency on javax.annotation:jsr250-api:1.0 with javax.annotation:javax.annotation-api:1.3.2. #3491

Closed
wants to merge 1 commit into from
Closed

Replace dependency on javax.annotation:jsr250-api:1.0 with javax.annotation:javax.annotation-api:1.3.2. #3491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion BUILD
View file
Open in desktop
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion WORKSPACE
View file
Open in desktop
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion java/dagger/hilt/BUILD
View file
Open in desktop
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion java/dagger/hilt/android/BUILD
View file
Open in desktop
Expand Up @@ -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 = [
Expand Down
2 changes: 1 addition & 1 deletion java/dagger/hilt/android/processor/BUILD
View file
Open in desktop
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion java/dagger/hilt/android/testing/BUILD
View file
Open in desktop
Expand Up @@ -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 = [
Expand Down
2 changes: 1 addition & 1 deletion java/dagger/hilt/processor/BUILD
View file
Open in desktop
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion third_party/java/jsr250_annotations/BUILD
View file
Open in desktop
Expand Up @@ -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",
)
4 changes: 2 additions & 2 deletions workspace_defs.bzl
View file
Open in desktop
Expand Up @@ -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,
Expand Down Expand Up @@ -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
],
)

Expand Down