diff options
| author | Kenny Root <kenny@the-b.org> | 2015-07-16 11:16:05 -0700 |
|---|---|---|
| committer | Kenny Root <kenny@the-b.org> | 2015-07-16 11:16:05 -0700 |
| commit | 820958fcd4a30556f957afbcbd9cb7e106a23dc0 (patch) | |
| tree | 7cb83d4d29661fe79fa8f25263ae18d5f51f63e8 | |
| parent | b0bea6930e0539a3b1fe07672499bdc91eb84cd8 (diff) | |
| parent | c22178e05b672f5c2beb498f4beb936f8d6acc45 (diff) | |
| download | connectbot-820958fcd4a30556f957afbcbd9cb7e106a23dc0.tar.gz connectbot-820958fcd4a30556f957afbcbd9cb7e106a23dc0.tar.bz2 connectbot-820958fcd4a30556f957afbcbd9cb7e106a23dc0.zip | |
Merge pull request #100 from kruton/master
travis-ci: switch to NDK r10e
| -rw-r--r-- | .travis.yml | 11 | ||||
| -rw-r--r-- | app/build.gradle | 2 |
2 files changed, 7 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index d05375b..a3d9876 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ sudo: false env: global: - - NDK_VERSION=r10b + - NDK_VERSION=r10e cache: directories: @@ -15,20 +15,21 @@ cache: addons: apt: packages: - - libgd2-xpm - ia32-libs - ia32-libs-multiarch + - libgd2-xpm + - p7zip-full before_script: # newest Android NDK - mkdir -p $HOME/.cache/ndk - - if [ `uname -m` = x86_64 ]; then curl https://dl.google.com/android/ndk/android-ndk32-${NDK_VERSION}-linux-x86_64.tar.bz2 -z $HOME/.cache/ndk/ndk-${NDK_VERSION}-64.tb2 -o $HOME/.cache/ndk/ndk-${NDK_VERSION}-64.tb2; ln -sf $HOME/.cache/ndk/ndk-${NDK_VERSION}-64.tb2 ndk.tb2; else curl https://dl.google.com/android/ndk/android-ndk32-${NDK_VERSION}-linux-x86.tar.bz2 -z $HOME/.cache/ndk/ndk-${NDK_VERSION}-32.tb2 -o $HOME/.cache/ndk/ndk-${NDK_VERSION}-32.tb2; ln -sf $HOME/.cache/ndk/ndk-${NDK_VERSION}-32.tb2 ndk.tb2; fi - - tar -jxf ndk.tb2 + - curl https://dl.google.com/android/ndk/android-ndk-${NDK_VERSION}-linux-x86_64.bin -z $HOME/.cache/ndk/ndk-${NDK_VERSION}.bin -o $HOME/.cache/ndk/ndk-${NDK_VERSION}.bin + - 7z x -y $HOME/.cache/ndk/ndk-${NDK_VERSION}.bin | grep -v 'ing ' - echo "ndk.dir=`pwd`/android-ndk-${NDK_VERSION}" >> local.properties android: components: - - build-tools-22.0.0 + - build-tools-22.0.1 - android-22 - extra-android-support - extra-android-m2repository diff --git a/app/build.gradle b/app/build.gradle index ad8ba26..a0fec85 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -5,7 +5,7 @@ apply from: '../config/translations.gradle' android { compileSdkVersion 22 - buildToolsVersion "21.0.0" + buildToolsVersion "22.0.1" defaultConfig { applicationId "org.connectbot" |