From cb3b8463692052cef4dc1780f27825ab8b9ac5e6 Mon Sep 17 00:00:00 2001
From: mhadam <michael@hadam.us>
Date: Tue, 27 Mar 2018 17:16:04 -0400
Subject: [PATCH] Fix outdated and broken Travis configuration (close #258)

---
 .travis.yml | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8073ade28..5ac839bef 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,9 +3,11 @@ language: android
 jdk: oraclejdk8
 
 env:
-  matrix:
-    - ANDROID_SDKS=android-19 ANDROID_TARGET=android-19 ANDROID_ABI=armeabi-v7a ANDROID_TRAVIS=1
   global:
+    - EMULATOR_API=22
+    - ANDROID_API=24
+    - ANDROID_BUILD_TOOLS=23.0.3
+    - ANDROID_TRAVIS=1
     - secure: iXVs65+lPjyTr60MsX9K2WpjJ5ijt4cnBE9PT6ouHSjkZjugotaNoX3nXZev8fKFLsH0JPxpsxBVy66jz6iOddMfLdzSiL2oOeeYNxyNThOdGp9R/JmYtivgrMm6v3e1zzCLvj9onOwBUVdWVLD/BXgYi7wP96rJFENlVjuszys=
     - secure: BXwZhWDFFXzdaTAPAvMKeOfnLHxkmdXoeMZ/GtVYkT62JxeuiaTW6Z6rT0gZKAEyxmUBxFX1CP+1m1Gi0cWrQHfTBbFDJO7iKu7mG9LcZhQ8Cm657yt2TBc+fnVqbG5OxXWhSBs1lF1gZJ6+ehEIJn3YjP6fDYv0fNnTGpYHCYo=
 
@@ -13,15 +15,26 @@ android:
   components:
     - tools
     - platform-tools
-    - build-tools-23.0.3
-    - android-24
+    - tools
+    - build-tools-$ANDROID_BUILD_TOOLS
+    - android-$ANDROID_API
+    - android-$EMULATOR_API
     - extra-android-support
     - extra-google-m2repository
     - extra-google-google_play_services
     - extra-android-m2repository
+    - addon-google_apis-google-25 # google play services
+    - sys-img-armeabi-v7a-addon-google_apis-google-$ANDROID_API
+    - sys-img-armeabi-v7a-android-$EMULATOR_API # the fix!
+  
+  licenses:
+    - ".+"
 
 before_script:
-  - echo no | android create avd --force -n test -t $ANDROID_TARGET --abi $ANDROID_ABI
+  - echo "y" | android update sdk -a --no-ui --filter android-24
+  - echo "y" | android update sdk -a --no-ui --filter sys-img-armeabi-v7a-android-24
+  - android list targets | grep -E '^id:' | awk -F '"' '{$1=""; print $2}' # list all targets
+  - echo no | android create avd --force -n test -t android-$EMULATOR_API --abi armeabi-v7a
   - emulator -avd test -no-skin -no-audio -no-window &
   - chmod +x ./ci/wait_for_emulator
   - ./ci/wait_for_emulator