diff options
| author | ronshapiro <ronshapiro@google.com> | 2016-11-16 11:17:28 -0800 |
|---|---|---|
| committer | Ron Shapiro <ronshapiro@google.com> | 2016-11-16 16:08:35 -0500 |
| commit | 5abbc828bfccea349ce1734791b504f939c5b952 (patch) | |
| tree | aacac371ad1370361e71edcffe2da689b14fd76c | |
| parent | 00a6fb136366cbe91a6869be062e9c8e83eba2b3 (diff) | |
| download | dagger2-5abbc828bfccea349ce1734791b504f939c5b952.tar.gz | |
Fix dagger-android build in Travis
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=139355153
| -rw-r--r-- | .travis.yml | 14 | ||||
| -rw-r--r-- | android/pom.xml | 2 | ||||
| -rw-r--r-- | examples/pom.xml | 2 | ||||
| -rw-r--r-- | pom.xml | 1 |
4 files changed, 13 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index 29f9ff33f..44bfc7c4e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,10 +5,12 @@ jdk: android: components: - - build-tools-23.0.0 - - android-23 - licenses: - - android-sdk-license-5be876d5 + - tools + - tools # Duplicated as per https://github.com/travis-ci/travis-ci/issues/6040#issuecomment-219367943 + - build-tools-25.0.0 + - android-25 + - platform-tools + - extra-android-m2repository before_install: - sudo rm -f /etc/mavenrc @@ -38,3 +40,7 @@ branches: only: - master - /^release.*$/ + +cache: + directories: + - $HOME/.m2 diff --git a/android/pom.xml b/android/pom.xml index 0402608c5..03ab262a9 100644 --- a/android/pom.xml +++ b/android/pom.xml @@ -69,7 +69,7 @@ <extensions>true</extensions> <configuration> <sdk> - <platform>24</platform> + <platform>${android.latest.version}</platform> <path>${env.ANDROID_HOME}</path> </sdk> </configuration> diff --git a/examples/pom.xml b/examples/pom.xml index 1985ff3db..95406ea8f 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -77,7 +77,7 @@ <version>4.3.0</version> <configuration> <sdk> - <platform>23</platform> + <platform>${android.latest.version}</platform> <path>${env.ANDROID_HOME}</path> </sdk> </configuration> @@ -44,6 +44,7 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <android.support.version>24.2.0</android.support.version> + <android.latest.version>25</android.latest.version> </properties> <scm> |