diff --git a/myTracks/build.gradle b/myTracks/build.gradle index 8b958f264..b6a81b28e 100644 --- a/myTracks/build.gradle +++ b/myTracks/build.gradle @@ -15,7 +15,6 @@ android { buildTypes { release { minifyEnabled true - proguardFiles 'proguard.cfg', 'proguard-google-api-client.txt' } } } diff --git a/myTracks/proguard-google-api-client.txt b/myTracks/proguard-google-api-client.txt deleted file mode 100644 index 29b45a1ff..000000000 --- a/myTracks/proguard-google-api-client.txt +++ /dev/null @@ -1,38 +0,0 @@ -# ProGuard Configuration file -# -# See http://proguard.sourceforge.net/index.html#manual/usage.html - -# Needed to keep generic types and @Key annotations accessed via reflection - --keepattributes Signature,RuntimeVisibleAnnotations,AnnotationDefault - --keepclassmembers class * { - @com.google.api.client.util.Key ; -} - -# Needed by Guava -# See https://groups.google.com/forum/#!topic/guava-discuss/YCZzeCiIVoI - --dontwarn sun.misc.Unsafe --dontwarn com.google.common.collect.MinMaxPriorityQueue - -# Needed by google-http-client-android when linking against an older platform version - --dontwarn com.google.api.client.extensions.android.** - -# Needed by google-api-client-android when linking against an older platform version - --dontwarn com.google.api.client.googleapis.extensions.android.** - -# Additional flags from -# http://stackoverflow.com/questions/14410520/google-drive-api-doesnt-play-well-with-proguard-npe --keep class com.google.** { *;} --keep interface com.google.** { *;} --dontwarn com.google.** --keepattributes *Annotation*,Signature --keep class * extends com.google.api.client.json.GenericJson { -*; -} --keep class com.google.api.services.drive.** { -*; -} \ No newline at end of file diff --git a/myTracks/proguard.cfg b/myTracks/proguard.cfg deleted file mode 100644 index 3bdeb3eef..000000000 --- a/myTracks/proguard.cfg +++ /dev/null @@ -1,108 +0,0 @@ -# -# Section 1 -# Default eclipse project proguard settings. -# --dontusemixedcaseclassnames --dontskipnonpubliclibraryclasses --verbose - --dontpreverify - --optimizations !code/simplification/arithmetic,!code/simplification/cast,!field/*,!class/merging/* -# change from 5 to 2. With 5 passes, the CursorLoader in the android.support.v4 will not compile. -# See http://stackoverflow.com/questions/6605971/android-sdk-tools-revision-12-has-problem-with-proguard-error-conversion-to --optimizationpasses 2 --allowaccessmodification - --keepattributes *Annotation* --keep public class * extends android.app.Activity --keep public class * extends android.app.Application --keep public class * extends android.app.Service --keep public class * extends android.content.BroadcastReceiver --keep public class * extends android.content.ContentProvider --keep public class * extends android.app.backup.BackupAgent --keep public class * extends android.preference.Preference --keep public class * extends android.support.v4.app.Fragment --keep public class * extends android.app.Fragment --keep public class com.android.vending.licensing.ILicensingService - -# For native methods, see http://proguard.sourceforge.net/manual/examples.html#native --keepclasseswithmembernames class * { - native ; -} - --keep public class * extends android.view.View { - public (android.content.Context); - public (android.content.Context, android.util.AttributeSet); - public (android.content.Context, android.util.AttributeSet, int); - public void set*(...); -} - --keepclasseswithmembers class * { - public (android.content.Context, android.util.AttributeSet); -} - --keepclasseswithmembers class * { - public (android.content.Context, android.util.AttributeSet, int); -} - --keepclassmembers class * extends android.app.Activity { - public void *(android.view.View); -} - -# For enumeration classes, see http://proguard.sourceforge.net/manual/examples.html#enumerations --keepclassmembers enum * { - public static **[] values(); - public static ** valueOf(java.lang.String); -} - --keep class * implements android.os.Parcelable { - public static final android.os.Parcelable$Creator *; -} - --keepclassmembers class **.R$* { - public static ; -} - -# The support library contains references to newer platform versions. -# Don't warn about those in case this app is linking against an older -# platform version. We know about them, and they are safe. --dontwarn android.support.** - -# -# Section 2 -# Google Play Services and Google Maps API Library -# - -# For Google Play Services --keep class * extends java.util.ListResourceBundle { - protected Object[][] getContents(); -} - -# For Google Maps API library --keepclassmembers class * implements java.io.Serializable { - private static final long serialVersionUID; -} --keep public class com.google.googlenav.capabilities.CapabilitiesController* - -# -# Section 3 -# My Tracks specific proguard settings. -# - -# Add the libraries, but ignore warnings about them --libraryjars libs --libraryjars ../MyTracksLib/libs --dontwarn com.android.common.** --dontwarn com.google.android.googleapps.** --dontwarn com.google.android.gsf.** --dontwarn javax.servlet.** --dontwarn org.apache.avalon.framework.logger.** --dontwarn org.apache.log.** --dontwarn org.apache.log4j.** - -# Make our stack traces useful -# Line numbers will be correct, file names will be replaced by "MT" since the -# class name is enough to get the file name. --renamesourcefileattribute MT --keepattributes SourceFile,LineNumberTable