From 412f486568fb489a2b7b7710e67cbc70d8856a98 Mon Sep 17 00:00:00 2001
From: Alex Baker <baker.alex@gmail.com>
Date: Fri, 13 Jun 2014 16:21:18 -0500
Subject: [PATCH] Disable proguard, bump version

---
 astrid/build.gradle                 |  3 --
 astrid/proguard.cfg                 | 76 -----------------------------
 astrid/src/main/AndroidManifest.xml |  4 +-
 3 files changed, 2 insertions(+), 81 deletions(-)
 delete mode 100644 astrid/proguard.cfg

diff --git a/astrid/build.gradle b/astrid/build.gradle
index 9a06e3070..18f2165d0 100644
--- a/astrid/build.gradle
+++ b/astrid/build.gradle
@@ -37,9 +37,6 @@ android {
 
     buildTypes {
         release {
-            runProguard true
-            proguardFile 'proguard.cfg'
-            proguardFile getDefaultProguardFile('proguard-android.txt')
             signingConfig signingConfigs.release
         }
     }
diff --git a/astrid/proguard.cfg b/astrid/proguard.cfg
deleted file mode 100644
index f51677a7b..000000000
--- a/astrid/proguard.cfg
+++ /dev/null
@@ -1,76 +0,0 @@
-# remove debug statements
--assumenosideeffects class android.util.Log {
-    public static *** d(...);
-}
-
--optimizationpasses 2
--dontusemixedcaseclassnames
--dontskipnonpubliclibraryclasses
--dontpreverify
--verbose
--optimizations !code/simplification/arithmetic,!field/*,!class/merging/*,!code/allocation/variable,!method/inlining/*,!field/marking/private
-
-# astrid-specific
--dontobfuscate
--keepattributes SourceFile, SourceDir, LineNumberTable, LocalVariableTable, LocalVariableTypeTable, Signature
--keep, allowshrinking, allowoptimization class com.todoroo.**
--keep class com.mdimension.**
--keep class com.google.common.base.Preconditions
--keep class * extends com.todoroo.andlib.data.AbstractModel
--keep class com.todoroo.astrid.data.*
--keep class com.todoroo.astrid.helper.AmazonRequestsHelper
--keep class android.support.v4.**
--keep class android.support.v7.**
--keep class com.google.gson.stream.JsonReader {
-    public void setLenient(boolean);
-}
--keep class com.google.gson.stream.JsonWriter {
-    public void setLenient(boolean);
-}
--keep class org.joda.**
--dontwarn org.joda.convert.**
-
-# ignore reflection-based access from google libraries
--dontwarn com.google.**
--dontnote com.google.common.base.**
-
--keepattributes *Annotation*
-
--keepclassmembers class **.R$* {
-    public static <fields>;
-}
-
-# android default preserves
--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.BackupAgentHelper
--keep public class * extends android.preference.Preference
--keep public class com.android.vending.licensing.ILicensingService
-
--keepclassmembers public class com.todoroo.astrid.data.* {
-    *;
-}
-
--keepclasseswithmembers class * {
-    public <init>(android.content.Context, android.util.AttributeSet);
-}
-
--keepclasseswithmembers class * {
-    public <init>(android.content.Context, android.util.AttributeSet, int);
-}
-
--keepclassmembers class * extends android.app.Activity {
-   public void *(android.view.View);
-}
-
--keepclassmembers enum * {
-    public static **[] values();
-    public static ** valueOf(java.lang.String);
-}
-
--keep class * implements android.os.Parcelable {
-  public static final android.os.Parcelable$Creator *;
-}
diff --git a/astrid/src/main/AndroidManifest.xml b/astrid/src/main/AndroidManifest.xml
index 808ef27fd..fbd82c8ba 100644
--- a/astrid/src/main/AndroidManifest.xml
+++ b/astrid/src/main/AndroidManifest.xml
@@ -5,8 +5,8 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.tasks"
-    android:versionName="4.6.15"
-    android:versionCode="329">
+    android:versionName="4.6.16"
+    android:versionCode="330">
 
     <!-- widgets, alarms, and services will break if Astrid is installed on SD card -->
     <!--    android:installLocation="internalOnly"> -->