Merge branch 'release/6.4'

CHANGELOG.md

@@ -1,6 +1,16 @@
 Release Notes
 =============
 
+Version 6.4
+-----------
+ * Filter collection by collection name
+ * Sort collection by last played date
+ * When viewing a play, players are selectable
+ * Clicking a notification about an uploaded play or collection item goes to something more interesting
+ * UI improvements
+ * Syncing improvements
+ * Bug fixes
+
 Version 6.3.7
 -------------
  * Bug fixes

app/build.gradle

@@ -11,9 +11,9 @@ buildscript {
 }
 
 def versionMajor = 6
-def versionMinor = 3
-def versionPatch = 7
-def versionBuild = 1
+def versionMinor = 4
+def versionPatch = 0
+def versionBuild = 2
 
 apply plugin: 'com.android.application'
 apply plugin: 'com.neenbedankt.android-apt'
@@ -49,7 +49,14 @@ def gitBranchName = { ->
 
 android {
     compileSdkVersion 25
-    buildToolsVersion "24.0.3"
+    buildToolsVersion '25.0.2'
+
+    lintOptions {
+        baseline file("lint-baseline.xml")
+        checkAllWarnings true
+        warningsAsErrors true
+        abortOnError true
+    }
 
     dexOptions {
         jumboMode true
@@ -94,17 +101,17 @@ android {
 
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile 'com.android.support:appcompat-v7:25.1.1'
-    compile 'com.android.support:cardview-v7:25.1.1'
-    compile 'com.android.support:design:25.1.1'
-    compile 'com.android.support:palette-v7:25.1.1'
-    compile 'com.android.support:percent:25.1.1'
-    compile 'com.android.support:recyclerview-v7:25.1.1'
-    compile 'com.android.support:support-annotations:25.1.1'
+    compile 'com.android.support:appcompat-v7:25.2.0'
+    compile 'com.android.support:cardview-v7:25.2.0'
+    compile 'com.android.support:design:25.2.0'
+    compile 'com.android.support:palette-v7:25.2.0'
+    compile 'com.android.support:percent:25.2.0'
+    compile 'com.android.support:recyclerview-v7:25.2.0'
+    compile 'com.android.support:support-annotations:25.2.0'
     compile 'com.google.code.gson:gson:2.8.0'
-    compile 'com.squareup.retrofit2:retrofit:2.1.0'
-    compile 'com.squareup.retrofit2:converter-gson:2.1.0'
-    compile('com.squareup.retrofit2:converter-simplexml:2.1.0') {
+    compile 'com.squareup.retrofit2:retrofit:2.2.0'
+    compile 'com.squareup.retrofit2:converter-gson:2.2.0'
+    compile('com.squareup.retrofit2:converter-simplexml:2.2.0') {
         exclude group: 'stax', module: 'stax-api'
         exclude group: 'stax', module: 'stax'
         exclude group: 'xpp3', module: 'xpp3'
@@ -121,7 +128,7 @@ dependencies {
     compile('com.crashlytics.sdk.android:crashlytics:2.6.6@aar') {
         transitive = true;
     }
-    compile('com.mikepenz:aboutlibraries:5.9.1@aar') {
+    compile('com.mikepenz:aboutlibraries:5.9.3@aar') {
         transitive = true
     }
     compile 'org.greenrobot:eventbus:3.0.0'
@@ -138,7 +145,7 @@ dependencies {
     apt "com.google.auto.value:auto-value:1.2"
 
     compile 'io.reactivex:rxandroid:1.2.1'
-    compile 'io.reactivex:rxjava:1.2.5'
+    compile 'io.reactivex:rxjava:1.2.7'
 
     compile 'frankiesardo:icepick:3.2.0'
     provided 'frankiesardo:icepick-processor:3.2.0'