diff options
| -rw-r--r-- | main/proguard-project.txt | 3 | ||||
| -rw-r--r-- | play-services-base/proguard.txt | 6 | ||||
| -rw-r--r-- | play-services-location/proguard.txt | 5 | ||||
| -rw-r--r-- | play-services-location/project.properties | 1 |
4 files changed, 13 insertions, 2 deletions
diff --git a/main/proguard-project.txt b/main/proguard-project.txt index 5cc8783..230d85f 100644 --- a/main/proguard-project.txt +++ b/main/proguard-project.txt @@ -75,3 +75,6 @@ -keep public class cgeo.geocaching.sorting.SortActionProvider { *; } -keep public class cgeo.geocaching.ui.NavigationActionProvider { *; } -keep public class cgeo.geocaching.apps.cache.navi.NavigationSelectionActionProvider { *; } + +# Play Service references to classes introduced in higher API levels +-dontwarn com.google.android.gms.** diff --git a/play-services-base/proguard.txt b/play-services-base/proguard.txt index 0c9693a..5e03f78 100644 --- a/play-services-base/proguard.txt +++ b/play-services-base/proguard.txt @@ -17,4 +17,8 @@ # Needed for Parcelable/SafeParcelable Creators to not get stripped -keepnames class * implements android.os.Parcelable { public static final ** CREATOR; -}
\ No newline at end of file +} + +# classes introduced in higher API levels than we use as target +-dontwarn com.google.android.gms.common.SupportErrorDialogFragment +-dontwarn com.google.android.gms.common.api.**
\ No newline at end of file diff --git a/play-services-location/proguard.txt b/play-services-location/proguard.txt index 0c9693a..199d972 100644 --- a/play-services-location/proguard.txt +++ b/play-services-location/proguard.txt @@ -17,4 +17,7 @@ # Needed for Parcelable/SafeParcelable Creators to not get stripped -keepnames class * implements android.os.Parcelable { public static final ** CREATOR; -}
\ No newline at end of file +} + +-dontwarn com.google.android.gms.common.** +-dontwarn com.google.android.gms.internal.**
\ No newline at end of file diff --git a/play-services-location/project.properties b/play-services-location/project.properties index ad36a32..8a32119 100644 --- a/play-services-location/project.properties +++ b/play-services-location/project.properties @@ -13,3 +13,4 @@ proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard.txt # Project target. target=Google Inc.:Google APIs:19 android.library=true +android.library.reference.1=../play-services-base |