From e664ecfaf5e2253de7168bda88a1cf2e64802994 Mon Sep 17 00:00:00 2001 From: Xawotihs Date: Sat, 11 Jul 2015 18:05:39 +0200 Subject: [PATCH 1/7] Update .travis.yml Updated android build tools to 22.0.1 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a34e11b85..579290338 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,7 +39,7 @@ install: tar --absolute-names -jxf android-ndk-r9-linux-x86_64.tar.bz2 && tar -zxf android-sdk_r24.0.2-linux.tgz && $ANDROID list sdk --extended -a && - echo yes | $ANDROID update sdk --filter tools,platform-tools,build-tools-21.1.2,android-10 --no-ui --force --no-https; + echo yes | $ANDROID update sdk --filter tools,platform-tools,build-tools-22.0.1,android-10 --no-ui --force --no-https; fi - sudo pip install pyjavaproperties - sudo pip install github3.py From 38ed60bf6342171934f93b6dbf1c401468f55b56 Mon Sep 17 00:00:00 2001 From: Xawotihs Date: Sat, 11 Jul 2015 18:27:23 +0200 Subject: [PATCH 2/7] Update .travis.yml Add some \ to try fixing the script --- .travis.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 579290338..79c833ea3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,7 +39,10 @@ install: tar --absolute-names -jxf android-ndk-r9-linux-x86_64.tar.bz2 && tar -zxf android-sdk_r24.0.2-linux.tgz && $ANDROID list sdk --extended -a && - echo yes | $ANDROID update sdk --filter tools,platform-tools,build-tools-22.0.1,android-10 --no-ui --force --no-https; + echo yes | $ANDROID update sdk --no-ui --force --no-https --filter \ + tools,\ + platform-tools,\ + build-tools-22.0.1,android-10; fi - sudo pip install pyjavaproperties - sudo pip install github3.py From 6a37b5e46188d1fb78f2cd2d7a03d6f65f304c15 Mon Sep 17 00:00:00 2001 From: Xawotihs Date: Sat, 11 Jul 2015 18:36:34 +0200 Subject: [PATCH 3/7] Update .travis.yml And a last one. --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 79c833ea3..79952a243 100644 --- a/.travis.yml +++ b/.travis.yml @@ -42,7 +42,8 @@ install: echo yes | $ANDROID update sdk --no-ui --force --no-https --filter \ tools,\ platform-tools,\ - build-tools-22.0.1,android-10; + build-tools-22.0.1,\ + android-10; fi - sudo pip install pyjavaproperties - sudo pip install github3.py From 2d02f97f7f274a155de335ee62989e2666c311dc Mon Sep 17 00:00:00 2001 From: Xawotihs Date: Sat, 11 Jul 2015 18:51:11 +0200 Subject: [PATCH 4/7] Update .travis.yml Updated android SDK to 24.3.3 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 79952a243..a3a5639b6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,7 +21,7 @@ before_install: export ANDROID="android-sdk-linux/tools/android" && if [ `uname -m` = x86_64 ]; then sudo apt-get install -qq --force-yes libgd2-xpm ia32-libs ia32-libs-multiarch jq; fi && wget http://dl.google.com/android/ndk/android-ndk-r9-linux-x86_64.tar.bz2 -nv && - wget http://dl.google.com/android/android-sdk_r24.0.2-linux.tgz -nv; + wget http://dl.google.com/android/android-sdk_r24.3.3-linux.tgz -nv; fi # Building for Qt here - if [ "$BUILD_Qt" == "YES" ]; then From 31b8ad248f6f7dd84cccb65b8d3e4fa223db3e08 Mon Sep 17 00:00:00 2001 From: Xawotihs Date: Sat, 11 Jul 2015 20:03:37 +0200 Subject: [PATCH 5/7] Update .travis.yml Fixed references to SDK package --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a3a5639b6..96c7037f8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,7 +37,7 @@ install: fi - if [ "$BUILD_ANDROID" == "YES" ]; then tar --absolute-names -jxf android-ndk-r9-linux-x86_64.tar.bz2 && - tar -zxf android-sdk_r24.0.2-linux.tgz && + tar -zxf android-sdk_r24.3.3-linux.tgz && $ANDROID list sdk --extended -a && echo yes | $ANDROID update sdk --no-ui --force --no-https --filter \ tools,\ From 80379ecde5a1bb48e17b54b31015daa3de0e95f4 Mon Sep 17 00:00:00 2001 From: Xawotihs Date: Sat, 11 Jul 2015 21:52:20 +0200 Subject: [PATCH 6/7] Update .travis.yml --- .travis.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 96c7037f8..b8dccdb27 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,11 +39,7 @@ install: tar --absolute-names -jxf android-ndk-r9-linux-x86_64.tar.bz2 && tar -zxf android-sdk_r24.3.3-linux.tgz && $ANDROID list sdk --extended -a && - echo yes | $ANDROID update sdk --no-ui --force --no-https --filter \ - tools,\ - platform-tools,\ - build-tools-22.0.1,\ - android-10; + echo yes | $ANDROID update sdk --no-ui --force --no-https --filter tools,platform-tools,build-tools-22.0.1,android-10; fi - sudo pip install pyjavaproperties - sudo pip install github3.py From 85741540717b8a5b40f6831d63d74bd31f77ffcb Mon Sep 17 00:00:00 2001 From: Xawotihs Date: Sat, 11 Jul 2015 21:58:30 +0200 Subject: [PATCH 7/7] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b8dccdb27..7c3c5011d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,7 +39,7 @@ install: tar --absolute-names -jxf android-ndk-r9-linux-x86_64.tar.bz2 && tar -zxf android-sdk_r24.3.3-linux.tgz && $ANDROID list sdk --extended -a && - echo yes | $ANDROID update sdk --no-ui --force --no-https --filter tools,platform-tools,build-tools-22.0.1,android-10; + echo yes | $ANDROID update sdk -a -t tools,platform-tools,build-tools-22.0.1,android-10 --no-ui --force --no-https; fi - sudo pip install pyjavaproperties - sudo pip install github3.py