Skip to content

Commit cba02dd

Browse files
committed
Sync cocoapods version
1 parent 1c67d7c commit cba02dd

File tree

6 files changed

+103
-14
lines changed

6 files changed

+103
-14
lines changed

.circleci/config.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,14 @@ jobs:
156156
name: Installing Yarn dependencies
157157
command: yarn --pure-lockfile --non-interactive --cache-folder ~/.cache/yarn
158158
- save-cache: *cache_save_yarn
159+
- restore_cache:
160+
key: 1-gems-{{ checksum "Gemfile.lock" }}
161+
- run: cd example/ios && bundle check || bundle install --path vendor/bundle
162+
- save_cache:
163+
key: 1-gems-{{ checksum "Gemfile.lock" }}
164+
paths:
165+
- vendor/bundle
166+
- run: cd example/ios && bundle exec pod install
159167
- run:
160168
name: Build iOS app
161169
command: yarn build:e2e:ios
@@ -184,10 +192,6 @@ jobs:
184192
- save-cache: *cache_save_gradle_build
185193

186194
# Build and test
187-
- run:
188-
name: Bundle
189-
command: mkdir example/android/app/src/main/assets && react-native bundle --platform android --dev false --entry-file example/index.js --bundle-output example/android/app/src/main/assets/index.android.bundle --assets-dest example/android/app/src/main/res/
190-
191195
- run:
192196
name: Build Android apk
193197
command: cd example/android && ./gradlew assembleRelease assembleAndroidTest -DtestBuildType=release --max-workers 2 -x bundleReleaseJsAndAssets

.circleci/scripts/run_ios_e2e.sh

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,6 @@ ENTRY_FILE="example/index.js"
55
BUNDLE_FILE="$RESOURCE_DIR/main.jsbundle"
66
EXTRA_PACKAGER_ARGS="--entry-file=$ENTRY_FILE"
77

8-
download_pods() {
9-
echo "[Detox e2e] Downloading iOS Pods"
10-
eval "cd example/ios"
11-
eval "pod install"
12-
eval "cd ../../"
13-
}
14-
158
build_project() {
169
echo "[Detox e2e] Building iOS project"
1710
eval "xcodebuild \
@@ -75,8 +68,6 @@ run_simulator() {
7568
fi
7669
}
7770

78-
download_pods
79-
8071
build_project
8172

8273
sleep 2

example/ios/Gemfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
source 'https://rubygems.org'
2+
3+
gem 'cocoapods', '= 1.9.1'

example/ios/Gemfile.lock

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
GEM
2+
remote: https://rubygems.org/
3+
specs:
4+
CFPropertyList (3.0.2)
5+
activesupport (4.2.11.1)
6+
i18n (~> 0.7)
7+
minitest (~> 5.1)
8+
thread_safe (~> 0.3, >= 0.3.4)
9+
tzinfo (~> 1.1)
10+
algoliasearch (1.27.1)
11+
httpclient (~> 2.8, >= 2.8.3)
12+
json (>= 1.5.1)
13+
atomos (0.1.3)
14+
claide (1.0.3)
15+
cocoapods (1.9.1)
16+
activesupport (>= 4.0.2, < 5)
17+
claide (>= 1.0.2, < 2.0)
18+
cocoapods-core (= 1.9.1)
19+
cocoapods-deintegrate (>= 1.0.3, < 2.0)
20+
cocoapods-downloader (>= 1.2.2, < 2.0)
21+
cocoapods-plugins (>= 1.0.0, < 2.0)
22+
cocoapods-search (>= 1.0.0, < 2.0)
23+
cocoapods-stats (>= 1.0.0, < 2.0)
24+
cocoapods-trunk (>= 1.4.0, < 2.0)
25+
cocoapods-try (>= 1.1.0, < 2.0)
26+
colored2 (~> 3.1)
27+
escape (~> 0.0.4)
28+
fourflusher (>= 2.3.0, < 3.0)
29+
gh_inspector (~> 1.0)
30+
molinillo (~> 0.6.6)
31+
nap (~> 1.0)
32+
ruby-macho (~> 1.4)
33+
xcodeproj (>= 1.14.0, < 2.0)
34+
cocoapods-core (1.9.1)
35+
activesupport (>= 4.0.2, < 6)
36+
algoliasearch (~> 1.0)
37+
concurrent-ruby (~> 1.1)
38+
fuzzy_match (~> 2.0.4)
39+
nap (~> 1.0)
40+
netrc (~> 0.11)
41+
typhoeus (~> 1.0)
42+
cocoapods-deintegrate (1.0.4)
43+
cocoapods-downloader (1.3.0)
44+
cocoapods-plugins (1.0.0)
45+
nap
46+
cocoapods-search (1.0.0)
47+
cocoapods-stats (1.1.0)
48+
cocoapods-trunk (1.4.1)
49+
nap (>= 0.8, < 2.0)
50+
netrc (~> 0.11)
51+
cocoapods-try (1.1.0)
52+
colored2 (3.1.2)
53+
concurrent-ruby (1.1.6)
54+
escape (0.0.4)
55+
ethon (0.12.0)
56+
ffi (>= 1.3.0)
57+
ffi (1.12.2)
58+
fourflusher (2.3.1)
59+
fuzzy_match (2.0.4)
60+
gh_inspector (1.1.3)
61+
httpclient (2.8.3)
62+
i18n (0.9.5)
63+
concurrent-ruby (~> 1.0)
64+
json (2.3.0)
65+
minitest (5.14.0)
66+
molinillo (0.6.6)
67+
nanaimo (0.2.6)
68+
nap (1.1.0)
69+
netrc (0.11.0)
70+
ruby-macho (1.4.0)
71+
thread_safe (0.3.6)
72+
typhoeus (1.3.1)
73+
ethon (>= 0.9.0)
74+
tzinfo (1.2.7)
75+
thread_safe (~> 0.1)
76+
xcodeproj (1.16.0)
77+
CFPropertyList (>= 2.3.3, < 4.0)
78+
atomos (~> 0.1.3)
79+
claide (>= 1.0.2, < 2.0)
80+
colored2 (~> 3.1)
81+
nanaimo (~> 0.2.6)
82+
83+
PLATFORMS
84+
ruby
85+
86+
DEPENDENCIES
87+
cocoapods (= 1.9.1)
88+
89+
BUNDLED WITH
90+
1.17.2

example/ios/Podfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
source 'https://cdn.cocoapods.org/'
12
platform :ios, '9.0'
23
require_relative '../../node_modules/@react-native-community/cli-platform-ios/native_modules'
34

example/ios/Podfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -341,4 +341,4 @@ SPEC CHECKSUMS:
341341

342342
PODFILE CHECKSUM: 671d541e556bf52feb3b24e4ed556be0dc2bc2fb
343343

344-
COCOAPODS: 1.8.4
344+
COCOAPODS: 1.9.1

0 commit comments

Comments
 (0)