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

Revert "Fix build failure on iOS with pnpm and use_frameworks! (#38158)" #39177

Closed
wants to merge 1 commit into from
Closed

Revert "Fix build failure on iOS with pnpm and use_frameworks! (#38158)" #39177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion packages/react-native/ReactCommon/React-Fabric.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ Pod::Spec.new do |s|
"DEFINES_MODULE" => "YES" }

if ENV['USE_FRAMEWORKS']
s.header_mappings_dir = File.absolute_path('./')
s.header_mappings_dir = './'
s.module_name = 'React_Fabric'
end

Expand Down
2 changes: 1 addition & 1 deletion packages/react-native/ReactCommon/ReactCommon.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ Pod::Spec.new do |s|
"CLANG_CXX_LANGUAGE_STANDARD" => "c++17",
"GCC_WARN_PEDANTIC" => "YES" }
if ENV['USE_FRAMEWORKS']
s.header_mappings_dir = File.absolute_path("./")
s.header_mappings_dir = './'
end

# TODO (T48588859): Restructure this target to align with dir structure: "react/nativemodule/..."
Expand Down
2 changes: 1 addition & 1 deletion packages/react-native/ReactCommon/react/debug/React-debug.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,6 @@ Pod::Spec.new do |s|

if ENV['USE_FRAMEWORKS']
s.module_name = "React_debug"
s.header_mappings_dir = File.absolute_path("../..")
s.header_mappings_dir = "../.."
end
end
2 changes: 1 addition & 1 deletion ...-native/ReactCommon/react/nativemodule/core/platform/ios/React-NativeModulesApple.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ Pod::Spec.new do |s|
"CLANG_CXX_LANGUAGE_STANDARD" => "c++17",
"GCC_WARN_PEDANTIC" => "YES" }
if ENV['USE_FRAMEWORKS']
s.header_mappings_dir = File.absolute_path('./')
s.header_mappings_dir = './'
end

s.source_files = "ReactCommon/**/*.{mm,cpp,h}"
Expand Down
2 changes: 1 addition & 1 deletion packages/react-native/ReactCommon/react/nativemodule/samples/ReactCommon-Samples.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ Pod::Spec.new do |s|
"CLANG_CXX_LANGUAGE_STANDARD" => "c++17",
"GCC_WARN_PEDANTIC" => "YES" }
if ENV['USE_FRAMEWORKS']
s.header_mappings_dir = File.absolute_path('./')
s.header_mappings_dir = './'
end


Expand Down
2 changes: 1 addition & 1 deletion packages/react-native/ReactCommon/react/renderer/graphics/React-graphics.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ Pod::Spec.new do |s|

if ENV['USE_FRAMEWORKS']
s.module_name = "React_graphics"
s.header_mappings_dir = File.absolute_path("../../..")
s.header_mappings_dir = "../../.."
header_search_paths = header_search_paths + ["\"$(PODS_TARGET_SRCROOT)/platform/ios\""]
end

Expand Down
2 changes: 1 addition & 1 deletion ...ct-native/ReactCommon/react/renderer/imagemanager/platform/ios/React-ImageManager.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ Pod::Spec.new do |s|

if ENV['USE_FRAMEWORKS']
s.module_name = "React_ImageManager"
s.header_mappings_dir = File.absolute_path("./")
s.header_mappings_dir = "./"
header_search_paths = header_search_paths + [
"\"${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers\"",
"\"$(PODS_ROOT)/DoubleConversion\"",
Expand Down
2 changes: 1 addition & 1 deletion ...s/react-native/ReactCommon/react/renderer/runtimescheduler/React-runtimescheduler.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ Pod::Spec.new do |s|

if ENV['USE_FRAMEWORKS']
s.module_name = "React_runtimescheduler"
s.header_mappings_dir = File.absolute_path("../../..")
s.header_mappings_dir = "../../.."
end

s.dependency "React-jsi"
Expand Down
2 changes: 1 addition & 1 deletion packages/react-native/ReactCommon/react/utils/React-utils.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ Pod::Spec.new do |s|

if ENV['USE_FRAMEWORKS']
s.module_name = "React_utils"
s.header_mappings_dir = File.absolute_path("../..")
s.header_mappings_dir = "../.."
end

s.dependency "RCT-Folly", folly_version
Expand Down