diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-06-12 23:57:21 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-06-13 00:27:40 +0200 |
commit | ca4774fd622131581e7f700a12594ad6fe1263b1 (patch) | |
tree | 10ad0e6676454a435d45b7dc12d1fd9148aab6a0 /.travis.yml | |
parent | 073433fa747d698c6666081b2ee312062ecf2115 (diff) | |
parent | 70d454785fc87dfaf8731a6eb7cebe3fc0056e7a (diff) | |
download | open-keychain-ca4774fd622131581e7f700a12594ad6fe1263b1.tar.gz open-keychain-ca4774fd622131581e7f700a12594ad6fe1263b1.tar.bz2 open-keychain-ca4774fd622131581e7f700a12594ad6fe1263b1.zip |
Merge remote-tracking branch 'origin/master' into canonicalize
Conflicts:
.gitmodules
OpenKeychain/build.gradle
OpenKeychain/src/main/AndroidManifest.xml
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java
OpenKeychain/src/main/res/values/strings.xml
settings.gradle
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 |