Skip to content

Commit 1f7b126

Browse files
committed
Add Travis CI build.
1 parent 9583340 commit 1f7b126

File tree

2 files changed

+9
-19
lines changed

2 files changed

+9
-19
lines changed

.travis.yml

+6-17
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,12 @@ language: java
22

33
jdk: oraclejdk7
44

5-
branches:
6-
except:
7-
- gh-pages
5+
before_install:
6+
- export TERM=dumb
7+
- sudo apt-get install -qq libstdc++6:i386 lib32z1
8+
- export COMPONENTS=build-tools-19.0.1,android-17
9+
- curl -L https://raw.github.com/embarkmobile/android-sdk-installer/version-1/android-sdk-installer | bash /dev/stdin --install=$COMPONENTS
10+
- source ~/.android-sdk-installer/env
811

912
notifications:
1013
email: false
11-
12-
before_install:
13-
# Install base Android SDK
14-
- sudo apt-get update -qq
15-
- if [ `uname -m` = x86_64 ]; then sudo apt-get install -qq --force-yes libgd2-xpm ia32-libs ia32-libs-multiarch > /dev/null; fi
16-
- wget http://dl.google.com/android/android-sdk_r22.3-linux.tgz
17-
- tar xzf android-sdk_r22.3-linux.tgz
18-
- export ANDROID_HOME=$PWD/android-sdk-linux
19-
- export PATH=${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools
20-
21-
# Install required components.
22-
- echo yes | android update sdk -a -t platform-tools,build-tools-19.0.0,android-17 --no-ui --force > /dev/null
23-
24-
script: mvn clean verify

picasso/src/main/java/com/squareup/picasso/BitmapHunter.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -245,8 +245,9 @@ static Bitmap applyCustomTransformations(List<Transformation> transformations, B
245245
if (newResult == result && result.isRecycled()) {
246246
Picasso.HANDLER.post(new Runnable() {
247247
@Override public void run() {
248-
throw new IllegalStateException(
249-
"Transformation " + transformation.key() + " returned input Bitmap but recycled it.");
248+
throw new IllegalStateException("Transformation "
249+
+ transformation.key()
250+
+ " returned input Bitmap but recycled it.");
250251
}
251252
});
252253
return null;

0 commit comments

Comments
 (0)