diff options
| author | mar-v-in <github@rvin.mooo.com> | 2014-06-18 21:43:54 +0200 |
|---|---|---|
| committer | mar-v-in <github@rvin.mooo.com> | 2014-06-18 21:43:54 +0200 |
| commit | d9c937bbe762736d9f0c45d5ba0083555c8da2e1 (patch) | |
| tree | e5cbd2300622e555283867f39767bf34b9dd5796 /.travis.yml | |
| parent | e106079b90f7d596a254b223b6e8741fc6d94785 (diff) | |
| parent | 825f37eee4be6a4dc527391e6238668e6d147a36 (diff) | |
| download | open-keychain-d9c937bbe762736d9f0c45d5ba0083555c8da2e1.tar.gz open-keychain-d9c937bbe762736d9f0c45d5ba0083555c8da2e1.tar.bz2 open-keychain-d9c937bbe762736d9f0c45d5ba0083555c8da2e1.zip | |
Merge branch 'master' into improve-file
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index df700368c..36e8f8fcf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,13 +4,13 @@ before_install: # Install base Android SDK - sudo apt-get update -qq - if [ `uname -m` = x86_64 ]; then sudo apt-get install -qq --force-yes libgd2-xpm lib32z1 lib32stdc++6; fi - - wget http://dl.google.com/android/android-sdk_r22.3-linux.tgz - - tar xzf android-sdk_r22.3-linux.tgz + - wget http://dl.google.com/android/android-sdk_r22.6.2-linux.tgz + - tar xzf android-sdk_r22.6.2-linux.tgz - export ANDROID_HOME=$PWD/android-sdk-linux - export PATH=${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools # Install required Android components. - - echo "y" | android update sdk -a --filter build-tools-19.0.3,android-19,platform-tools,extra-android-support,extra-android-m2repository --no-ui --force + - echo "y" | android update sdk -a --filter build-tools-19.1.0,android-19,platform-tools,extra-android-support,extra-android-m2repository --no-ui --force install: echo "Installation done" script: gradle assemble -S -q |