From cc33e2635935af55dbc3614859165cde4e402bf7 Mon Sep 17 00:00:00 2001 From: Mohamed Zenadi Date: Wed, 18 Mar 2015 21:13:53 +0100 Subject: [PATCH 1/2] try to fix travis build --- .travis.yml | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/.travis.yml b/.travis.yml index b9ea4b6c..56b7a33e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,21 +1,17 @@ language: android -android: - components: - # The BuildTools version used by your project - - build-tools-21.1.2 - # The SDK version used to compile your project - - android-21 + android: + components: + - android-22 + - build-tools-22.0.0 + - platform-tools + - extra-google-m2repository + - extra-android-m2repository - # Additional components - - extra-google-m2repository - - extra-android-m2repository + # ok no tests for now + # - sys-img-x86-android-22 - # Specify at least one system image, - # if you need to run emulator(s) during your tests - - sys-img-x86-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 & + before_script: + - GRADLE_OPTS="-Xms40m -Xmx3g -XX:MaxPermSize=3g" + + script: "./gradlew clean build test -Dpre-dex=false" From c272b5bad98c8e89e81952491a4064e541374451 Mon Sep 17 00:00:00 2001 From: Mohamed Zenadi Date: Wed, 18 Mar 2015 23:52:07 +0100 Subject: [PATCH 2/2] fix indent --- .travis.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index 56b7a33e..3e3c7483 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,17 +1,17 @@ language: android - android: - components: - - android-22 - - build-tools-22.0.0 - - platform-tools - - extra-google-m2repository - - extra-android-m2repository +android: + components: + - android-22 + - build-tools-22.0.0 + - platform-tools + - extra-google-m2repository + - extra-android-m2repository - # ok no tests for now - # - sys-img-x86-android-22 + # ok no tests for now + # - sys-img-x86-android-22 - before_script: - - GRADLE_OPTS="-Xms40m -Xmx3g -XX:MaxPermSize=3g" +before_script: + - GRADLE_OPTS="-Xms40m -Xmx3g -XX:MaxPermSize=3g" - script: "./gradlew clean build test -Dpre-dex=false" +script: "./gradlew clean build test -Dpre-dex=false"