Skip to content

Commit

Permalink
Update androidx.annotation to 1.8.2.
Browse files Browse the repository at this point in the history
For some reason we now have to use the newer "JVM-targeted multiplatform artifact" target from maven. See:
https://developer.android.com/jetpack/androidx/releases/annotation

This upgrade is needed to use the newest version of androidx.test:monitor.

PiperOrigin-RevId: 668341846
Change-Id: I466e903b88044e16c441fdbf772c857b439c9776
  • Loading branch information
juergw authored and copybara-github committed Aug 28, 2024
1 parent 69beb2e commit 2c78cc0
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions maven/tink-java-android.pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -87,15 +87,15 @@
<java.version>1.8</java.version>

<jsr305.version>3.0.2</jsr305.version>
<androidx_annotation.version>1.5.0</androidx_annotation.version>
<androidx_annotation.version>1.8.2</androidx_annotation.version>
<error_prone_annotations.version>2.22.0</error_prone_annotations.version>
<gson.version>2.10.1</gson.version>
</properties>

<dependencies>
<dependency>
<groupId>androidx.annotation</groupId>
<artifactId>annotation</artifactId>
<artifactId>annotation-jvm</artifactId>
<version>${androidx_annotation.version}</version>
</dependency>
<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ android_library(
"//src/main/java/com/google/crypto/tink:kms_client-android",
"//src/main/java/com/google/crypto/tink/subtle:random-android",
"//src/main/java/com/google/crypto/tink/subtle:validators-android",
"@maven//:androidx_annotation_annotation",
"@maven//:androidx_annotation_annotation_jvm",
"@maven//:com_google_code_findbugs_jsr305",
"@maven//:com_google_errorprone_error_prone_annotations",
],
Expand Down Expand Up @@ -63,7 +63,7 @@ android_library(
"//src/main/java/com/google/crypto/tink:registry_cluster-android",
"//src/main/java/com/google/crypto/tink:tink_proto_parameters_format-android",
"//src/main/java/com/google/crypto/tink/subtle:hex-android",
"@maven//:androidx_annotation_annotation",
"@maven//:androidx_annotation_annotation_jvm",
"@maven//:com_google_code_findbugs_jsr305",
"@maven//:com_google_errorprone_error_prone_annotations",
],
Expand Down
2 changes: 1 addition & 1 deletion tink_java_deps.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
TINK_MAVEN_ARTIFACTS = [
"com.google.protobuf:protobuf-java:3.25.3",
"com.google.protobuf:protobuf-javalite:3.25.3",
"androidx.annotation:annotation:1.5.0",
"androidx.annotation:annotation:1.8.2",
"com.google.api-client:google-api-client:2.2.0",
"com.google.code.findbugs:jsr305:3.0.2",
"com.google.code.gson:gson:2.10.1",
Expand Down

0 comments on commit 2c78cc0

Please sign in to comment.