Skip to content

Commit 2c78cc0

Browse files
juergwcopybara-github
authored andcommitted
Update androidx.annotation to 1.8.2.
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
1 parent 69beb2e commit 2c78cc0

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

maven/tink-java-android.pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -87,15 +87,15 @@
8787
<java.version>1.8</java.version>
8888

8989
<jsr305.version>3.0.2</jsr305.version>
90-
<androidx_annotation.version>1.5.0</androidx_annotation.version>
90+
<androidx_annotation.version>1.8.2</androidx_annotation.version>
9191
<error_prone_annotations.version>2.22.0</error_prone_annotations.version>
9292
<gson.version>2.10.1</gson.version>
9393
</properties>
9494

9595
<dependencies>
9696
<dependency>
9797
<groupId>androidx.annotation</groupId>
98-
<artifactId>annotation</artifactId>
98+
<artifactId>annotation-jvm</artifactId>
9999
<version>${androidx_annotation.version}</version>
100100
</dependency>
101101
<dependency>

src/main/java/com/google/crypto/tink/integration/android/BUILD.bazel

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ android_library(
1313
"//src/main/java/com/google/crypto/tink:kms_client-android",
1414
"//src/main/java/com/google/crypto/tink/subtle:random-android",
1515
"//src/main/java/com/google/crypto/tink/subtle:validators-android",
16-
"@maven//:androidx_annotation_annotation",
16+
"@maven//:androidx_annotation_annotation_jvm",
1717
"@maven//:com_google_code_findbugs_jsr305",
1818
"@maven//:com_google_errorprone_error_prone_annotations",
1919
],
@@ -63,7 +63,7 @@ android_library(
6363
"//src/main/java/com/google/crypto/tink:registry_cluster-android",
6464
"//src/main/java/com/google/crypto/tink:tink_proto_parameters_format-android",
6565
"//src/main/java/com/google/crypto/tink/subtle:hex-android",
66-
"@maven//:androidx_annotation_annotation",
66+
"@maven//:androidx_annotation_annotation_jvm",
6767
"@maven//:com_google_code_findbugs_jsr305",
6868
"@maven//:com_google_errorprone_error_prone_annotations",
6969
],

tink_java_deps.bzl

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
66
TINK_MAVEN_ARTIFACTS = [
77
"com.google.protobuf:protobuf-java:3.25.3",
88
"com.google.protobuf:protobuf-javalite:3.25.3",
9-
"androidx.annotation:annotation:1.5.0",
9+
"androidx.annotation:annotation:1.8.2",
1010
"com.google.api-client:google-api-client:2.2.0",
1111
"com.google.code.findbugs:jsr305:3.0.2",
1212
"com.google.code.gson:gson:2.10.1",

0 commit comments

Comments
 (0)