Skip to content

Commit e79aa9e

Browse files
salmatarzisalmatarzi
authored
🤝 Merge pull request #99 from Instabug/hotfix/fix_link_script_if_condition
📝 Update script to add brackets to if condition as it did not get eva…
2 parents 86beaa7 + 0839a45 commit e79aa9e

File tree

2 files changed

+47
-49
lines changed

2 files changed

+47
-49
lines changed

‎link.rb

Lines changed: 30 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -26,49 +26,48 @@
2626
frameworks_group = project.groups.find { |group| group.display_name == 'Frameworks' }
2727
frameworks_group ||= project.new_group('Frameworks')
2828
default_target = project.targets.find { |target| target.to_s == default_target_name }
29-
targets = project.targets
29+
targets = project.targets.select { |target| (target.is_a? Xcodeproj::Project::Object::PBXNativeTarget) &&
30+
(target.product_type == "com.apple.product-type.application") &&
31+
(target.platform_name == :ios) }
3032
framework_ref = frameworks_group.new_file("#{framework_root}/#{framework_name}")
3133

3234
# Add Instabug to every target that is of type application
3335
targets.each do |target|
34-
if target.is_a? Xcodeproj::Project::Object::PBXNativeTarget && (target.product_type == "com.apple.product-type.application") && (target.platform_name == :ios)
36+
# Add new "Embed Frameworks" build phase to target
37+
embed_frameworks_build_phase = target.build_phases.find { |build_phase| build_phase.to_s == 'Embed Instabug Framework'}
38+
Kernel.exit(0) if embed_frameworks_build_phase
39+
embed_frameworks_build_phase = project.new(Xcodeproj::Project::Object::PBXCopyFilesBuildPhase)
40+
embed_frameworks_build_phase.name = 'Embed Instabug Framework'
41+
embed_frameworks_build_phase.symbol_dst_subfolder_spec = :frameworks
42+
target.build_phases << embed_frameworks_build_phase
3543

36-
# Add new "Embed Frameworks" build phase to target
37-
embed_frameworks_build_phase = target.build_phases.find { |build_phase| build_phase.to_s == 'Embed Instabug Framework'}
38-
Kernel.exit(0) if embed_frameworks_build_phase
39-
embed_frameworks_build_phase = project.new(Xcodeproj::Project::Object::PBXCopyFilesBuildPhase)
40-
embed_frameworks_build_phase.name = 'Embed Instabug Framework'
41-
embed_frameworks_build_phase.symbol_dst_subfolder_spec = :frameworks
42-
target.build_phases << embed_frameworks_build_phase
43-
44-
# Add static library to non default targets' build phase
45-
if target.name != default_target_name
46-
static_library_file_reference = default_target.frameworks_build_phase.files_references.find { |file_reference| file_reference.path == 'libRNInstabug.a' }
47-
target.frameworks_build_phase.add_file_reference(static_library_file_reference)
48-
end
44+
# Add static library to non default targets' build phase
45+
if target.name != default_target_name
46+
static_library_file_reference = default_target.frameworks_build_phase.files_references.find { |file_reference| file_reference.path == 'libRNInstabug.a' }
47+
target.frameworks_build_phase.add_file_reference(static_library_file_reference)
48+
end
4949

50-
# Add framework search path to target
51-
target.build_configurations.each do |config|
52-
framework_search_paths = target.build_settings(config.name)['FRAMEWORK_SEARCH_PATHS']
50+
# Add framework search path to target
51+
target.build_configurations.each do |config|
52+
framework_search_paths = target.build_settings(config.name)['FRAMEWORK_SEARCH_PATHS']
5353

54-
framework_search_paths ||= ['$(inherited)']
55-
framework_search_paths = [framework_search_paths] unless framework_search_paths.is_a?(Array)
56-
framework_search_paths << framework_root unless framework_search_paths.include? framework_root
54+
framework_search_paths ||= ['$(inherited)']
55+
framework_search_paths = [framework_search_paths] unless framework_search_paths.is_a?(Array)
56+
framework_search_paths << framework_root unless framework_search_paths.include? framework_root
5757

58-
target.build_settings(config.name)['FRAMEWORK_SEARCH_PATHS'] = framework_search_paths
59-
end
58+
target.build_settings(config.name)['FRAMEWORK_SEARCH_PATHS'] = framework_search_paths
59+
end
6060

61-
# Add framework to target as "Embedded Frameworks"
61+
# Add framework to target as "Embedded Frameworks"
6262

63-
build_file = embed_frameworks_build_phase.add_file_reference(framework_ref)
64-
target.frameworks_build_phase.add_file_reference(framework_ref)
65-
build_file.settings = { 'ATTRIBUTES' => ['CodeSignOnCopy', 'RemoveHeadersOnCopy'] }
63+
build_file = embed_frameworks_build_phase.add_file_reference(framework_ref)
64+
target.frameworks_build_phase.add_file_reference(framework_ref)
65+
build_file.settings = { 'ATTRIBUTES' => ['CodeSignOnCopy', 'RemoveHeadersOnCopy'] }
6666

6767

68-
#Add New Run Script Phase to Build Phases
69-
phase = target.new_shell_script_build_phase(INSTABUG_PHASE_NAME)
70-
phase.shell_script = INSTABUG_PHASE_SCRIPT
71-
end
68+
#Add New Run Script Phase to Build Phases
69+
phase = target.new_shell_script_build_phase(INSTABUG_PHASE_NAME)
70+
phase.shell_script = INSTABUG_PHASE_SCRIPT
7271
end
7372

7473
# Save Xcode project

‎unlink.rb

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -19,33 +19,32 @@
1919
# Get useful variables
2020
project = Xcodeproj::Project.open(project_location)
2121
frameworks_group = project.groups.find { |group| group.display_name == 'Frameworks' }
22-
targets = project.targets
22+
targets = project.targets.select { |target| (target.is_a? Xcodeproj::Project::Object::PBXNativeTarget) &&
23+
(target.product_type == "com.apple.product-type.application") &&
24+
(target.platform_name == :ios) }
2325
framework_ref = frameworks_group.files.find { |file_reference| file_reference.path == "#{framework_root}/#{framework_name}"}
2426

2527
# Remove Instabug's framework from the Frameworks group
2628
frameworks_group.children.delete(framework_ref)
2729

2830
# Remove Instabug to every target that is of type application
2931
targets.each do |target|
30-
if target.is_a? Xcodeproj::Project::Object::PBXNativeTarget && (target.product_type == "com.apple.product-type.application") && (target.platform_name == :ios)
31-
32-
# Remove "Embed Frameworks" build phase to target
33-
embed_frameworks_build_phase = target.build_phases.find { |build_phase| build_phase.to_s == 'Embed Instabug Framework'}
34-
Kernel.exit(0) unless embed_frameworks_build_phase
35-
target.build_phases.delete(embed_frameworks_build_phase)
36-
37-
# Remove framework search path from target
38-
target.build_configurations.each do |config|
39-
target.build_settings(config.name)['FRAMEWORK_SEARCH_PATHS'].delete(framework_root)
40-
end
32+
# Remove "Embed Frameworks" build phase to target
33+
embed_frameworks_build_phase = target.build_phases.find { |build_phase| build_phase.to_s == 'Embed Instabug Framework'}
34+
Kernel.exit(0) unless embed_frameworks_build_phase
35+
target.build_phases.delete(embed_frameworks_build_phase)
36+
37+
# Remove framework search path from target
38+
target.build_configurations.each do |config|
39+
target.build_settings(config.name)['FRAMEWORK_SEARCH_PATHS'].delete(framework_root)
40+
end
4141

42-
# Remove framework from target from "Embedded Frameworks"
43-
target.frameworks_build_phase.remove_file_reference(framework_ref)
42+
# Remove framework from target from "Embedded Frameworks"
43+
target.frameworks_build_phase.remove_file_reference(framework_ref)
4444

45-
#Delete New Run Script Phase from Build Phases
46-
shell_script_build_phase = target.shell_script_build_phases.find { |build_phase| build_phase.to_s == INSTABUG_PHASE_NAME }
47-
target.build_phases.delete(shell_script_build_phase)
48-
end
45+
#Delete New Run Script Phase from Build Phases
46+
shell_script_build_phase = target.shell_script_build_phases.find { |build_phase| build_phase.to_s == INSTABUG_PHASE_NAME }
47+
target.build_phases.delete(shell_script_build_phase)
4948
end
5049

5150
# Save Xcode project

0 commit comments

Comments
 (0)