From 04682b30be3474dc968a06a59afb771085aa2558 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Wed, 8 Jan 2020 17:35:16 -0500 Subject: [PATCH 1/3] keep GoogleUtils --- google-api-client/pom.xml | 1 + .../main/java/com/google/api/client/googleapis/GoogleUtils.java | 2 ++ 2 files changed, 3 insertions(+) diff --git a/google-api-client/pom.xml b/google-api-client/pom.xml index 21e127483..4db03ce6e 100644 --- a/google-api-client/pom.xml +++ b/google-api-client/pom.xml @@ -151,4 +151,5 @@ guava + diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/GoogleUtils.java b/google-api-client/src/main/java/com/google/api/client/googleapis/GoogleUtils.java index b4eca557f..c9fabf8f5 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/GoogleUtils.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/GoogleUtils.java @@ -14,6 +14,7 @@ package com.google.api.client.googleapis; +import androidx.annotation.Keep; import com.google.api.client.util.SecurityUtils; import com.google.common.annotations.VisibleForTesting; import java.io.IOException; @@ -30,6 +31,7 @@ * @since 1.12 * @author rmistry@google.com (Ravi Mistry) */ +@Keep public final class GoogleUtils { /** Current release version. */ From 54e0d404d9b27e420572233c836ace827b5bc04d Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Thu, 9 Jan 2020 05:53:25 -0500 Subject: [PATCH 2/3] keep GoogleUtils --- google-api-client/pom.xml | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/google-api-client/pom.xml b/google-api-client/pom.xml index 4db03ce6e..ca464e6f0 100644 --- a/google-api-client/pom.xml +++ b/google-api-client/pom.xml @@ -145,11 +145,23 @@ commons-codec provided 1.14 + + + com.google.guava + guava - com.google.guava - guava + androidx.annotation + annotation + 1.1.0 - + + + + google + Google Maven Repository + https://maven.google.com/ + + From 322f4d748400d655b0e19c164af07ebba5dc1c4a Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Thu, 9 Jan 2020 05:55:25 -0500 Subject: [PATCH 3/3] keep GoogleUtils --- google-api-client/pom.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/google-api-client/pom.xml b/google-api-client/pom.xml index ca464e6f0..cc84c1062 100644 --- a/google-api-client/pom.xml +++ b/google-api-client/pom.xml @@ -145,11 +145,11 @@ commons-codec provided 1.14 - - - com.google.guava - guava - + + + com.google.guava + guava + androidx.annotation annotation