Skip to content

Commit c83e2b4

Browse files
bang9bang9
authored
Merge pull request #145 from sendbird/ci/migarte-macos
ci(CLNP-1434): update macos intel to m1
2 parents 96ec469 + 62a3992 commit c83e2b4

File tree

6 files changed

+62
-53
lines changed

6 files changed

+62
-53
lines changed

‎.circleci/config.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ aliases:
3030
# Cache key template - https://circleci.com/docs/caching/#using-keys-and-templates
3131
version: 2.1
3232
orbs:
33-
ruby: circleci/ruby@1.6.0
34-
macos: circleci/macos@2
33+
ruby: circleci/ruby@2.1.0
34+
macos: circleci/macos@2.4.0
3535

3636
parameters:
3737
platform:
@@ -45,14 +45,14 @@ parameters:
4545
jobs:
4646
deploy-ios:
4747
macos:
48-
xcode: 14.1.0
49-
resource_class: macos.x86.medium.gen2
48+
xcode: 14.3.1
49+
resource_class: macos.m1.medium.gen1
5050
environment:
5151
APP_VERSION: << pipeline.parameters.version >>
5252
steps:
5353
- checkout
5454
- macos/switch-ruby:
55-
version: '2.7.6'
55+
version: '2.7'
5656
- ruby/install-deps:
5757
key: v{{ .Environment.CACHE_VERSION }}-gems-ios
5858
app-dir: ./sample/ios
@@ -73,7 +73,7 @@ jobs:
7373
- sample/ios/Pods
7474
- run: *create_app_env
7575
- run:
76-
name: Expose environments
76+
name: Export environments
7777
command: |
7878
echo "export MATCH_PASSWORD=$FASTLANE_IOS_MATCH_PASSWORD" >> $BASH_ENV
7979
echo "export MATCH_GIT_URL=$FASTLANE_IOS_MATCH_GIT_URL" >> $BASH_ENV

‎sample/.ruby-version‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎sample/ios/Gemfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
source "https://rubygems.org"
22

33
gem "fastlane"
4-
gem "cocoapods", "= 1.12.0"
4+
gem "cocoapods", "= 1.14.2"
55

66
plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile')
77
eval_gemfile(plugins_path) if File.exist?(plugins_path)

‎sample/ios/Gemfile.lock‎

Lines changed: 51 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -3,42 +3,49 @@ GEM
33
specs:
44
CFPropertyList (3.0.6)
55
rexml
6-
activesupport (7.0.4.3)
6+
activesupport (7.1.1)
7+
base64
8+
bigdecimal
79
concurrent-ruby (~> 1.0, >= 1.0.2)
10+
connection_pool (>= 2.2.5)
11+
drb
812
i18n (>= 1.6, < 2)
913
minitest (>= 5.1)
14+
mutex_m
1015
tzinfo (~> 2.0)
11-
addressable (2.8.4)
16+
addressable (2.8.5)
1217
public_suffix (>= 2.0.2, < 6.0)
1318
algoliasearch (1.27.5)
1419
httpclient (~> 2.8, >= 2.8.3)
1520
json (>= 1.5.1)
1621
artifactory (3.0.15)
1722
atomos (0.1.3)
1823
aws-eventstream (1.2.0)
19-
aws-partitions (1.779.0)
20-
aws-sdk-core (3.174.0)
24+
aws-partitions (1.848.0)
25+
aws-sdk-core (3.186.0)
2126
aws-eventstream (~> 1, >= 1.0.2)
2227
aws-partitions (~> 1, >= 1.651.0)
2328
aws-sigv4 (~> 1.5)
2429
jmespath (~> 1, >= 1.6.1)
25-
aws-sdk-kms (1.66.0)
26-
aws-sdk-core (~> 3, >= 3.174.0)
30+
aws-sdk-kms (1.72.0)
31+
aws-sdk-core (~> 3, >= 3.184.0)
2732
aws-sigv4 (~> 1.1)
28-
aws-sdk-s3 (1.124.0)
29-
aws-sdk-core (~> 3, >= 3.174.0)
33+
aws-sdk-s3 (1.136.0)
34+
aws-sdk-core (~> 3, >= 3.181.0)
3035
aws-sdk-kms (~> 1)
31-
aws-sigv4 (~> 1.4)
32-
aws-sigv4 (1.5.2)
36+
aws-sigv4 (~> 1.6)
37+
aws-sigv4 (1.6.1)
3338
aws-eventstream (~> 1, >= 1.0.2)
3439
babosa (1.0.4)
40+
base64 (0.2.0)
41+
bigdecimal (3.1.4)
3542
claide (1.1.0)
36-
cocoapods (1.12.0)
43+
cocoapods (1.14.2)
3744
addressable (~> 2.8)
3845
claide (>= 1.0.2, < 2.0)
39-
cocoapods-core (= 1.12.0)
46+
cocoapods-core (= 1.14.2)
4047
cocoapods-deintegrate (>= 1.0.3, < 2.0)
41-
cocoapods-downloader (>= 1.6.0, < 2.0)
48+
cocoapods-downloader (>= 2.0)
4249
cocoapods-plugins (>= 1.0.0, < 2.0)
4350
cocoapods-search (>= 1.0.0, < 2.0)
4451
cocoapods-trunk (>= 1.6.0, < 2.0)
@@ -50,8 +57,8 @@ GEM
5057
molinillo (~> 0.8.0)
5158
nap (~> 1.0)
5259
ruby-macho (>= 2.3.0, < 3.0)
53-
xcodeproj (>= 1.21.0, < 2.0)
54-
cocoapods-core (1.12.0)
60+
xcodeproj (>= 1.23.0, < 2.0)
61+
cocoapods-core (1.14.2)
5562
activesupport (>= 5.0, < 8)
5663
addressable (~> 2.8)
5764
algoliasearch (~> 1.0)
@@ -62,7 +69,7 @@ GEM
6269
public_suffix (~> 4.0)
6370
typhoeus (~> 1.0)
6471
cocoapods-deintegrate (1.0.5)
65-
cocoapods-downloader (1.6.3)
72+
cocoapods-downloader (2.0)
6673
cocoapods-plugins (1.0.0)
6774
nap
6875
cocoapods-search (1.0.1)
@@ -75,17 +82,20 @@ GEM
7582
commander (4.6.0)
7683
highline (~> 2.0.0)
7784
concurrent-ruby (1.2.2)
85+
connection_pool (2.4.1)
7886
declarative (0.0.20)
79-
digest-crc (0.6.4)
87+
digest-crc (0.6.5)
8088
rake (>= 12.0.0, < 14.0.0)
8189
domain_name (0.5.20190701)
8290
unf (>= 0.0.5, < 1.0.0)
8391
dotenv (2.8.1)
92+
drb (2.2.0)
93+
ruby2_keywords
8494
emoji_regex (3.2.3)
8595
escape (0.0.4)
8696
ethon (0.16.0)
8797
ffi (>= 1.15.0)
88-
excon (0.100.0)
98+
excon (0.104.0)
8999
faraday (1.10.3)
90100
faraday-em_http (~> 1.0)
91101
faraday-em_synchrony (~> 1.0)
@@ -115,7 +125,7 @@ GEM
115125
faraday_middleware (1.2.0)
116126
faraday (~> 1.0)
117127
fastimage (2.2.7)
118-
fastlane (2.213.0)
128+
fastlane (2.216.0)
119129
CFPropertyList (>= 2.3, < 4.0.0)
120130
addressable (>= 2.8, < 3.0.0)
121131
artifactory (~> 3.0)
@@ -136,6 +146,7 @@ GEM
136146
google-apis-playcustomapp_v1 (~> 0.1)
137147
google-cloud-storage (~> 1.31)
138148
highline (~> 2.0)
149+
http-cookie (~> 1.0.5)
139150
json (< 3.0.0)
140151
jwt (>= 2.1.0, < 3)
141152
mini_magick (>= 4.9.4, < 5.0.0)
@@ -147,7 +158,7 @@ GEM
147158
security (= 0.1.3)
148159
simctl (~> 1.6.3)
149160
terminal-notifier (>= 2.0.0, < 3.0.0)
150-
terminal-table (>= 1.4.5, < 2.0.0)
161+
terminal-table (~> 3)
151162
tty-screen (>= 0.6.3, < 1.0.0)
152163
tty-spinner (>= 0.8.0, < 1.0.0)
153164
word_wrap (~> 1.0.0)
@@ -156,13 +167,13 @@ GEM
156167
xcpretty-travis-formatter (>= 0.0.3)
157168
fastlane-plugin-json (1.1.0)
158169
fastlane-plugin-versioning_ios (0.1.0)
159-
ffi (1.15.5)
170+
ffi (1.16.3)
160171
fourflusher (2.3.1)
161172
fuzzy_match (2.0.4)
162173
gh_inspector (1.1.3)
163-
google-apis-androidpublisher_v3 (0.43.0)
174+
google-apis-androidpublisher_v3 (0.51.0)
164175
google-apis-core (>= 0.11.0, < 2.a)
165-
google-apis-core (0.11.0)
176+
google-apis-core (0.11.2)
166177
addressable (~> 2.5, >= 2.5.1)
167178
googleauth (>= 0.16.2, < 2.a)
168179
httpclient (>= 2.8.1, < 3.a)
@@ -175,45 +186,44 @@ GEM
175186
google-apis-core (>= 0.11.0, < 2.a)
176187
google-apis-playcustomapp_v1 (0.13.0)
177188
google-apis-core (>= 0.11.0, < 2.a)
178-
google-apis-storage_v1 (0.19.0)
179-
google-apis-core (>= 0.9.0, < 2.a)
189+
google-apis-storage_v1 (0.29.0)
190+
google-apis-core (>= 0.11.0, < 2.a)
180191
google-cloud-core (1.6.0)
181192
google-cloud-env (~> 1.0)
182193
google-cloud-errors (~> 1.0)
183194
google-cloud-env (1.6.0)
184195
faraday (>= 0.17.3, < 3.0)
185196
google-cloud-errors (1.3.1)
186-
google-cloud-storage (1.44.0)
197+
google-cloud-storage (1.45.0)
187198
addressable (~> 2.8)
188199
digest-crc (~> 0.4)
189200
google-apis-iamcredentials_v1 (~> 0.1)
190-
google-apis-storage_v1 (~> 0.19.0)
201+
google-apis-storage_v1 (~> 0.29.0)
191202
google-cloud-core (~> 1.6)
192203
googleauth (>= 0.16.2, < 2.a)
193204
mini_mime (~> 1.0)
194-
googleauth (1.5.2)
205+
googleauth (1.8.1)
195206
faraday (>= 0.17.3, < 3.a)
196207
jwt (>= 1.4, < 3.0)
197-
memoist (~> 0.16)
198208
multi_json (~> 1.11)
199209
os (>= 0.9, < 2.0)
200210
signet (>= 0.16, < 2.a)
201211
highline (2.0.3)
202212
http-cookie (1.0.5)
203213
domain_name (~> 0.5)
204214
httpclient (2.8.3)
205-
i18n (1.12.0)
215+
i18n (1.14.1)
206216
concurrent-ruby (~> 1.0)
207217
jmespath (1.6.2)
208218
json (2.6.3)
209219
jwt (2.7.1)
210-
memoist (0.16.2)
211220
mini_magick (4.12.0)
212-
mini_mime (1.1.2)
213-
minitest (5.18.0)
221+
mini_mime (1.1.5)
222+
minitest (5.20.0)
214223
molinillo (0.8.0)
215224
multi_json (1.15.0)
216225
multipart-post (2.3.0)
226+
mutex_m (0.2.0)
217227
nanaimo (0.3.0)
218228
nap (1.1.0)
219229
naturally (2.2.1)
@@ -222,19 +232,19 @@ GEM
222232
os (1.1.4)
223233
plist (3.7.0)
224234
public_suffix (4.0.7)
225-
rake (13.0.6)
235+
rake (13.1.0)
226236
representable (3.2.0)
227237
declarative (< 0.1.0)
228238
trailblazer-option (>= 0.1.1, < 0.2.0)
229239
uber (< 0.2.0)
230240
retriable (3.1.2)
231-
rexml (3.2.5)
241+
rexml (3.2.6)
232242
rouge (2.0.7)
233243
ruby-macho (2.5.1)
234244
ruby2_keywords (0.0.5)
235245
rubyzip (2.3.2)
236246
security (0.1.3)
237-
signet (0.17.0)
247+
signet (0.18.0)
238248
addressable (~> 2.8)
239249
faraday (>= 0.17.5, < 3.a)
240250
jwt (>= 1.5, < 3.0)
@@ -243,8 +253,8 @@ GEM
243253
CFPropertyList
244254
naturally
245255
terminal-notifier (2.0.0)
246-
terminal-table (1.8.0)
247-
unicode-display_width (~> 1.1, >= 1.1.1)
256+
terminal-table (3.0.2)
257+
unicode-display_width (>= 1.1.1, < 3)
248258
trailblazer-option (0.1.2)
249259
tty-cursor (0.7.1)
250260
tty-screen (0.8.1)
@@ -258,10 +268,10 @@ GEM
258268
unf (0.1.4)
259269
unf_ext
260270
unf_ext (0.0.8.2)
261-
unicode-display_width (1.8.0)
271+
unicode-display_width (2.5.0)
262272
webrick (1.8.1)
263273
word_wrap (1.0.0)
264-
xcodeproj (1.22.0)
274+
xcodeproj (1.23.0)
265275
CFPropertyList (>= 2.3.3, < 4.0)
266276
atomos (~> 0.1.3)
267277
claide (>= 1.0.2, < 2.0)
@@ -280,7 +290,7 @@ PLATFORMS
280290
x86_64-darwin-22
281291

282292
DEPENDENCIES
283-
cocoapods (= 1.12.0)
293+
cocoapods (= 1.14.2)
284294
fastlane
285295
fastlane-plugin-json
286296
fastlane-plugin-versioning_ios

‎sample/ios/Podfile.lock‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -435,7 +435,7 @@ PODS:
435435
- React-jsi (= 0.67.5)
436436
- React-logger (= 0.67.5)
437437
- React-perflogger (= 0.67.5)
438-
- RNAudioRecorderPlayer (3.5.4):
438+
- RNAudioRecorderPlayer (3.6.0):
439439
- React-Core
440440
- RNCAsyncStorage (1.18.1):
441441
- React-Core
@@ -775,7 +775,7 @@ SPEC CHECKSUMS:
775775
React-RCTVibration: c3b8a3245267a3849b0c7cb91a37606bf5f3aa65
776776
React-runtimeexecutor: 434efc9e5b6d0f14f49867f130b39376c971c1aa
777777
ReactCommon: a30c2448e5a88bae6fcb0e3da124c14ae493dac1
778-
RNAudioRecorderPlayer: 1ff1ddabbe89031df12ba9d5ac2fa724697c5c48
778+
RNAudioRecorderPlayer: 4690a7cd9e4fd8e58d9671936a7bc3b686e59051
779779
RNCAsyncStorage: b90b71f45b8b97be43bc4284e71a6af48ac9f547
780780
RNCClipboard: 3f0451a8100393908bea5c5c5b16f96d45f30bfc
781781
RNCPushNotificationIOS: 64218f3c776c03d7408284a819b2abfda1834bc8
@@ -795,4 +795,4 @@ SPEC CHECKSUMS:
795795

796796
PODFILE CHECKSUM: 7326d70ef2ded7c9137457434d401f2de40cb420
797797

798-
COCOAPODS: 1.12.0
798+
COCOAPODS: 1.14.2

‎sample/ios/SendbirdUIKitSample.xcodeproj/project.pbxproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@
345345
);
346346
runOnlyForDeploymentPostprocessing = 0;
347347
shellPath = /bin/sh;
348-
shellScript = "set -e\nexport ENTRY_FILE=$(pwd)/../index.js\nexport NODE_BINARY=node\n../../node_modules/react-native/scripts/react-native-xcode.sh\n";
348+
shellScript = "set -e\nexport NODE_OPTIONS=--openssl-legacy-provider\nexport ENTRY_FILE=$(pwd)/../index.js\nexport NODE_BINARY=node\n../../node_modules/react-native/scripts/react-native-xcode.sh\n";
349349
};
350350
0BA84524D24E532E3D2F7E25 /* [CP-User] [RNFB] Core Configuration */ = {
351351
isa = PBXShellScriptBuildPhase;

0 commit comments

Comments
 (0)