Merge branch 'master' into SlideUpPanel2

Conflicts:
	app/app.iml
	app/build.gradle

1 files changed, 61 insertions, 0 deletions

diff --git a/app/proguard.cfg b/app/proguard.cfg
new file mode 100644
index 00000000..8e1a0a0a
--- /dev/null
+++ b/app/proguard.cfg
@@ -0,0 +1,61 @@
+-dontobfuscate
+-optimizationpasses 5
+-dontusemixedcaseclassnames
+-dontskipnonpubliclibraryclasses
+-dontpreverify
+-verbose
+-optimizations !code/simplification/arithmetic,!field/*,!class/merging/*,!code/allocation/variable
+
+-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
+
+# Kryo
+-keep,allowshrinking class java.beans.** { *; }
+-keep,allowshrinking class sun.reflect.** { *; }
+-dontwarn sun.reflect.**
+-dontwarn java.beans.**
+-keepclassmembers public class com.esotericsoftware.** { *; }
+
+-keepclasseswithmembernames class * {
+    native <methods>;
+}
+
+-keepclassmembers class * extends android.app.Activity {
+   public void *(android.view.View);
+}
+
+-keepclassmembers public class * extends android.view.View {
+   void set*(***);
+   *** get*();
+}
+
+-keepclassmembers enum * {
+    public static **[] values();
+    public static ** valueOf(java.lang.String);
+}
+
+-keep class * implements android.os.Parcelable {
+  public static final android.os.Parcelable$Creator *;
+}
+
+-keep class android.support.v7.app.MediaRouteButton { *; }
+
+-dontwarn android.support.**
+
+# DLNA/Cling
+-keep class org.fourthline.cling.** { *; }
+-keep interface org.fourthline.cling.** { *; }
+-dontwarn javax.**
+-dontwarn org.objectweb.**
+-dontwarn org.slf4j.**
+-dontwarn org.mortbay.**
+-dontwarn org.fourthline.**
+-dontwarn org.seamless.**
+-dontwarn org.eclipse.**
+-dontwarn java.**
+-keepattributes *Annotation*, InnerClasses
\ No newline at end of file