From a77d17c0141f3c87b87aae65b31f53e842a4e152 Mon Sep 17 00:00:00 2001 From: Konstantin Raev Date: Thu, 29 Dec 2016 05:38:28 -0800 Subject: [PATCH] Updated extra-android-m2repository to get android support v4 23.4.0 Summary: Circle CI has an older m2repository version by default Closes https://github.com/facebook/react-native/pull/11671 Differential Revision: D4372795 Pulled By: kentaromiura fbshipit-source-id: ac563fe3825a57087fbf806c913383e1ade8535f --- circle.yml | 2 +- scripts/circle-ci-android-setup.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index 264a9d66b11..7a8d44202df 100644 --- a/circle.yml +++ b/circle.yml @@ -19,12 +19,12 @@ dependencies: - if [[ ! -e /home/ubuntu/buck ]]; then git clone https://github.com/facebook/buck.git /home/ubuntu/buck; fi - cd /home/ubuntu/buck && ant - buck --version + - source scripts/circle-ci-android-setup.sh && getAndroidSDK - buck fetch ReactAndroid/src/test/java/com/facebook/react/modules - buck fetch ReactAndroid/src/main/java/com/facebook/react - buck fetch ReactAndroid/src/main/java/com/facebook/react/shell - buck fetch ReactAndroid/src/test/... - buck fetch ReactAndroid/src/androidTest/... - - source scripts/circle-ci-android-setup.sh && getAndroidSDK - ./gradlew :ReactAndroid:downloadBoost :ReactAndroid:downloadDoubleConversion :ReactAndroid:downloadFolly :ReactAndroid:downloadGlog # CIRCLE_NPM_TOKEN is in React Native project settings in Circle CI. # It was generated for bestander user, easy to replace with anyone's else diff --git a/scripts/circle-ci-android-setup.sh b/scripts/circle-ci-android-setup.sh index 9f6174a84f7..6963a72d042 100644 --- a/scripts/circle-ci-android-setup.sh +++ b/scripts/circle-ci-android-setup.sh @@ -6,6 +6,7 @@ function getAndroidSDK { DEPS="$ANDROID_HOME/installed-dependencies" if [ ! -e $DEPS ]; then + echo y | android update sdk --no-ui --all --filter extra-android-m2repository echo no | android create avd -n testAVD -f -t android-19 --abi default/armeabi-v7a && touch $DEPS fi