Merge pull request google#35 from tjohns/master

Update Travis CI configuration
thejoswamy · Aug 12, 2014 · 4ad38db · 4ad38db
2 parents ff0d52b + 86501c0
commit 4ad38db
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -16,14 +16,19 @@ language: android
 
 android:
   components:
-    - build-tools-19.0.0
+    - build-tools-20.0.0
+    - andorid-19
+    - android-20
+    - extra-google-m2repository
+    - extra-android-m2repository
+    - sys-img-armeabi-v7a-android-20
 
 notifications:
   email: false
 
 env:
   matrix:
-    - ANDROID_SDKS=android-19,sysimg-19  ANDROID_TARGET=android-19  ANDROID_ABI=armeabi-v7a
+    - ANDROID_TARGET=android-19  ANDROID_ABI=armeabi-v7a
 
 before_install:
   - echo no | android create avd --force -n test -t $ANDROID_TARGET --abi $ANDROID_ABI

diff --git a/android/debug.keystore b/android/debug.keystore
diff --git a/android/proguard-project.txt b/android/proguard-project.txt
@@ -126,3 +126,7 @@
 -keep class com.google.api.client.**
 -keep class com.google.maps.android.**
 -keep class libcore.**
+-dontwarn org.junit.**
+-dontwarn org.mockito.**
+-dontwarn org.robolectric.**
+-dontwarn com.bumptech.glide.GlideTest