Merge pull request square#629 from square/jw/fix-travis

JakeWharton · JakeWharton · commit 28b27a937fe6 · 2014-08-26T00:54:03.000-07:00
Update to Android worker.
diff --git a/.travis.yml b/.travis.yml
@@ -1,13 +1,19 @@
-language: java
+language: android
 
-jdk: oraclejdk7
+jdk:
+ - oraclejdk7
+ - oraclejdk8
 
-before_install:
-  - export TERM=dumb
-  - sudo apt-get install -qq libstdc++6:i386 lib32z1
-  - export COMPONENTS=build-tools-19.0.1,android-17
-  - curl -L https://raw.github.com/embarkmobile/android-sdk-installer/version-1/android-sdk-installer | bash /dev/stdin --install=$COMPONENTS
-  - source ~/.android-sdk-installer/env
+android:
+  components:
+    - build-tools-20.0.0
+    - android-17
+  licenses:
+    - android-sdk-license-5be876d5
+
+branches:
+  except:
+    - gh-pages
 
 notifications:
   email: false
