Skip to content

Commit

Permalink
Merge pull request #43344 from facebook/cipolleschi/fix-flipper-072
Browse files Browse the repository at this point in the history
[RN][iOS][0.72] Fix flipper for Xcode 15.3
  • Loading branch information
alfonsocj authored Mar 7, 2024
2 parents 0724c27 + a316e01 commit 1d69e2f
Show file tree
Hide file tree
Showing 3 changed files with 485 additions and 462 deletions.
22 changes: 22 additions & 0 deletions packages/react-native/scripts/cocoapods/utils.rb
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,28 @@ def self.exclude_i386_architecture_while_using_hermes(installer)
end
end

def self.fix_flipper_for_xcode_15_3(installer)

installer.pods_project.targets.each do |target|
if target.name == 'Flipper'
file_path = 'Pods/Flipper/xplat/Flipper/FlipperTransportTypes.h'
if !File.exist?(file_path)
return
end

contents = File.read(file_path)
if contents.include?('#include <functional>')
return
end
mod_content = contents.gsub("#pragma once", "#pragma once\n#include <functional>")
File.chmod(0755, file_path)
File.open(file_path, 'w') do |file|
file.puts(mod_content)
end
end
end
end

def self.set_node_modules_user_settings(installer, react_native_path)
Pod::UI.puts("Setting REACT_NATIVE build settings")
projects = self.extract_projects(installer)
Expand Down
1 change: 1 addition & 0 deletions packages/react-native/scripts/react_native_pods.rb
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,7 @@ def react_native_post_install(
ReactNativePodsUtils.apply_flags_for_fabric(installer, fabric_enabled: fabric_enabled)
ReactNativePodsUtils.apply_xcode_15_patch(installer)
ReactNativePodsUtils.updateIphoneOSDeploymentTarget(installer)
ReactNativePodsUtils.fix_flipper_for_xcode_15_3(installer)

NewArchitectureHelper.set_clang_cxx_language_standard_if_needed(installer)
is_new_arch_enabled = ENV['RCT_NEW_ARCH_ENABLED'] == "1"
Expand Down
Loading

0 comments on commit 1d69e2f

Please sign in to comment.