Skip to content

Commit d477a9a

Browse files
committed
chore: update ios files for 0.73.x
1 parent 23c5aba commit d477a9a

File tree

7 files changed

+963
-305
lines changed

7 files changed

+963
-305
lines changed

packages/react-native/Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ ruby '2.7.5'
66
# Cocoapods 1.15 introduced a bug which break the build. We will remove the upper
77
# bound in the template on Cocoapods with next React Native release.
88
gem 'cocoapods', '>= 1.13', '< 1.15'
9-
gem 'activesupport', '>= 6.1.7.3', '< 7.1.0'
9+
gem 'activesupport', '>= 6.1.7.5', '< 7.1.0'

packages/react-native/ios/Podfile

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ require Pod::Executable.execute_command('node', ['-p',
66
)', __dir__]).strip
77

88
platform :ios, min_ios_version_supported
9-
9+
prepare_react_native_project!
10+
1011
# If you are using a `react-native-flipper` your iOS build will fail when `NO_FLIPPER=1` is set.
1112
# because `react-native-flipper` depends on (FlipperKit,...) that will be excluded
1213
#
@@ -17,7 +18,7 @@ platform :ios, min_ios_version_supported
1718
# ...(process.env.NO_FLIPPER ? { 'react-native-flipper': { platforms: { ios: null } } } : {}),
1819
# ```
1920
flipper_config = ENV['NO_FLIPPER'] == "1" ? FlipperConfiguration.disabled : FlipperConfiguration.enabled
20-
21+
2122
linkage = ENV['USE_FRAMEWORKS']
2223
if linkage != nil
2324
Pod::UI.puts "Configuring Pod with #{linkage}ally linked Frameworks".green
@@ -27,14 +28,8 @@ end
2728
target 'reactnative' do
2829
config = use_native_modules!
2930

30-
# Flags change depending on the env values.
31-
flags = get_default_flags()
32-
3331
use_react_native!(
3432
:path => config[:reactNativePath],
35-
# Hermes is now enabled by default. Disable by setting this flag to false.
36-
:hermes_enabled => flags[:hermes_enabled],
37-
:fabric_enabled => flags[:fabric_enabled],
3833
# Enables Flipper.
3934
#
4035
# Note that if you have use_frameworks! enabled, Flipper will not work and
@@ -56,6 +51,5 @@ target 'reactnative' do
5651
config[:reactNativePath],
5752
:mac_catalyst_enabled => false
5853
)
59-
__apply_Xcode_12_5_M1_post_install_workaround(installer)
6054
end
6155
end

0 commit comments

Comments
 (0)