Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: use embedded Proguard configuration instead of compile-time annotation #1491

Merged
merged 4 commits into from Feb 14, 2020
Merged

fix: use embedded Proguard configuration instead of compile-time annotation #1491

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
115556d
Revert "keep GoogleUtils (#1467)"
anuraaga Feb 14, 2020
afba0e4
Add proguard resource file to ensure GoogleUtils is kept for Android …
anuraaga Feb 14, 2020
5a227e9
Revert "Add google android repository to Gradle instructions (#1489)"
anuraaga Feb 14, 2020
95744d0
Restore README
anuraaga Feb 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion README.md
View file
Open in desktop
Expand Up @@ -45,7 +45,6 @@ To use Gradle, add the following lines to your build.gradle file:
```gradle
repositories {
mavenCentral()
google()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we probably want to leave this here until we're ready to release 1.30.9

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah yeah - reverted!

}
dependencies {
compile 'com.google.api-client:google-api-client:1.30.8'
Expand Down
15 changes: 1 addition & 14 deletions google-api-client/pom.xml
View file
Open in desktop
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>
2 changes: 0 additions & 2 deletions google-api-client/src/main/java/com/google/api/client/googleapis/GoogleUtils.java
View file
Open in desktop
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
2 changes: 2 additions & 0 deletions google-api-client/src/main/resources/META-INF/proguard/google-api-client.pro
View file
Open in desktop
@@ -0,0 +1,2 @@
# https://github.com/googleapis/google-api-java-client/issues/1450
-keep public class com.google.api.client.googleapis.GoogleUtils