Skip to content

Commit 743aec6

Browse files
author
Krzysztof Borowy
committed
xcode version
1 parent e236145 commit 743aec6

File tree

1 file changed

+14
-6
lines changed

1 file changed

+14
-6
lines changed

.circleci/config.yml

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,14 @@ default config for macOS: &macos_defaults
2424
<<: *defaults
2525
resource_class: 'medium'
2626
macos:
27-
xcode: '11.0.0'
27+
xcode: '11.7.0'
28+
29+
30+
config for macOS (android): &macos_defaults_android
31+
<<: *defaults
32+
resource_class: 'medium'
33+
macos:
34+
xcode: '11.5.0'
2835

2936
default config for android apk builds: &android_defaults
3037
<<: *defaults
@@ -42,11 +49,11 @@ default config for android apk builds: &android_defaults
4249
# ==============================
4350

4451
cache keys:
45-
brew ios: &key_brew_ios cache-brew-ios-v1-{{ arch }}
46-
brew android: &key_brew_android cache-brew-android-v1-{{ arch }}
52+
brew ios: &key_brew_ios cache-brew-ios-v3-{{ arch }}
53+
brew android: &key_brew_android cache-brew-android-v3-{{ arch }}
4754
yarn: &key_yarn cache-yarn-{{ checksum "package.json" }}-{{ arch }}
4855
gradle: &key_gradle cache-gradle-{{ checksum "example/android/gradle/wrapper/gradle-wrapper.properties" }}-{{ checksum "example/android/app/build.gradle" }}-{{ arch }}
49-
pods: &key_pods cache-pods-{{ checksum "example/ios/Podfile.lock" }}
56+
pods: &key_pods cache-pods-v1-{{ checksum "example/ios/Podfile" }}-{{ checksum "package.json" }}-{{ arch }}
5057

5158
cache:
5259
# brew
@@ -72,7 +79,7 @@ cache:
7279
restore brew cache for android: &cache_restore_brew_android
7380
name: Restoring Brew cache for android
7481
keys:
75-
- *key_brew_android
82+
- *key_brew_android
7683

7784
# yarn
7885
save yarn cache: &cache_save_yarn
@@ -205,7 +212,7 @@ jobs:
205212
- example/android/app/build/outputs/apk/*
206213

207214
"Test: Android e2e":
208-
<<: *macos_defaults
215+
<<: *macos_defaults_android
209216
steps:
210217
- *addWorkspace
211218
- run:
@@ -221,6 +228,7 @@ jobs:
221228
- run:
222229
name: Install Android SDK tools
223230
command: |
231+
brew update --preinstall
224232
brew bundle --file=.circleci/Brewfile.android --no-lock
225233
- save-cache: *cache_save_brew_android
226234
- run:

0 commit comments

Comments
 (0)