Merge branch 'todo-mvp' into todo-mvp-loaders

JoseAlcerreca · JoseAlcerreca · commit c828f152d1bf · 2016-04-11T10:54:11.000+01:00
diff --git a/todoapp/app/build.gradle b/todoapp/app/build.gradle
@@ -16,18 +16,18 @@ android {
 
     buildTypes {
         debug {
-            // Disabled for now. TODO: fix proguard rules file.
-            minifyEnabled false
-            // Uses new built-in shrinker http://tools.android.com/tech-docs/new-build-system/built-in-shrinker+
+            minifyEnabled true
+            // Uses new built-in shrinker http://tools.android.com/tech-docs/new-build-system/built-in-shrinker
             useProguard false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            testProguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguardTest-rules.pro'
         }
 
         release {
-            // Disabled for now. TODO: fix proguard rules file.
-            minifyEnabled false
-            useProguard false
+            minifyEnabled true
+            useProguard true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            testProguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguardTest-rules.pro'
         }
     }
 
diff --git a/todoapp/app/proguard-rules.pro b/todoapp/app/proguard-rules.pro
@@ -1,4 +1,27 @@
+# Some methods are only called from tests, so make sure the shrinker keeps them.
+-keep class com.example.android.architecture.blueprints.** { *; }
+
+-keep class android.support.v4.widget.DrawerLayout { *; }
+-keep class android.support.test.espresso.IdlingResource { *; }
+-keep class com.google.common.base.Preconditions { *; }
+
 # For Guava:
 -dontwarn javax.annotation.**
 -dontwarn javax.inject.**
 -dontwarn sun.misc.Unsafe
+
+# Proguard rules that are applied to your test apk/code.
+-ignorewarnings
+
+-keepattributes *Annotation*
+
+-dontnote junit.framework.**
+-dontnote junit.runner.**
+
+-dontwarn android.test.**
+-dontwarn android.support.test.**
+-dontwarn org.junit.**
+-dontwarn org.hamcrest.**
+-dontwarn com.squareup.javawriter.JavaWriter
+# Uncomment this if you use Mockito
+-dontwarn org.mockito.**
diff --git a/todoapp/app/proguardTest-rules.pro b/todoapp/app/proguardTest-rules.pro
@@ -0,0 +1,15 @@
+# Proguard rules that are applied to your test apk/code.
+-ignorewarnings
+
+-keepattributes *Annotation*
+
+-dontnote junit.framework.**
+-dontnote junit.runner.**
+
+-dontwarn android.test.**
+-dontwarn android.support.test.**
+-dontwarn org.junit.**
+-dontwarn org.hamcrest.**
+-dontwarn com.squareup.javawriter.JavaWriter
+# Uncomment this if you use Mockito
+-dontwarn org.mockito.**
