Merge branch 'master' into auto_releases

2014-12-04 00:07:12 +01:00
parent b91a9aeed4 56ccebb720
commit 600aa45ff7
18 changed files with 2463 additions and 79 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -44,9 +44,10 @@ install:
      tar --absolute-names -jxf android-ndk-r9-linux-x86_64.tar.bz2 &&
      tar -zxf android-sdk_r23.0.2-linux.tgz &&
      $ANDROID list sdk --extended -a &&
-      echo yes | $ANDROID update sdk --filter tools,platform-tools,build-tools-20.0.0,android-10 --no-ui --force --no-https;
+      echo yes | $ANDROID update sdk --filter tools,platform-tools,build-tools-21.1.1,android-10 --no-ui --force --no-https;
    fi
  - sudo pip install pyjavaproperties
+  - sudo pip install github3.py
 script: ./travis-script.sh

 matrix: