Merge branch 'master' into SlideUpPanel2

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

11 files changed, 88 insertions, 9 deletions

diff --git a/app/app.iml b/app/app.iml
index 12ca762d..940b4f41 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -87,22 +87,30 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" exported="" name="mediarouter-v7-22.1.1" level="project" />
     <orderEntry type="library" exported="" name="seamless-util-1.1.0" level="project" />
-    <orderEntry type="library" exported="" name="library-2.4.0" level="project" />
     <orderEntry type="library" exported="" name="cling-core-2.0.1" level="project" />
-    <orderEntry type="library" exported="" name="javax.servlet-3.0.0.v201112011016" level="project" />
+    <orderEntry type="library" exported="" name="jetty-continuation-8.1.16.v20140903" level="project" />
     <orderEntry type="library" exported="" name="support-annotations-22.1.1" level="project" />
-    <orderEntry type="library" exported="" name="support-v4-22.1.1" level="project" />
     <orderEntry type="library" exported="" name="play-services-cast-7.0.0" level="project" />
-    <orderEntry type="library" exported="" name="cling-support-2.0.1" level="project" />
     <orderEntry type="library" exported="" name="seamless-http-1.1.0" level="project" />
+    <orderEntry type="library" exported="" name="jetty-util-8.1.16.v20140903" level="project" />
     <orderEntry type="library" exported="" name="appcompat-v7-22.1.1" level="project" />
+    <orderEntry type="library" exported="" name="seamless-swing-1.1.0" level="project" />
     <orderEntry type="library" exported="" name="seamless-xml-1.1.0" level="project" />
-    <orderEntry type="library" exported="" name="CWAC-EndlessAdapter" level="project" />
     <orderEntry type="library" exported="" name="kryo-2.21-all" level="project" />
     <orderEntry type="library" exported="" name="play-services-base-7.0.0" level="project" />
-    <orderEntry type="library" exported="" name="jetty-all-8.1.16.v20140903" level="project" />
+    <orderEntry type="library" exported="" name="jetty-http-8.1.16.v20140903" level="project" />
+    <orderEntry type="library" exported="" name="library-2.4.0" level="project" />
+    <orderEntry type="library" exported="" name="javax.servlet-3.0.0.v201112011016" level="project" />
+    <orderEntry type="library" exported="" name="jetty-server-8.1.16.v20140903" level="project" />
+    <orderEntry type="library" exported="" name="support-v4-22.1.1" level="project" />
+    <orderEntry type="library" exported="" name="cling-support-2.0.1" level="project" />
+    <orderEntry type="library" exported="" name="jetty-io-8.1.16.v20140903" level="project" />
+    <orderEntry type="library" exported="" name="CWAC-EndlessAdapter" level="project" />
+    <orderEntry type="library" exported="" name="jetty-security-8.1.16.v20140903" level="project" />
+    <orderEntry type="library" exported="" name="jetty-servlet-8.1.16.v20140903" level="project" />
     <orderEntry type="library" exported="" name="CWAC-AdapterWrapper" level="project" />
     <orderEntry type="library" exported="" name="library-3.0.0" level="project" />
+    <orderEntry type="library" exported="" name="jetty-client-8.1.16.v20140903" level="project" />
     <orderEntry type="module" module-name="DragSort ListView" exported="" />
     <orderEntry type="module" module-name="Server Proxy" exported="" />
   </component>
diff --git a/app/build.gradle b/app/build.gradle
index 76381247..a3667828 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -11,14 +11,18 @@ android {
 	}
 	buildTypes {
 		release {
-			minifyEnabled false
-			proguardFiles getDefaultProguardFile('proguard.cfg')
+			minifyEnabled true
+			proguardFiles 'proguard.cfg'
 		}
 	}
 
 	packagingOptions {
 		exclude 'META-INF/beans.xml'
 	}
+
+	lintOptions {
+		checkReleaseBuilds false
+	}
 }
 
 dependencies {
@@ -30,4 +34,9 @@ dependencies {
 	compile 'com.android.support:mediarouter-v7:22.1.1'
 	compile 'com.google.android.gms:play-services-cast:7.0.0'
 	compile 'com.sothree.slidinguppanel:library:3.0.0'
+	compile group: 'org.fourthline.cling', name: 'cling-core', version:'2.0.1'
+	compile group: 'org.fourthline.cling', name: 'cling-support', version:'2.0.1'
+	compile group: 'org.eclipse.jetty', name: 'jetty-server', version:'8.1.16.v20140903'
+	compile group: 'org.eclipse.jetty', name: 'jetty-servlet', version:'8.1.16.v20140903'
+	compile group: 'org.eclipse.jetty', name: 'jetty-client', version:'8.1.16.v20140903'
 }
diff --git a/app/libs/cling-core-2.0.1.jar b/app/libs/cling-core-2.0.1.jar
deleted file mode 100644
index 632d3038..00000000
--- a/app/libs/cling-core-2.0.1.jar
+++ /dev/null
diff --git a/app/libs/cling-support-2.0.1.jar b/app/libs/cling-support-2.0.1.jar
deleted file mode 100644
index 7fa28604..00000000
--- a/app/libs/cling-support-2.0.1.jar
+++ /dev/null
diff --git a/app/libs/javax.servlet-3.0.0.v201112011016.jar b/app/libs/javax.servlet-3.0.0.v201112011016.jar
deleted file mode 100644
index b1354096..00000000
--- a/app/libs/javax.servlet-3.0.0.v201112011016.jar
+++ /dev/null
diff --git a/app/libs/jetty-all-8.1.16.v20140903.jar b/app/libs/jetty-all-8.1.16.v20140903.jar
deleted file mode 100644
index 25b1d324..00000000
--- a/app/libs/jetty-all-8.1.16.v20140903.jar
+++ /dev/null
diff --git a/app/libs/seamless-http-1.1.0.jar b/app/libs/seamless-http-1.1.0.jar
deleted file mode 100644
index 98ec884a..00000000
--- a/app/libs/seamless-http-1.1.0.jar
+++ /dev/null
diff --git a/app/libs/seamless-util-1.1.0.jar b/app/libs/seamless-util-1.1.0.jar
deleted file mode 100644
index 12026b7f..00000000
--- a/app/libs/seamless-util-1.1.0.jar
+++ /dev/null
diff --git a/app/libs/seamless-xml-1.1.0.jar b/app/libs/seamless-xml-1.1.0.jar
deleted file mode 100644
index 1e740877..00000000
--- a/app/libs/seamless-xml-1.1.0.jar
+++ /dev/null
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
diff --git a/app/src/main/res/layout/rating.xml b/app/src/main/res/layout/rating.xml
index 2753ef68..34c25b6b 100644
--- a/app/src/main/res/layout/rating.xml
+++ b/app/src/main/res/layout/rating.xml
@@ -10,6 +10,7 @@
 		android:layout_height="wrap_content"
 		android:numStars="5"
 		android:stepSize="1"
-		android:layout_gravity="center_horizontal"/>
+		android:layout_gravity="center_horizontal"
+		style="@android:style/Widget.Holo.RatingBar"/>
 
 </LinearLayout>
\ No newline at end of file