Skip to content

Commit

Permalink
chore: update ios files for 0.73.x
Browse files Browse the repository at this point in the history
  • Loading branch information
trivikr committed Jul 23, 2024
1 parent 23c5aba commit 2f83b9a
Show file tree
Hide file tree
Showing 7 changed files with 965 additions and 307 deletions.
2 changes: 1 addition & 1 deletion packages/react-native/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ ruby '2.7.5'
# Cocoapods 1.15 introduced a bug which break the build. We will remove the upper
# bound in the template on Cocoapods with next React Native release.
gem 'cocoapods', '>= 1.13', '< 1.15'
gem 'activesupport', '>= 6.1.7.3', '< 7.1.0'
gem 'activesupport', '>= 6.1.7.5', '< 7.1.0'
File renamed without changes.
12 changes: 3 additions & 9 deletions packages/react-native/ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ require Pod::Executable.execute_command('node', ['-p',
)', __dir__]).strip

platform :ios, min_ios_version_supported

prepare_react_native_project!

# If you are using a `react-native-flipper` your iOS build will fail when `NO_FLIPPER=1` is set.
# because `react-native-flipper` depends on (FlipperKit,...) that will be excluded
#
Expand All @@ -17,7 +18,7 @@ platform :ios, min_ios_version_supported
# ...(process.env.NO_FLIPPER ? { 'react-native-flipper': { platforms: { ios: null } } } : {}),
# ```
flipper_config = ENV['NO_FLIPPER'] == "1" ? FlipperConfiguration.disabled : FlipperConfiguration.enabled

linkage = ENV['USE_FRAMEWORKS']
if linkage != nil
Pod::UI.puts "Configuring Pod with #{linkage}ally linked Frameworks".green
Expand All @@ -27,14 +28,8 @@ end
target 'reactnative' do
config = use_native_modules!

# Flags change depending on the env values.
flags = get_default_flags()

use_react_native!(
:path => config[:reactNativePath],
# Hermes is now enabled by default. Disable by setting this flag to false.
:hermes_enabled => flags[:hermes_enabled],
:fabric_enabled => flags[:fabric_enabled],
# Enables Flipper.
#
# Note that if you have use_frameworks! enabled, Flipper will not work and
Expand All @@ -56,6 +51,5 @@ target 'reactnative' do
config[:reactNativePath],
:mac_catalyst_enabled => false
)
__apply_Xcode_12_5_M1_post_install_workaround(installer)
end
end
Loading

0 comments on commit 2f83b9a

Please sign in to comment.