Merge pull request #208 from SeanPONeil/fix_travis

Allow Travis to build ActiveAndroid successfully. Update android-maven-plugin to 3.8.2, and download build tools in addition to the SDK.
pardom-zz · Apr 7, 2014 · bd98740 · bd98740
2 parents cb31474 + 44f5bc6
commit bd98740
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -9,12 +9,18 @@ before_install:
   - sudo apt-get install -qq --force-yes libgd2-xpm ia32-libs ia32-libs-multiarch
 
   # Install Android SDK
-  - wget http://dl.google.com/android/android-sdk_r21.0.1-linux.tgz
-  - tar -zxf android-sdk_r21.0.1-linux.tgz
+  - wget http://dl.google.com/android/android-sdk_r22.6.2-linux.tgz
+  - tar -zxf android-sdk_r22.6.2-linux.tgz
   - ls
   - export ANDROID_HOME=`pwd`/android-sdk-linux
   - export PATH=${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools
 
+  # Install build-tools
+  - wget https://dl-ssl.google.com/android/repository/build-tools_r19.0.3-linux.zip
+  - unzip build-tools_r19.0.3-linux.zip -d $ANDROID_HOME
+  - mkdir -p $ANDROID_HOME/build-tools/
+  - mv $ANDROID_HOME/android-4.4.2 $ANDROID_HOME/build-tools/19.0.1
+
   # Install required Android components
   - android list sdk --extended
   # Do you accept the license 'android-sdk-license-bcbbd656' [y/n]:
@@ -31,4 +37,4 @@ before_script:
   - ./wait_for_emulator
 
 script:
-  - mvn clean install
+  - mvn clean install -e
diff --git a/pom-child.xml b/pom-child.xml
@@ -78,7 +78,7 @@
             <plugin>
                 <groupId>com.jayway.maven.plugins.android.generation2</groupId>
                 <artifactId>android-maven-plugin</artifactId>
-                <version>3.8.0</version>
+                <version>3.8.2</version>
                 <configuration>
                     <sdk>
                         <path>${env.ANDROID_HOME}</path>

diff --git a/pom.xml b/pom.xml
@@ -26,7 +26,7 @@
         <plugin>
           <groupId>com.jayway.maven.plugins.android.generation2</groupId>
           <artifactId>android-maven-plugin</artifactId>
-          <version>3.6.0</version>
+          <version>3.8.2</version>
         </plugin>
         <plugin>
           <artifactId>maven-compiler-plugin</artifactId>

diff --git a/tests/pom.xml b/tests/pom.xml
@@ -51,7 +51,7 @@
       <plugin>
         <groupId>com.jayway.maven.plugins.android.generation2</groupId>
         <artifactId>android-maven-plugin</artifactId>
-        <version>3.8.0</version>
+        <version>3.8.2</version>
         <configuration>
           <androidManifestFile>${project.basedir}/AndroidManifest.xml</androidManifestFile>
           <assetsDirectory>${project.basedir}/assets</assetsDirectory>