Subhas | Fix Travis Errors

arjunk · Jan 21, 2013 · 531aa01 · 531aa01
1 parent d153f90
commit 531aa01
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 38 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,8 +1,9 @@
 language: java
+jdk: oraclejdk7
 
 env:
   global:
-    - ANDROID_HOME=~/android-sdk-linux
+    - ANDROID_HOME=$HOME/android-sdk-linux
     - secure: "eATae5kWD2tL3xtUdQjk4T5RWn4zv5OS4QXjwL9q/E4ntzge3rVPRGVSyS5/\nL/d48QLlliDzC6d7ycFVyEZC0OLzpHNER56vhP4YY9yfLygHr+NQJizPEiMJ\nPj5vUu9+qfOb3icQuQYDamuOCT7CxnVXSxVApfpFSSGz1YFpwfs="
 
 branches:
@@ -12,13 +13,19 @@ branches:
 
 before_install:
   - export PATH=$PATH:$ANDROID_HOME/tools:$ANDROID_HOME/platform-tools
-  - wget http://dl.google.com/android/android-sdk_r21-linux.tgz
-  - tar xfz android-sdk_r21-linux.tgz -C ~
-  - android update sdk --filter platform-tools,android-8,extra-android-support --no-ui --force
-  - echo no | android create avd -n android2.2 -t android-8 --skin QVGA
+  - export DISPLAY=:99.0
+  - sh -e /etc/init.d/xvfb start
+
+# Android SDK tools needs ia32-libs in order to run on 64 bit systems, but it was not installing on Travis
+# To debug apt-get problems, use: "apt-get -o Debug::pkgProblemResolver=yes install ..." and check for broken packages
+  - if [ `uname -m` = x86_64 ]; then sudo apt-get install -qq --force-yes libgd2-xpm ia32-libs ia32-libs-multiarch; fi
+  - wget -nv http://dl.google.com/android/android-sdk_r21.0.1-linux.tgz
+  - tar xfz android-sdk_r21.0.1-linux.tgz -C ~
+  - android --silent update sdk --filter platform-tools,android-8,extra-android-support --no-ui --force
+  - echo no | android --silent create avd -n android2.2 -t android-8 --skin QVGA --sdcard 50M
 
 install: echo
-script: mvn clean install -P with-emulator
+script: mvn -P with-emulator clean install
 
 notifications:
   email: false

diff --git a/RapidFTR-Android/pom.xml b/RapidFTR-Android/pom.xml
@@ -194,6 +194,7 @@
                 </plugins>
             </build>
         </profile>
+
         <profile>
             <id>move_artifacts</id>
             <activation>

diff --git a/RapidFTR-Android/src/main/java/com/rapidftr/activity/RapidFtrActivity.java b/RapidFTR-Android/src/main/java/com/rapidftr/activity/RapidFtrActivity.java
@@ -8,6 +8,7 @@
 import android.os.Bundle;
 import android.os.Looper;
 import android.os.Process;
+import android.support.v4.app.FragmentActivity;
 import android.util.Log;
 import android.view.Gravity;
 import android.view.Menu;
@@ -25,11 +26,9 @@
 import lombok.Getter;
 import lombok.Setter;
 
-public abstract class RapidFtrActivity extends Activity {
-    private
-    @Getter
-    @Setter
-    Menu menu;
+public abstract class RapidFtrActivity extends FragmentActivity {
+
+    private @Getter @Setter Menu menu;
 
     public interface ResultListener {
         void onActivityResult(int requestCode, int resultCode, Intent data);

diff --git a/RapidFTR-AndroidTests/pom.xml b/RapidFTR-AndroidTests/pom.xml
@@ -84,44 +84,32 @@
     <profiles>
         <profile>
             <id>with-emulator</id>
-            <!-- Start emulator in no-window mode, Stop emulator only if running in CI, in Dev box let the emulator keep running -->
             <build>
                 <plugins>
                     <plugin>
                         <groupId>com.jayway.maven.plugins.android.generation2</groupId>
                         <artifactId>android-maven-plugin</artifactId>
                         <executions>
                             <execution>
-                                <id>stopEmulator</id>
-                                <phase>post-integration-test</phase>
+                                <id>startEmulator</id>
+                                <phase>prepare-package</phase>
                                 <goals>
-                                    <goal>emulator-stop</goal>
+                                    <goal>emulator-start</goal>
                                 </goals>
                             </execution>
-                        </executions>
-                        <configuration>
-                            <emulator>
-                                <options>-no-window -no-skin</options>
-                                <executable>emulator-arm</executable>
-                            </emulator>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>com.jayway.maven.plugins.android.generation2</groupId>
-                        <artifactId>android-maven-plugin</artifactId>
-                        <executions>
                             <execution>
-                                <id>startEmulator</id>
-                                <phase>prepare-package</phase>
+                                <id>stopEmulator</id>
+                                <phase>post-integration-test</phase>
                                 <goals>
-                                    <goal>emulator-start</goal>
+                                    <goal>emulator-stop</goal>
                                 </goals>
                             </execution>
                         </executions>
                         <configuration>
                             <emulator>
                                 <avd>android2.2</avd>
-                                <wait>60000</wait>
+                                <wait>90000</wait>
+                                <options>-no-window -no-skin</options>
                             </emulator>
                         </configuration>
                     </plugin>

diff --git a/pom.xml b/pom.xml
@@ -197,6 +197,7 @@
                 <artifactId>maven-dependency-plugin</artifactId>
                 <executions>
                     <execution>
+                        <phase>validate</phase>
                         <goals>
                             <goal>properties</goal>
                         </goals>
@@ -275,11 +276,4 @@
             </plugins>
         </pluginManagement>
     </build>
-
-    <profiles>
-        <profile>
-            <id>ci</id>
-        </profile>
-    </profiles>
-
 </project>