Merge pull request #181 from ultrasonic/fix-release-build

Fix release build

dependencies.gradle

@@ -1,6 +1,6 @@
 ext.versions = [
         versionCode          : 64,
-        versionName          : "2.3.0",
+        versionName          : "2.3.1",
 
         minSdk               : 14,
         targetSdk            : 22,

ultrasonic/build.gradle

@@ -21,16 +21,19 @@ android {
         release {
             minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'),
+                    'minify/proguard-main.pro',
                     'minify/proguard-okhttp.pro',
                     'minify/proguard-retrofit.pro',
-                    'minify/proguard-jackson.pro'
+                    'minify/proguard-jackson.pro',
+                    'minify/proguard-kotlin-reflect.pro',
+                    'minify/proguard-kotlin.pro'
         }
         debug {
             minifyEnabled false
             testCoverageEnabled true
+            applicationIdSuffix ".debug"
         }
     }
-
     sourceSets {
         main.java.srcDirs += "${projectDir}/src/main/kotlin"
         test.java.srcDirs += "${projectDir}/src/test/kotlin"

ultrasonic/minify/proguard-jackson.pro

@@ -9,3 +9,13 @@
 }
 -dontwarn com.fasterxml.jackson.databind.**
 -keep class org.codehaus.** { *; }
+-keepclassmembers class * extends com.fasterxml.jackson.databind.JsonDeserializer {
+    *;
+}
+
+-keepclassmembers public class * {
+     @com.fasterxml.jackson.annotation.JsonCreator *;
+     @com.fasterxml.jackson.annotation.JsonProperty *;
+     @com.fasterxml.jackson.databind.annotation.JsonDeserialize *;
+}
+

ultrasonic/minify/proguard-kotlin-reflect.pro

@@ -0,0 +1,12 @@
+-keep class kotlin.Metadata { *; }
+-keep class kotlin.reflect.** { *; }
+
+-keepclassmembers public class com.company[obfuscated].domain.api.models.** {
+    public synthetic <methods>;
+}
+
+-keep class org.jetbrains.kotlin.** { *; }
+-keep class org.jetbrains.annotations.** { *; }
+-keepclassmembers class ** {
+  @org.jetbrains.annotations.ReadOnly public *;
+}

ultrasonic/minify/proguard-kotlin.pro

@@ -0,0 +1,4 @@
+-dontwarn kotlin.**
+-keepclassmembers class **$WhenMappings {
+    <fields>;
+}

ultrasonic/minify/proguard-main.pro

@@ -0,0 +1,4 @@
+-dontobfuscate
+
+### Don't remove subsonic api serializers/entities
+-keep class org.moire.ultrasonic.api.subsonic.response.** { *; }

ultrasonic/src/main/res/layout/download_playlist.xml

@@ -2,6 +2,7 @@
 
 <LinearLayout
         xmlns:a="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
         a:orientation="vertical"
         a:layout_width="fill_parent"
         a:layout_height="fill_parent"
@@ -15,20 +16,19 @@
             a:padding="10dip"/>
 
     <com.mobeta.android.dslv.DragSortListView
-            xmlns:dslv="http://schemas.android.com/apk/res/org.moire.ultrasonic"
             a:id="@+id/download_list"
             a:layout_width="fill_parent"
             a:layout_height="0dip"
             a:layout_weight="1"
             a:fastScrollEnabled="true"
         	a:textFilterEnabled="true"
-            dslv:drag_handle_id="@+id/song_drag"
-            dslv:remove_enabled="true"
-            dslv:remove_mode="flingRemove"
-            dslv:fling_handle_id="@+id/song_drag"
-            dslv:drag_start_mode="onMove"
-            dslv:float_background_color="?attr/color_background"
-            dslv:float_alpha="0.7" />
+            app:drag_handle_id="@+id/song_drag"
+            app:remove_enabled="true"
+            app:remove_mode="flingRemove"
+            app:fling_handle_id="@+id/song_drag"
+            app:drag_start_mode="onMove"
+            app:float_background_color="?attr/color_background"
+            app:float_alpha="0.7" />
 
 
 </LinearLayout>