diff --git a/.travis.yml b/.travis.yml index 91622c994..11937213a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,36 @@ +sudo: required language: java -install: mvn install -DskipTests=true -Dgpg.skip=true jdk: - - oraclejdk8 - - oraclejdk9 - - openjdk7 - - openjdk8 +- openjdk7 +- openjdk8 +- oraclejdk8 +- oraclejdk9 +env: + global: + - secure: hiAE0Gt7pcTmcQ/rjfK+KB+Mj1O3LaEM6wNgFleG04fuPbsUgTpF3U1HMTfEvU8nB0AEoIHgPZ2qWHIqGdJ23HfC7pTXtZXy8YSMOnPpTx8j9+qX0i7kJsqA6CNd+5i1CN0aM0uSd2CXRj7CFpwBa+5kfQmsml90oG3mev1MXcs= + - # ^^SONATYPE_USERNAME + - secure: Sa7tSlz29eOhOazmyGAfv7tFtaZjI1PMtgQJ3fFFZ2EVaAbxxGU/l+TVmcCOxOt7OdCf1MTgB9/dRGPZAuVdtelPIytoJEpB7U2qBci72K1at2zqKF6dq0pPswuwdbkqJeAf39M3J1nZcXKXwirU/J4OfwWyi5qwXpM8pO7W/qM= + - # ^^SONATYPE_PASSWORD + - GPG_KEY_NAME=C546418B + - secure: gvElUeWA6ArpETjlD8s75PljnmVOQLchuAsYhG8lbakRCOBvklooc8hB9lYbtblKLgaY7ZX6Uu2tApH0gJAqb0YijEK3Hvu1417wI4FRUc+wX79MI3Y9lTqP9ACFifnUa2mjp8NqGz+/KebiZvtiI3u4OxK8U/QPUtUDLgvAdH4= + - # ^^GPG_PASSPHRASE +cache: + directories: + - $HOME/.m2 +before_deploy: + - ./travis/before-deploy.sh + - cp ./travis/.m2.settings.xml $HOME/.m2/settings.xml +deploy: + provider: script + skip_cleanup: true + script: "if [ '${TRAVIS_JDK_VERSION}' = 'oraclejdk9' ]; then mvn deploy -P release -DskipTests=true ; fi" + on: + repo: thelinmichael/spotify-web-api-java + branch: + - master + - v1 + tags: true notifications: email: on_success: never - on_failure: always \ No newline at end of file + on_failure: change diff --git a/README.md b/README.md index 61553be7d..715e4b00b 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -| Android developers | -| ------------------------------------- | -| You can use this library in your Android app. However, you should have a look at the [Android Wrapper](https://www.github.com/kaaes/spotify-web-api-android) project built by [kaaes](https://www.github.com/kaaes) as it's made specifically for Android. See also [Spotify's Android SDK](https://developer.spotify.com/technologies/spotify-android-sdk/). | +| Android Developers | +| ------------------ | +| You **cannot** use this library for Android app development. Have a look at [kaaes/spotify-web-api-android](https://www.github.com/kaaes/spotify-web-api-android) and [Spotify's Android SDK](https://developer.spotify.com/technologies/spotify-android-sdk/) and [see why](https://github.com/thelinmichael/spotify-web-api-java/issues/120#issuecomment-363266591). | Spotify Web API Java [![Build Status](https://travis-ci.org/thelinmichael/spotify-web-api-java.svg?branch=master)](https://travis-ci.org/thelinmichael/spotify-web-api-java) ================== @@ -58,7 +58,7 @@ Get the latest version: se.michaelthelin.spotify spotify-web-api-java - 1.7.3 + 1.7.5 ``` @@ -66,7 +66,7 @@ Get the latest version: This project uses net.sf.json-lib for marshalling, which may cause your Android build to fail if you're using Android Studio 1.0 ([relevant Stack Overflow post](http://stackoverflow.com/questions/27458227/org-apache-commons-collections-arraystack-has-already-been-added-to-output-plea)). It may therefore necessary to make an exclusion of common-beanutils when setting up this library as a dependency. ```Gradle -compile('se.michaelthelin.spotify:spotify-web-api-java:1.7.3') { +compile('se.michaelthelin.spotify:spotify-web-api-java:1.7.5') { exclude group: "commons-beanutils", module: "commons-beanutils" } compile 'commons-beanutils:commons-beanutils:20030211.134440' diff --git a/pom.xml b/pom.xml index 931905a5e..23e0119ef 100644 --- a/pom.xml +++ b/pom.xml @@ -7,28 +7,12 @@ se.michaelthelin.spotify spotify-web-api-java - 1.7.3 - - jar + 1.7.5 Spotify Web API Java Client A Java client for Spotify's Web API https://github.com/thelinmichael/spotify-web-api-java - - - MIT License - http://www.opensource.org/licenses/mit-license.php - repo - - - - - https://github.com/thelinmichael/spotify-web-api-java - scm:git:git://github.com/thelinmichael/spotify-web-api-java.git - scm:git:git@github.com:thelinmichael/spotify-web-api-java.git - - Michael Thelin @@ -52,84 +36,19 @@ - - - ossrh - https://oss.sonatype.org/content/repositories/snapshots - - + + + MIT License + http://www.opensource.org/licenses/mit-license.php + repo + + - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.7.0 - - 1.7 - 1.7 - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.20.1 - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.8 - true - - ossrh - https://oss.sonatype.org/ - true - - - - org.apache.maven.plugins - maven-gpg-plugin - 1.6 - - - sign-artifacts - - sign - - - - - - org.apache.maven.plugins - maven-source-plugin - 3.0.1 - - - attach-sources - - jar - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - - attach-javadocs - - jar - - - - - false - - 3.0.0-M1 - - - + + https://github.com/thelinmichael/spotify-web-api-java + scm:git:git://github.com/thelinmichael/spotify-web-api-java.git + scm:git:git@github.com:thelinmichael/spotify-web-api-java.git + @@ -167,9 +86,114 @@ + jar + + + + default + + true + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.7.0 + + 1.7 + 1.7 + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.20.1 + + + + + + release + + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.0.0 + + + attach-javadocs + + + jar + + + + + false + + + + org.apache.maven.plugins + maven-source-plugin + 3.0.1 + + + attach-sources + + + jar-no-fork + + + + + + org.apache.maven.plugins + maven-gpg-plugin + 1.6 + + + sign-artifacts + + + sign + + + + + gpg2 + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.8 + true + + ossrh + https://oss.sonatype.org/ + true + + + + + + + + + + ossrh + https://oss.sonatype.org/content/repositories/snapshots + + + ossrh + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + + + UTF-8 - true diff --git a/travis/.m2.settings.xml b/travis/.m2.settings.xml new file mode 100644 index 000000000..b5ce152e6 --- /dev/null +++ b/travis/.m2.settings.xml @@ -0,0 +1,22 @@ + + + + + ossrh + ${env.SONATYPE_USERNAME} + ${env.SONATYPE_PASSWORD} + + + + + ossrh + + true + + + ${env.GPG_KEY_NAME} + ${env.GPG_PASSPHRASE} + + + + diff --git a/travis/before-deploy.sh b/travis/before-deploy.sh new file mode 100755 index 000000000..2ec59f8da --- /dev/null +++ b/travis/before-deploy.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash +openssl aes-256-cbc -K $encrypted_3e6b49107f67_key -iv $encrypted_3e6b49107f67_iv -in travis/codesigning.asc.enc -out travis/codesigning.asc -d +gpg --batch --fast-import travis/codesigning.asc \ No newline at end of file diff --git a/travis/codesigning.asc.enc b/travis/codesigning.asc.enc new file mode 100644 index 000000000..3b9760338 Binary files /dev/null and b/travis/codesigning.asc.enc differ