Skip to content

[ios][precompile] move header template to separate-folder #54839

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

Open
chrfalch wants to merge 3 commits into
base: main
Choose a base branch
from
Open

[ios][precompile] move header template to separate-folder #54839

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
5f28450
Move add_rn_core to after updating the current_config
chrfalch Dec 10, 2025
a3a0ac1
[ios][precompile] move header template to separate-folder
chrfalch Dec 10, 2025
a5f2a39
codereview: fixed wrong casing on filename
chrfalch Dec 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion packages/react-native/scripts/cocoapods/new_architecture.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,9 +133,13 @@ def self.install_modules_dependencies(spec, new_arch_enabled, folly_version = He

depend_on_js_engine(spec)
add_rn_third_party_dependencies(spec)
add_rncore_dependency(spec)

spec.pod_target_xcconfig = current_config

# add_rncore_dependency must be called after setting pod_target_xcconfig
# because it reads and modifies the xcconfig. If called before, its changes
# would be overwritten by the assignment above.
add_rncore_dependency(spec)
end

def self.extract_react_native_version(react_native_path, file_manager: File, json_parser: JSON)
Expand Down
2 changes: 1 addition & 1 deletion ...ive/scripts/ios-prebuild/React-umbrella.h → ...s/ios-prebuild/templates/React-umbrella.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*/

#ifdef __OBJC__
#import <UIKit/UIKit.h>
#import "UIKit/UIKit.h"
#else
#ifndef FOUNDATION_EXPORT
#if defined(__cplusplus)
Expand Down
0 ...-prebuild/React_RCTAppDelegate-umbrella.h → ...templates/React_RCTAppDelegate-umbrella.h
View file
Open in desktop
File renamed without changes.
0 ...ive/scripts/ios-prebuild/module.modulemap → ...s/ios-prebuild/templates/module.modulemap
View file
Open in desktop
File renamed without changes.
8 changes: 7 additions & 1 deletion packages/react-native/scripts/ios-prebuild/xcframework.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ const frameworkLog = createLogger('XCFramework');
*/
const REACT_CORE_UMBRELLA_HEADER_PATH /*: string*/ = path.join(
__dirname,
'templates',
'React-umbrella.h',
);

Expand All @@ -40,10 +41,15 @@ const REACT_CORE_UMBRELLA_HEADER_PATH /*: string*/ = path.join(
*/
const RCT_APP_DELEGATE_UMBRELLA_HEADER_PATH /*: string*/ = path.join(
__dirname,
'templates',
'React_RCTAppDelegate-umbrella.h',
);

const RN_MODULEMAP_PATH /*: string*/ = path.join(__dirname, 'module.modulemap');
const RN_MODULEMAP_PATH /*: string*/ = path.join(
__dirname,
'templates',
'module.modulemap',
);

function buildXCFrameworks(
rootFolder /*: string */,
Expand Down
Loading