Skip to content

Commit d0e2eb1

Browse files
committed
Fixes the circleci issue
The new gradle loading of missing android build tool dependencies is now implemented as a fallback
1 parent 33132de commit d0e2eb1

3 files changed

Lines changed: 10 additions & 6 deletions

File tree

circle.yml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,18 @@ machine:
22
java:
33
version: openjdk8
44
environment:
5+
ANDROID_HOME: /usr/local/android-sdk-linux
56
GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError"'
67

78
dependencies:
89
cache_directories:
9-
- /usr/local/android-sdk-linux/extras/android/m2repository
10-
- /usr/local/android-sdk-linux/extras/google/m2repository
11-
- /usr/local/android-sdk-linux/platforms/android-25
12-
- /usr/local/android-sdk-linux/build-tools/25.0.0
13-
- /usr/local/android-sdk-linux/platform-tools
10+
- $ANDROID_HOME/extras/android/m2repository
11+
- $ANDROID_HOME/extras/google/m2repository
12+
- $ANDROID_HOME/platforms/android-25
13+
- $ANDROID_HOME/build-tools/25.0.0
14+
- $ANDROID_HOME/platform-tools
1415
pre:
16+
- cp -r ./licenses $ANDROID_HOME
1517
- if [ $(grep -q "Revision=39.0.0" $ANDROID_HOME/extras/android/m2repository/source.properties) ] ; then echo y | android update sdk --no-ui --all --filter "extra-android-m2repository" ; fi
1618
- if [ $(grep -q "Revision=38" $ANDROID_HOME/extras/google/m2repository/source.properties) ] ; then echo y | android update sdk --no-ui --all --filter "extra-google-m2repository" ; fi
1719
- if [ ! -e $ANDROID_HOME/platforms/android-25 ] ; then echo y | android update sdk --no-ui --all --filter "android-25" ; fi
@@ -34,4 +36,4 @@ test:
3436
- mkdir $CIRCLE_ARTIFACTS/javadoc
3537
- cp -r library/build/outputs/lint-results-debug.* $CIRCLE_TEST_REPORTS/lint
3638
- cp -r library/build/outputs/androidTest-results/* $CIRCLE_TEST_REPORTS
37-
- cp -r library/build/docs/javadoc/* $CIRCLE_ARTIFACTS/javadoc
39+
- cp -r library/build/docs/javadoc/* $CIRCLE_ARTIFACTS/javadoc

licenses/android-sdk-license

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
8933bad161af4178b1185d1a37fbf41ea5269c55
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
504667f4c0de7af1a06de9f4b1727b84351f2910

0 commit comments

Comments
 (0)