Merge branch 'develop'

Nimrodda · Mar 23, 2015 · aa838e4 · aa838e4
2 parents 18257b3 + abbd769
commit aa838e4
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,9 +7,14 @@ android:
   components:
     - platform-tools
     - tools
-    - build-tools-21.1.2
+    - build-tools-24.0.0
     - android-21
     - extra-android-m2repository
-
+    - sys-img-armeabi-v7a-android-21
+before_script:
+  - echo no | android create avd --force -n test -t android-21 --abi armeabi-v7a
+  - emulator -avd test -no-skin -no-audio -no-window &
+  - android-wait-for-emulator
+  - adb shell input keyevent 82 &
 script:
-  - ./gradlew assemble
+  - ./gradlew build connectedCheck