Skip to content

Commit bd98740

Browse files
committed
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.
2 parents cb31474 + 44f5bc6 commit bd98740

File tree

4 files changed

+12
-6
lines changed

4 files changed

+12
-6
lines changed

.travis.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,18 @@ before_install:
99
- sudo apt-get install -qq --force-yes libgd2-xpm ia32-libs ia32-libs-multiarch
1010

1111
# Install Android SDK
12-
- wget http://dl.google.com/android/android-sdk_r21.0.1-linux.tgz
13-
- tar -zxf android-sdk_r21.0.1-linux.tgz
12+
- wget http://dl.google.com/android/android-sdk_r22.6.2-linux.tgz
13+
- tar -zxf android-sdk_r22.6.2-linux.tgz
1414
- ls
1515
- export ANDROID_HOME=`pwd`/android-sdk-linux
1616
- export PATH=${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools
1717

18+
# Install build-tools
19+
- wget https://dl-ssl.google.com/android/repository/build-tools_r19.0.3-linux.zip
20+
- unzip build-tools_r19.0.3-linux.zip -d $ANDROID_HOME
21+
- mkdir -p $ANDROID_HOME/build-tools/
22+
- mv $ANDROID_HOME/android-4.4.2 $ANDROID_HOME/build-tools/19.0.1
23+
1824
# Install required Android components
1925
- android list sdk --extended
2026
# Do you accept the license 'android-sdk-license-bcbbd656' [y/n]:
@@ -31,4 +37,4 @@ before_script:
3137
- ./wait_for_emulator
3238

3339
script:
34-
- mvn clean install
40+
- mvn clean install -e

pom-child.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
<plugin>
7979
<groupId>com.jayway.maven.plugins.android.generation2</groupId>
8080
<artifactId>android-maven-plugin</artifactId>
81-
<version>3.8.0</version>
81+
<version>3.8.2</version>
8282
<configuration>
8383
<sdk>
8484
<path>${env.ANDROID_HOME}</path>

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<plugin>
2727
<groupId>com.jayway.maven.plugins.android.generation2</groupId>
2828
<artifactId>android-maven-plugin</artifactId>
29-
<version>3.6.0</version>
29+
<version>3.8.2</version>
3030
</plugin>
3131
<plugin>
3232
<artifactId>maven-compiler-plugin</artifactId>

tests/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
<plugin>
5252
<groupId>com.jayway.maven.plugins.android.generation2</groupId>
5353
<artifactId>android-maven-plugin</artifactId>
54-
<version>3.8.0</version>
54+
<version>3.8.2</version>
5555
<configuration>
5656
<androidManifestFile>${project.basedir}/AndroidManifest.xml</androidManifestFile>
5757
<assetsDirectory>${project.basedir}/assets</assetsDirectory>

0 commit comments

Comments
 (0)