Merge pull request #385 from auth0/include-proguard-rules

Include updated Proguard rules in the packaged aar
auth0 · Jan 2, 2017 · c1cf3ec · c1cf3ec
2 parents 7695af4 + 010f44b
commit c1cf3ec
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 20 deletions.
diff --git a/README.md b/README.md
@@ -202,7 +202,7 @@ startActivity(lock.newIntent(this));
 ```
 
 ##Proguard
-In the [proguard directory](proguard) you can find the *Proguard* configuration for Lock and its dependencies.
+The rules should be applied automatically if your application is using `minifyEnabled = true`. If you want to include them manually check the [proguard directory](proguard).
 By default you should at least use the following files:
 * `proguard-okio.pro`
 * `proguard-gson.pro`

diff --git a/app/build.gradle b/app/build.gradle
@@ -27,10 +27,6 @@ android {
         }
         release {
             minifyEnabled true
-            proguardFile '../proguard/proguard-lock-2.pro'
-            proguardFile '../proguard/proguard-okio.pro'
-            proguardFile '../proguard/proguard-otto.pro'
-            proguardFile '../proguard/proguard-gson.pro'
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             signingConfig signingConfigs.release
         }

diff --git a/lib/build.gradle b/lib/build.gradle
@@ -14,12 +14,7 @@ android {
         targetSdkVersion 24
         versionCode 1
         versionName semver.stringVersion
-    }
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
+        consumerProguardFiles '../proguard/proguard-gson.pro', '../proguard/proguard-otto.pro', '../proguard/proguard-lock-2.pro'
     }
 }
 

diff --git a/proguard/proguard-gson.pro b/proguard/proguard-gson.pro
@@ -1,4 +1,6 @@
 # Gson
 
 -keepattributes Signature
--keepattributes *Annotation*
+-keepattributes *Annotation*
+
+-dontwarn com.google.gson.internal.UnsafeAllocator
diff --git a/proguard/proguard-lock-2.pro b/proguard/proguard-lock-2.pro
@@ -3,4 +3,10 @@
 ## Parcelables
 -keepnames class * implements android.os.Parcelable {
     public static final ** CREATOR;
-}
+}
+
+## Descriptor classes
+-keep public class com.auth0.android.lock.events.*
+-keep public class com.auth0.android.lock.adapters.Country
+-keep public interface com.auth0.android.lock.internal.configuration.OAuthConnection
+-keep public interface com.auth0.android.lock.views.interfaces.IdentityListener
diff --git a/proguard/proguard-okio.pro b/proguard/proguard-okio.pro
diff --git a/proguard/proguard-otto.pro b/proguard/proguard-otto.pro
@@ -3,5 +3,4 @@
 -keepattributes *Annotation*
 -keepclassmembers class ** {
     @com.squareup.otto.Subscribe public *;
-    @com.squareup.otto.Produce public *;
 }