Skip to content

Commit 13551d3

Browse files
upgrade to expo 52
1 parent b0e4bb5 commit 13551d3

File tree

26 files changed

+6162
-7783
lines changed

26 files changed

+6162
-7783
lines changed

example-bare/app.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@
55
"version": "1.0.0",
66
"assetBundlePatterns": [
77
"**/*"
8-
]
8+
],
9+
"ios": {
10+
"bundleIdentifier": "com.jvjv33.example-bare"
11+
}
912
},
1013
"ios": {
1114
"infoPlist": {

example-bare/ios/Podfile

Lines changed: 21 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -7,39 +7,31 @@ podfile_properties = JSON.parse(File.read(File.join(__dir__, 'Podfile.properties
77
ENV['RCT_NEW_ARCH_ENABLED'] = podfile_properties['newArchEnabled'] == 'true' ? '1' : '0'
88
ENV['EX_DEV_CLIENT_NETWORK_INSPECTOR'] = podfile_properties['EX_DEV_CLIENT_NETWORK_INSPECTOR']
99

10-
platform :ios, podfile_properties['ios.deploymentTarget'] || '13.4'
10+
platform :ios, podfile_properties['ios.deploymentTarget'] || '15.1'
1111
install! 'cocoapods',
1212
:deterministic_uuids => false
1313

1414
prepare_react_native_project!
1515

16-
# If you are using a `react-native-flipper` your iOS build will fail when `NO_FLIPPER=1` is set.
17-
# because `react-native-flipper` depends on (FlipperKit,...), which will be excluded. To fix this,
18-
# you can also exclude `react-native-flipper` in `react-native.config.js`
19-
#
20-
# ```js
21-
# module.exports = {
22-
# dependencies: {
23-
# ...(process.env.NO_FLIPPER ? { 'react-native-flipper': { platforms: { ios: null } } } : {}),
24-
# }
25-
# }
26-
# ```
27-
flipper_config = FlipperConfiguration.disabled
28-
if ENV['NO_FLIPPER'] == '1' then
29-
# Explicitly disabled through environment variables
30-
flipper_config = FlipperConfiguration.disabled
31-
elsif podfile_properties.key?('ios.flipper') then
32-
# Configure Flipper in Podfile.properties.json
33-
if podfile_properties['ios.flipper'] == 'true' then
34-
flipper_config = FlipperConfiguration.enabled(["Debug", "Release"])
35-
elsif podfile_properties['ios.flipper'] != 'false' then
36-
flipper_config = FlipperConfiguration.enabled(["Debug", "Release"], { 'Flipper' => podfile_properties['ios.flipper'] })
37-
end
38-
end
39-
4016
target 'examplebare' do
4117
use_expo_modules!
42-
config = use_native_modules!
18+
19+
if ENV['EXPO_USE_COMMUNITY_AUTOLINKING'] == '1'
20+
config_command = ['node', '-e', "process.argv=['', '', 'config'];require('@react-native-community/cli').run()"];
21+
else
22+
config_command = [
23+
'node',
24+
'--no-warnings',
25+
'--eval',
26+
'require(require.resolve(\'expo-modules-autolinking\', { paths: [require.resolve(\'expo/package.json\')] }))(process.argv.slice(1))',
27+
'react-native-config',
28+
'--json',
29+
'--platform',
30+
'ios'
31+
]
32+
end
33+
34+
config = use_native_modules!(config_command)
4335

4436
use_frameworks! :linkage => podfile_properties['ios.useFrameworks'].to_sym if podfile_properties['ios.useFrameworks']
4537
use_frameworks! :linkage => ENV['USE_FRAMEWORKS'].to_sym if ENV['USE_FRAMEWORKS']
@@ -49,15 +41,15 @@ target 'examplebare' do
4941
:hermes_enabled => podfile_properties['expo.jsEngine'] == nil || podfile_properties['expo.jsEngine'] == 'hermes',
5042
# An absolute path to your application root.
5143
:app_path => "#{Pod::Config.instance.installation_root}/..",
52-
# Note that if you have use_frameworks! enabled, Flipper will not work if enabled
53-
:flipper_configuration => flipper_config
44+
:privacy_file_aggregation_enabled => podfile_properties['apple.privacyManifestAggregationEnabled'] != 'false',
5445
)
5546

5647
post_install do |installer|
5748
react_native_post_install(
5849
installer,
5950
config[:reactNativePath],
60-
:mac_catalyst_enabled => false
51+
:mac_catalyst_enabled => false,
52+
:ccache_enabled => podfile_properties['apple.ccacheEnabled'] == 'true',
6153
)
6254

6355
# This is necessary for Xcode 14, because it signs resource bundles by default
@@ -71,12 +63,4 @@ target 'examplebare' do
7163
end
7264
end
7365
end
74-
75-
post_integrate do |installer|
76-
begin
77-
expo_patch_react_imports!(installer)
78-
rescue => e
79-
Pod::UI.warn e
80-
end
81-
end
8266
end

0 commit comments

Comments
 (0)