Skip to content

Commit eda5b28

Browse files
[CI] Resolve XCFramework compilation issue (#703)
1 parent 38aaf3f commit eda5b28

File tree

2 files changed

+61
-46
lines changed

2 files changed

+61
-46
lines changed

Gemfile.lock

Lines changed: 50 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ GEM
55
base64
66
nkf
77
rexml
8-
activesupport (7.2.2)
8+
activesupport (7.2.2.1)
99
base64
1010
benchmark (>= 0.3)
1111
bigdecimal
@@ -25,21 +25,22 @@ GEM
2525
artifactory (3.0.17)
2626
ast (2.4.2)
2727
atomos (0.1.3)
28-
aws-eventstream (1.3.0)
29-
aws-partitions (1.1018.0)
30-
aws-sdk-core (3.214.0)
28+
aws-eventstream (1.3.2)
29+
aws-partitions (1.1062.0)
30+
aws-sdk-core (3.220.1)
3131
aws-eventstream (~> 1, >= 1.3.0)
3232
aws-partitions (~> 1, >= 1.992.0)
3333
aws-sigv4 (~> 1.9)
34+
base64
3435
jmespath (~> 1, >= 1.6.1)
35-
aws-sdk-kms (1.96.0)
36-
aws-sdk-core (~> 3, >= 3.210.0)
36+
aws-sdk-kms (1.99.0)
37+
aws-sdk-core (~> 3, >= 3.216.0)
3738
aws-sigv4 (~> 1.5)
38-
aws-sdk-s3 (1.176.0)
39-
aws-sdk-core (~> 3, >= 3.210.0)
39+
aws-sdk-s3 (1.182.0)
40+
aws-sdk-core (~> 3, >= 3.216.0)
4041
aws-sdk-kms (~> 1)
4142
aws-sigv4 (~> 1.5)
42-
aws-sigv4 (1.10.1)
43+
aws-sigv4 (1.11.0)
4344
aws-eventstream (~> 1, >= 1.0.2)
4445
babosa (1.0.4)
4546
badge (0.13.0)
@@ -48,7 +49,7 @@ GEM
4849
mini_magick (>= 4.9.4, < 5.0.0)
4950
base64 (0.2.0)
5051
benchmark (0.4.0)
51-
bigdecimal (3.1.8)
52+
bigdecimal (3.1.9)
5253
claide (1.1.0)
5354
claide-plugins (0.9.2)
5455
cork
@@ -97,8 +98,8 @@ GEM
9798
colored2 (3.1.2)
9899
commander (4.6.0)
99100
highline (~> 2.0.0)
100-
concurrent-ruby (1.3.4)
101-
connection_pool (2.4.1)
101+
concurrent-ruby (1.3.5)
102+
connection_pool (2.5.0)
102103
cork (0.3.0)
103104
colored2 (~> 3.1)
104105
danger (9.5.1)
@@ -120,7 +121,7 @@ GEM
120121
danger-plugin-api (1.0.0)
121122
danger (> 2.0)
122123
declarative (0.0.20)
123-
digest-crc (0.6.5)
124+
digest-crc (0.7.0)
124125
rake (>= 12.0.0, < 14.0.0)
125126
domain_name (0.6.20240107)
126127
dotenv (2.8.1)
@@ -151,17 +152,17 @@ GEM
151152
faraday-http-cache (2.5.1)
152153
faraday (>= 0.8)
153154
faraday-httpclient (1.0.1)
154-
faraday-multipart (1.0.4)
155-
multipart-post (~> 2)
155+
faraday-multipart (1.1.0)
156+
multipart-post (~> 2.0)
156157
faraday-net_http (1.0.2)
157158
faraday-net_http_persistent (1.2.0)
158159
faraday-patron (1.0.0)
159160
faraday-rack (1.0.0)
160161
faraday-retry (1.0.3)
161162
faraday_middleware (1.2.1)
162163
faraday (~> 1.0)
163-
fastimage (2.3.1)
164-
fastlane (2.225.0)
164+
fastimage (2.4.0)
165+
fastlane (2.226.0)
165166
CFPropertyList (>= 2.3, < 4.0.0)
166167
addressable (>= 2.8, < 3.0.0)
167168
artifactory (~> 3.0)
@@ -201,7 +202,7 @@ GEM
201202
tty-spinner (>= 0.8.0, < 1.0.0)
202203
word_wrap (~> 1.0.0)
203204
xcodeproj (>= 1.13.0, < 2.0.0)
204-
xcpretty (~> 0.3.0)
205+
xcpretty (~> 0.4.0)
205206
xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
206207
fastlane-plugin-create_xcframework (1.1.2)
207208
fastlane-plugin-lizard (1.3.3)
@@ -210,10 +211,10 @@ GEM
210211
pry
211212
fastlane-plugin-stream_actions (0.3.77)
212213
xctest_list (= 1.2.1)
213-
fastlane-plugin-versioning (0.7.0)
214+
fastlane-plugin-versioning (0.7.1)
214215
fastlane-sirp (1.0.0)
215216
sysrandom (~> 1.0)
216-
ffi (1.17.0)
217+
ffi (1.17.1)
217218
fourflusher (2.3.1)
218219
fuzzy_match (2.0.4)
219220
gh_inspector (1.1.3)
@@ -241,7 +242,7 @@ GEM
241242
google-cloud-errors (~> 1.0)
242243
google-cloud-env (1.6.0)
243244
faraday (>= 0.17.3, < 3.0)
244-
google-cloud-errors (1.4.0)
245+
google-cloud-errors (1.5.0)
245246
google-cloud-storage (1.47.0)
246247
addressable (~> 2.8)
247248
digest-crc (~> 0.4)
@@ -257,10 +258,11 @@ GEM
257258
os (>= 0.9, < 2.0)
258259
signet (>= 0.16, < 2.a)
259260
highline (2.0.3)
260-
http-cookie (1.0.7)
261+
http-cookie (1.0.8)
261262
domain_name (~> 0.5)
262-
httpclient (2.8.3)
263-
i18n (1.14.6)
263+
httpclient (2.9.0)
264+
mutex_m
265+
i18n (1.14.7)
264266
concurrent-ruby (~> 1.0)
265267
jazzy (0.15.3)
266268
cocoapods (~> 1.5)
@@ -273,15 +275,15 @@ GEM
273275
sqlite3 (~> 1.3)
274276
xcinvoke (~> 0.3.0)
275277
jmespath (1.6.2)
276-
json (2.9.0)
277-
jwt (2.9.3)
278+
json (2.10.1)
279+
jwt (2.10.1)
278280
base64
279281
kramdown (2.5.1)
280282
rexml (>= 3.3.9)
281283
kramdown-parser-gfm (1.1.0)
282284
kramdown (~> 2.0)
283285
liferaft (0.0.6)
284-
logger (1.6.2)
286+
logger (1.6.6)
285287
method_source (1.1.0)
286288
mini_magick (4.13.2)
287289
mini_mime (1.1.5)
@@ -293,13 +295,14 @@ GEM
293295
mustache (1.1.1)
294296
mustermann (3.0.3)
295297
ruby2_keywords (~> 0.0.1)
298+
mutex_m (0.3.0)
296299
nanaimo (0.4.0)
297300
nap (1.1.0)
298301
naturally (2.2.1)
299302
netrc (0.11.0)
300303
nio4r (2.7.4)
301304
nkf (0.2.0)
302-
nokogiri (1.16.8)
305+
nokogiri (1.18.3)
303306
mini_portile2 (~> 2.8.2)
304307
racc (~> 1.4)
305308
octokit (9.2.0)
@@ -309,39 +312,40 @@ GEM
309312
optparse (0.6.0)
310313
os (1.1.4)
311314
parallel (1.26.3)
312-
parser (3.3.6.0)
315+
parser (3.3.7.1)
313316
ast (~> 2.4.1)
314317
racc
315-
plist (3.7.1)
316-
pry (0.15.0)
318+
plist (3.7.2)
319+
pry (0.15.2)
317320
coderay (~> 1.1)
318321
method_source (~> 1.0)
319-
pstore (0.1.3)
322+
pstore (0.1.4)
320323
public_suffix (4.0.7)
321-
puma (6.5.0)
324+
puma (6.6.0)
322325
nio4r (~> 2.0)
323326
racc (1.8.1)
324-
rack (3.1.8)
327+
rack (3.1.11)
325328
rack-protection (4.1.1)
326329
base64 (>= 0.1.0)
327330
logger (>= 1.6.0)
328331
rack (>= 3.0.0, < 4)
329-
rack-session (2.0.0)
332+
rack-session (2.1.0)
333+
base64 (>= 0.1.0)
330334
rack (>= 3.0.0)
331335
rackup (2.2.1)
332336
rack (>= 3)
333337
rainbow (3.1.1)
334338
rake (13.2.1)
335-
rchardet (1.8.0)
336-
redcarpet (3.6.0)
337-
regexp_parser (2.9.3)
339+
rchardet (1.9.0)
340+
redcarpet (3.6.1)
341+
regexp_parser (2.10.0)
338342
representable (3.2.0)
339343
declarative (< 0.1.0)
340344
trailblazer-option (>= 0.1.1, < 0.2.0)
341345
uber (< 0.2.0)
342346
retriable (3.1.2)
343-
rexml (3.3.9)
344-
rouge (2.0.7)
347+
rexml (3.4.1)
348+
rouge (3.28.0)
345349
rubocop (1.38.0)
346350
json (~> 2.3)
347351
parallel (~> 1.10)
@@ -352,7 +356,7 @@ GEM
352356
rubocop-ast (>= 1.23.0, < 2.0)
353357
ruby-progressbar (~> 1.7)
354358
unicode-display_width (>= 1.4.0, < 3.0)
355-
rubocop-ast (1.36.2)
359+
rubocop-ast (1.38.1)
356360
parser (>= 3.3.1.0)
357361
rubocop-performance (1.19.1)
358362
rubocop (>= 1.7.0, < 2.0)
@@ -362,13 +366,13 @@ GEM
362366
ruby-macho (2.5.1)
363367
ruby-progressbar (1.13.0)
364368
ruby2_keywords (0.0.5)
365-
rubyzip (2.3.2)
369+
rubyzip (2.4.1)
366370
sassc (2.4.0)
367371
ffi (~> 1.9)
368372
sawyer (0.9.2)
369373
addressable (>= 2.3.5)
370374
faraday (>= 0.17.3, < 3)
371-
securerandom (0.4.0)
375+
securerandom (0.4.1)
372376
security (0.1.5)
373377
signet (0.19.0)
374378
addressable (~> 2.8)
@@ -397,7 +401,7 @@ GEM
397401
terminal-notifier (2.0.0)
398402
terminal-table (3.0.2)
399403
unicode-display_width (>= 1.1.1, < 3)
400-
tilt (2.4.0)
404+
tilt (2.6.0)
401405
trailblazer-option (0.1.2)
402406
tty-cursor (0.7.1)
403407
tty-screen (0.8.2)
@@ -422,8 +426,8 @@ GEM
422426
colored2 (~> 3.1)
423427
nanaimo (~> 0.4.0)
424428
rexml (>= 3.3.6, < 4.0)
425-
xcpretty (0.3.0)
426-
rouge (~> 2.0.7)
429+
xcpretty (0.4.0)
430+
rouge (~> 3.28.0)
427431
xcpretty-travis-formatter (1.0.1)
428432
xcpretty (~> 0.2, >= 0.0.7)
429433
xctest_list (1.2.1)

fastlane/Fastfile

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -366,10 +366,21 @@ lane :build_xcframeworks do
366366
codesign << lane_context[SharedValues::XCFRAMEWORK_OUTPUT_PATH]
367367
end
368368

369+
remove_swiftui_core_module_shadow(output_directory: output_directory)
369370
remove_stream_video_module_shadow(output_directory: output_directory)
370371
sh(codesign.join(' ')) # We need to sign all frameworks at once
371372
end
372373

374+
# https://linear.app/stream/issue/IOS-630
375+
private_lane :remove_swiftui_core_module_shadow do |options|
376+
Dir.glob("#{options[:output_directory]}/**/*.swiftinterface").each do |file|
377+
if File.file?(file)
378+
UI.important("Removing the SwiftUICore module's shadow at: #{file}...")
379+
File.write(file, File.read(file).gsub(/SwiftUICore.View/, 'View'))
380+
end
381+
end
382+
end
383+
373384
# Swift emits an invalid module interface when a public type has the same name as a module, see https://github.com/swiftlang/swift/issues/56573
374385
private_lane :remove_stream_video_module_shadow do |options|
375386
Dir.glob("#{options[:output_directory]}/**/*.swiftinterface") do |file|

0 commit comments

Comments
 (0)