Skip to content

Commit 0c68c57

Browse files
committed
1.7.5
~ Version update ~ Travis strap
1 parent 4f9e55f commit 0c68c57

5 files changed

Lines changed: 5 additions & 60 deletions

File tree

‎.travis.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@ env:
1717
cache:
1818
directories:
1919
- $HOME/.m2
20-
before_install:
21-
- ./travis/install-gnupg22.sh
22-
- hash -r
2320
before_deploy:
2421
- ./travis/before-deploy.sh
2522
- cp ./travis/.m2.settings.xml $HOME/.m2/settings.xml

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,15 +58,15 @@ Get the latest version:
5858
<dependency>
5959
<groupId>se.michaelthelin.spotify</groupId>
6060
<artifactId>spotify-web-api-java</artifactId>
61-
<version>1.7.4</version>
61+
<version>1.7.5</version>
6262
</dependency>
6363
```
6464

6565
#### Gradle users
6666

6767
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.
6868
```Gradle
69-
compile('se.michaelthelin.spotify:spotify-web-api-java:1.7.4') {
69+
compile('se.michaelthelin.spotify:spotify-web-api-java:1.7.5') {
7070
exclude group: "commons-beanutils", module: "commons-beanutils"
7171
}
7272
compile 'commons-beanutils:commons-beanutils:20030211.134440'

‎pom.xml‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
<groupId>se.michaelthelin.spotify</groupId>
99
<artifactId>spotify-web-api-java</artifactId>
10-
<version>1.7.4</version>
10+
<version>1.7.5</version>
1111

1212
<name>Spotify Web API Java Client</name>
1313
<description>A Java client for Spotify's Web API</description>
@@ -162,12 +162,7 @@
162162
</execution>
163163
</executions>
164164
<configuration>
165-
<executable>gpg</executable>
166-
<gpgArguments>
167-
<arg>--batch</arg>
168-
<arg>--pinentry-mode</arg>
169-
<arg>loopback</arg>
170-
</gpgArguments>
165+
<executable>gpg2</executable>
171166
</configuration>
172167
</plugin>
173168
<plugin>

‎travis/before-deploy.sh‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
11
#!/usr/bin/env bash
22
openssl aes-256-cbc -K $encrypted_3e6b49107f67_key -iv $encrypted_3e6b49107f67_iv -in travis/codesigning.asc.enc -out travis/codesigning.asc -d
3-
echo "allow-loopback-pinentry" > ~/.gnupg/gpg-agent.conf
4-
echo "pinentry-mode loopback" > ~/.gnupg/gpg.conf
5-
echo "use-agent" >> ~/.gnupg/gpg.conf
6-
cat ~/.gnupg/gpg.conf
7-
gpg --list-secret-keys
8-
gpg --batch --fast-import travis/codesigning.asc
9-
gpg --list-secret-keys
3+
gpg --batch --fast-import travis/codesigning.asc

‎travis/install-gnupg22.sh‎

Lines changed: 0 additions & 41 deletions
This file was deleted.

0 commit comments

Comments
 (0)