Skip to content

Commit 8a59ed0

Browse files
authored
fix: use embedded Proguard configuration instead of compile-time annotation (#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
1 parent c35a32f commit 8a59ed0

File tree

3 files changed

+3
-16
lines changed

3 files changed

+3
-16
lines changed

google-api-client/pom.xml

+1-14
Original file line numberDiff line numberDiff line change
@@ -145,23 +145,10 @@
145145
<artifactId>commons-codec</artifactId>
146146
<scope>provided</scope>
147147
<version>1.14</version>
148-
</dependency>
148+
</dependency>
149149
<dependency>
150150
<groupId>com.google.guava</groupId>
151151
<artifactId>guava</artifactId>
152152
</dependency>
153-
<dependency>
154-
<groupId>androidx.annotation</groupId>
155-
<artifactId>annotation</artifactId>
156-
<version>1.1.0</version>
157-
</dependency>
158153
</dependencies>
159-
160-
<repositories>
161-
<repository>
162-
<id>google</id>
163-
<name>Google Maven Repository</name>
164-
<url>https://maven.google.com/</url>
165-
</repository>
166-
</repositories>
167154
</project>

google-api-client/src/main/java/com/google/api/client/googleapis/GoogleUtils.java

-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414

1515
package com.google.api.client.googleapis;
1616

17-
import androidx.annotation.Keep;
1817
import com.google.api.client.util.SecurityUtils;
1918
import com.google.common.annotations.VisibleForTesting;
2019
import java.io.IOException;
@@ -31,7 +30,6 @@
3130
* @since 1.12
3231
* @author [email protected] (Ravi Mistry)
3332
*/
34-
@Keep
3533
public final class GoogleUtils {
3634

3735
/** Current release version. */
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# https://github.com/googleapis/google-api-java-client/issues/1450
2+
-keep public class com.google.api.client.googleapis.GoogleUtils

0 commit comments

Comments
 (0)