From ce8fb4a99fb567fcbc235d57aa1be8f397f9a4c7 Mon Sep 17 00:00:00 2001 From: Moreno Ambrosin Date: Tue, 18 Apr 2023 05:41:36 -0700 Subject: [PATCH] Adding missing Maven dependencies in tink-android POM file. Derived with: ``` $ bazel query --output=build 'attr(tags, .*,filter(@maven, deps(//:tink-android-unshaded, 2)))' \ | grep maven_coordinates | cut -d'"' -f2 | cut -d'=' -f2 ... androidx.annotation:annotation:1.3.0 com.google.code.findbugs:jsr305:3.0.2 com.google.code.gson:gson:2.10 com.google.errorprone:error_prone_annotations:2.16 com.google.protobuf:protobuf-javalite:3.19.6 ``` NOTE: We purposely do not include `com.google.protobuf:protobuf-javalite:3.19.6` which is shaded. PiperOrigin-RevId: 525120248 Change-Id: If3fbb8f71f92f58bc11123952c7b2a40ef435be1 --- examples/android/helloworld/gradle.properties | 1 + maven/tink-java-android.pom.xml | 20 ++++++++++++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/examples/android/helloworld/gradle.properties b/examples/android/helloworld/gradle.properties index f874b2f75..8faa47410 100644 --- a/examples/android/helloworld/gradle.properties +++ b/examples/android/helloworld/gradle.properties @@ -21,3 +21,4 @@ org.gradle.jvmargs=-Xmx1536m # "snapshot": Maven Central snapshot repository (i.e. for testing published # snapshots) mavenLocation=snapshot +android.useAndroidX=true diff --git a/maven/tink-java-android.pom.xml b/maven/tink-java-android.pom.xml index 39efe1aa3..e59b46656 100644 --- a/maven/tink-java-android.pom.xml +++ b/maven/tink-java-android.pom.xml @@ -86,14 +86,32 @@ 1.8 - 2.8.9 + 3.0.2 + 1.3.0 + 2.16 + 2.10 + + androidx.annotation + annotation + ${androidx_annotation.version} + + + com.google.code.findbugs + jsr305 + ${findbugs.version} + com.google.code.gson gson ${gson.version} + + com.google.errorprone + error_prone_annotations + ${error_prone_annotations.version} +