Skip to content

Commit

Permalink
fix: use embedded Proguard configuration instead of compile-time anno…
Browse files Browse the repository at this point in the history
…tation (#1491)

* Revert "keep GoogleUtils (#1467)"

This reverts commit b70e8ef.

* Add proguard resource file to ensure GoogleUtils is kept for Android users.

* Revert "Add google android repository to Gradle instructions (#1489)"

This reverts commit 57a7bb7.

* Restore README
  • Loading branch information
anuraaga committed Feb 14, 2020
1 parent c35a32f commit 8a59ed0
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 16 deletions.
15 changes: 1 addition & 14 deletions google-api-client/pom.xml
Expand Up @@ -145,23 +145,10 @@
<artifactId>commons-codec</artifactId>
<scope>provided</scope>
<version>1.14</version>
</dependency>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
<dependency>
<groupId>androidx.annotation</groupId>
<artifactId>annotation</artifactId>
<version>1.1.0</version>
</dependency>
</dependencies>

<repositories>
<repository>
<id>google</id>
<name>Google Maven Repository</name>
<url>https://maven.google.com/</url>
</repository>
</repositories>
</project>
Expand Up @@ -14,7 +14,6 @@

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;
Expand All @@ -31,7 +30,6 @@
* @since 1.12
* @author rmistry@google.com (Ravi Mistry)
*/
@Keep
public final class GoogleUtils {

/** Current release version. */
Expand Down
@@ -0,0 +1,2 @@
# https://github.com/googleapis/google-api-java-client/issues/1450
-keep public class com.google.api.client.googleapis.GoogleUtils

0 comments on commit 8a59ed0

Please sign in to comment.