Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(xcode): backport Xcode 14.3 fix to 69 #36767

Merged
merged 3 commits into from Apr 3, 2023
Merged

fix(xcode): backport Xcode 14.3 fix to 69 #36767

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e84b664
minimal change needed
kelset Apr 3, 2023
17fa237
feedback
kelset Apr 3, 2023
2357c81
fix: move the installation of MyNativeView after calling use_react_na…
Apr 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 5 additions & 5 deletions packages/rn-tester/Podfile
View file
Open in desktop
Expand Up @@ -24,11 +24,6 @@ def pods(options = {}, use_flipper: false)
hermes_enabled = ENV['USE_HERMES'] == '1'
puts "Building RNTester with Fabric #{fabric_enabled ? "enabled" : "disabled"}.#{hermes_enabled ? " Using Hermes engine." : ""}"

if ENV['USE_CODEGEN_DISCOVERY'] == '1'
# Custom fabric component is only supported when using codegen discovery.
pod 'MyNativeView', :path => "NativeComponentExample"
end

use_react_native!(
path: @prefix_path,
fabric_enabled: fabric_enabled,
Expand All @@ -37,6 +32,11 @@ def pods(options = {}, use_flipper: false)
app_path: "#{Dir.pwd}",
config_file_dir: "#{Dir.pwd}/node_modules",
)

if ENV['USE_CODEGEN_DISCOVERY'] == '1'
# Custom fabric component is only supported when using codegen discovery.
pod 'MyNativeView', :path => "NativeComponentExample"
end
pod 'ReactCommon/turbomodule/samples', :path => "#{@prefix_path}/ReactCommon"

# Additional Pods which aren't included in the default Podfile
Expand Down
9 changes: 8 additions & 1 deletion scripts/react_native_pods.rb
View file
Open in desktop
Expand Up @@ -17,6 +17,13 @@
DEFAULT_OTHER_CPLUSPLUSFLAGS = '$(inherited)'
NEW_ARCH_OTHER_CPLUSPLUSFLAGS = '$(inherited) -DRCT_NEW_ARCH_ENABLED=1 -DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1'

# This function returns the min iOS version supported by React Native
# By using this function, you won't have to manually change your Podfile
# when we change the minimum version supported by the framework.
def min_ios_version_supported
return '12.4'
end

def use_react_native! (options={})
# The prefix to react-native
prefix = options[:path] ||= "../node_modules/react-native"
Expand Down Expand Up @@ -420,7 +427,7 @@ def get_react_codegen_spec(options={})
'source' => { :git => '' },
'header_mappings_dir' => './',
'platforms' => {
'ios' => '11.0',
'ios' => min_ios_version_supported,
},
'source_files' => "**/*.{h,mm,cpp}",
'pod_target_xcconfig' => { "HEADER_SEARCH_PATHS" =>
Expand Down