-
Notifications
You must be signed in to change notification settings - Fork 703
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: use embedded Proguard configuration instead of compile-time anno…
…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
Showing
3 changed files
with
3 additions
and
16 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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; | ||
|
@@ -31,7 +30,6 @@ | |
* @since 1.12 | ||
* @author [email protected] (Ravi Mistry) | ||
*/ | ||
@Keep | ||
public final class GoogleUtils { | ||
|
||
/** Current release version. */ | ||
|
2 changes: 2 additions & 0 deletions
2
google-api-client/src/main/resources/META-INF/proguard/google-api-client.pro
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
# https://github.com/googleapis/google-api-java-client/issues/1450 | ||
-keep public class com.google.api.client.googleapis.GoogleUtils |