Merge branch 'dev'

Author: devgianlu

.travis.yml

@@ -1,22 +1,14 @@
 language: java
 
 before_install:
-  - |
-    if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then
-      echo $GPG_SECRET_KEYS | base64 --decode | $GPG_EXECUTABLE --import
-      echo $GPG_OWNERTRUST | base64 --decode | $GPG_EXECUTABLE --import-ownertrust
-    fi
+  - chmod +x .travis/*.sh
+  - .travis/load_gpg.sh
 
 install:
   - mvn clean install -DskipTests=true -Dgpg.skip -Dmaven.javadoc.skip=true -B -V
 
 script:
-  - |
-    if [[ -z "${TRAVIS_TAG}" ]]; then
-      mvn deploy -Dmaven.deploy.skip=true -B -U -Pdebug
-    else
-      mvn deploy --settings .maven.xml -B -U -Prelease
-    fi
+  - .travis/script.sh
 
 before_deploy:
   - mvn help:evaluate -N -Dexpression=project.version|grep -v '\['

.travis/load_gpg.sh

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+set -ev
+
+if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then
+  echo $GPG_SECRET_KEYS | base64 --decode | $GPG_EXECUTABLE --import
+  echo $GPG_OWNERTRUST | base64 --decode | $GPG_EXECUTABLE --import-ownertrust
+fi

.travis/script.sh

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+set -ev
+
+if [[ -z "${TRAVIS_TAG}" ]]; then
+  mvn deploy -Dmaven.deploy.skip=true -B -U -Pdebug
+else
+  mvn deploy --settings .maven.xml -B -U -Prelease
+fi

LICENSE

@@ -199,31 +199,3 @@
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
-
-
-
-                              ===============
-                                MP3 decoder
-                              ===============
-
-   MIT License
-
-   Copyright (c) 2017 delthas
-
-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in all
-   copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-   SOFTWARE.

README.md

@@ -1,12 +1,10 @@
 # librespot-java
-[![Build Status](https://travis-ci.com/librespot-org/librespot-java.svg?branch=master)](https://travis-ci.com/librespot-org/librespot-java)
+[![Build Status](https://travis-ci.com/librespot-org/librespot-java.svg?branch=dev)](https://travis-ci.com/librespot-org/librespot-java)
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/1ec8ca04e5054558a089bc7f640079a6)](https://www.codacy.com/manual/devgianlu/librespot-java?utm_source=github.com&utm_medium=referral&utm_content=librespot-org/librespot-java&utm_campaign=Badge_Grade)
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/xyz.gianlu.librespot/librespot-java/badge.svg)](https://maven-badges.herokuapp.com/maven-central/xyz.gianlu.librespot/librespot-java)
 
 `librespot-java` is a port of [librespot](https://github.com/librespot-org/librespot), originally written in Rust, which as evolved into the most up-to-date open-source Spotify client. Additionally, this implementation provides an useful API to request metadata or control the player, more [here](https://github.com/librespot-org/librespot-java/blob/master/api).
 
-### Only PRs will be accepted for branch `master`, please checkout `new-spotify-api`.
-
 ## Disclaimer!
 We (the librespot-org organization and me) **DO NOT** encourage piracy and **DO NOT** support any form of downloader/recorder designed with the help of this repository. If you're brave enough to put at risk this entire project, just don't publish it. This is meant to provide support for all those devices that are not officially supported by Spotify.
 
@@ -18,6 +16,7 @@ Its main features are:
 - Local content caching
 - Zeroconf (Spotify Connect)
 - Gapless playback
+- Mixed playlists (cuepoints and transitions)
 
 ## Get started
 All the configuration you need is inside the `config.toml` file, there you can decide to authenticate with:
@@ -55,6 +54,10 @@ This project uses [Maven](https://maven.apache.org/), after installing it you ca
 
 To run the newly build jar run `java -jar ./core/target/librespot-core-jar-with-dependencies.jar`.
 
+## Related Projects
+- [librespot](https://github.com/librespot-org/librespot)
+- [ansible-role-librespot](https://github.com/xMordax/ansible-role-librespot/tree/master) - Ansible role that will build, install and configure Librespot-Java.
+
 # Special thanks
 
 - All the developers of [librespot](https://github.com/librespot-org/librespot) which started this project in Rust