Skip to content

Commit 7f1254b

Browse files
committed
🐛 Fix a bug when the unlinking script run twice changed the parsing of the iOS project.
1 parent 963bea7 commit 7f1254b

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

link.rb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,9 @@
5151

5252
# Add framework to target as "Embedded Frameworks"
5353
framework_ref = frameworks_group.files.find { |file_reference| file_reference.path == "#{framework_root}/#{framework_name}"}
54+
is_linked = true
5455
if framework_ref == nil
56+
is_linked = false
5557
framework_ref = frameworks_group.new_file("#{framework_root}/#{framework_name}")
5658
build_file = embed_frameworks_build_phase.add_file_reference(framework_ref)
5759
frameworks_build_phase.add_file_reference(framework_ref)
@@ -66,4 +68,4 @@
6668
end
6769

6870
# Save Xcode project
69-
project.save
71+
project.save unless is_linked

unlink.rb

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,12 @@
2727
embed_frameworks_build_phase = target.build_phases.find { |build_phase| build_phase.to_s == 'Embed Frameworks'}
2828
target.build_phases.delete(embed_frameworks_build_phase) if embed_frameworks_build_phase
2929

30+
is_string = false;
31+
3032
# Remove framework search path from target
3133
['Debug', 'Release'].each do |config|
32-
target.build_settings(config)['FRAMEWORK_SEARCH_PATHS'].delete(framework_root)
34+
is_string ||= target.build_settings(config)['FRAMEWORK_SEARCH_PATHS'].is_a? String
35+
target.build_settings(config)['FRAMEWORK_SEARCH_PATHS'].delete(framework_root)
3336
end
3437

3538
# Remove framework from target from "Embedded Frameworks"
@@ -42,4 +45,4 @@
4245
target.build_phases.delete(shell_script_build_phase) if shell_script_build_phase
4346

4447
# Save Xcode project
45-
project.save
48+
project.save unless is_string

0 commit comments

Comments
 (0)