From 16fc065aa1a417126ca008d1de7691258fcb0fad Mon Sep 17 00:00:00 2001 From: Koen Punt Date: Tue, 29 Aug 2023 19:55:17 -0700 Subject: [PATCH] Revert "Fix build failure on iOS with pnpm and use_frameworks! (#38158)" (#39177) Summary: This partially reverts commit 58adc5e4b9ab74b67b4af04d1e72c387af848ea7. Using an absolute path in a podspec is wrong, and causes checksum issues when installs are ran on different systems. Example: `pod install --deployment --clean-install` breaks on non-matching checksums on CI because the absolute path is not the same in that environment. ``` Adding spec repo `trunk` with CDN `https://cdn.cocoapods.org/` Verifying no changes [!] There were changes to the lockfile in deployment mode: SPEC CHECKSUMS: React-debug: New Lockfile: 419922cde6c58cd5b9d43e4a09805146a7dd13a8 Old Lockfile: 1ce329843d8f9a9cbe0cdd9de264b20e89586734 React-NativeModulesApple: New Lockfile: a683b0c999e76b7d15ad9d5eaf8b6308e710a93e Old Lockfile: f82356d67a137295d098a98a03be5ee35871b5a5 React-runtimescheduler: New Lockfile: 79f8dff11acbe36aaeece63553680d7a8272af96 Old Lockfile: 16c5282d43a0df50d7c68ebf0218aeeb642a7086 React-utils: New Lockfile: 4fabb3cba786651e35bc41e610b0698fa24cecff Old Lockfile: e7e9118d0e85b107bb06d1a5f72ec5db6bddb911 ReactCommon: New Lockfile: af30fb021799e18c85a8e30ce799e15607e82212 Old Lockfile: f04f86f33c22e05dbf875789ea522ee486dace78 ``` And even tho the change fixed an issue with pnpm, the issue it introduces with cocoapods I think is a bigger one. ## Changelog: [INTERNAL] - Revert commit that makes podfile unstable Pull Request resolved: https://github.com/facebook/react-native/pull/39177 Test Plan: Tested locally that the hashes are stable Reviewed By: NickGerleman Differential Revision: D48773887 Pulled By: cipolleschi fbshipit-source-id: 96bcdbadc17a24fa9a8669f569d004bee6a03521 --- packages/react-native/ReactCommon/React-Fabric.podspec | 2 +- packages/react-native/ReactCommon/ReactCommon.podspec | 2 +- .../react-native/ReactCommon/react/debug/React-debug.podspec | 2 +- .../core/platform/ios/React-NativeModulesApple.podspec | 2 +- .../react/nativemodule/samples/ReactCommon-Samples.podspec | 2 +- .../ReactCommon/react/renderer/graphics/React-graphics.podspec | 2 +- .../imagemanager/platform/ios/React-ImageManager.podspec | 2 +- .../renderer/runtimescheduler/React-runtimescheduler.podspec | 2 +- .../react-native/ReactCommon/react/utils/React-utils.podspec | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/react-native/ReactCommon/React-Fabric.podspec b/packages/react-native/ReactCommon/React-Fabric.podspec index 31e1c148eb71ea..cda7185c90d659 100644 --- a/packages/react-native/ReactCommon/React-Fabric.podspec +++ b/packages/react-native/ReactCommon/React-Fabric.podspec @@ -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 diff --git a/packages/react-native/ReactCommon/ReactCommon.podspec b/packages/react-native/ReactCommon/ReactCommon.podspec index ff6abe3da9d758..448907b3b8f26e 100644 --- a/packages/react-native/ReactCommon/ReactCommon.podspec +++ b/packages/react-native/ReactCommon/ReactCommon.podspec @@ -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/..." diff --git a/packages/react-native/ReactCommon/react/debug/React-debug.podspec b/packages/react-native/ReactCommon/react/debug/React-debug.podspec index 933ace4d4d6fd5..7c2d0d65ae64f1 100644 --- a/packages/react-native/ReactCommon/react/debug/React-debug.podspec +++ b/packages/react-native/ReactCommon/react/debug/React-debug.podspec @@ -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 diff --git a/packages/react-native/ReactCommon/react/nativemodule/core/platform/ios/React-NativeModulesApple.podspec b/packages/react-native/ReactCommon/react/nativemodule/core/platform/ios/React-NativeModulesApple.podspec index 00f5c923fe3dcc..8824ba73561bf3 100644 --- a/packages/react-native/ReactCommon/react/nativemodule/core/platform/ios/React-NativeModulesApple.podspec +++ b/packages/react-native/ReactCommon/react/nativemodule/core/platform/ios/React-NativeModulesApple.podspec @@ -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}" diff --git a/packages/react-native/ReactCommon/react/nativemodule/samples/ReactCommon-Samples.podspec b/packages/react-native/ReactCommon/react/nativemodule/samples/ReactCommon-Samples.podspec index f1143cea212b40..ddccfded01041d 100644 --- a/packages/react-native/ReactCommon/react/nativemodule/samples/ReactCommon-Samples.podspec +++ b/packages/react-native/ReactCommon/react/nativemodule/samples/ReactCommon-Samples.podspec @@ -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 diff --git a/packages/react-native/ReactCommon/react/renderer/graphics/React-graphics.podspec b/packages/react-native/ReactCommon/react/renderer/graphics/React-graphics.podspec index 4111d290bdf673..c4428e0346705f 100644 --- a/packages/react-native/ReactCommon/react/renderer/graphics/React-graphics.podspec +++ b/packages/react-native/ReactCommon/react/renderer/graphics/React-graphics.podspec @@ -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 diff --git a/packages/react-native/ReactCommon/react/renderer/imagemanager/platform/ios/React-ImageManager.podspec b/packages/react-native/ReactCommon/react/renderer/imagemanager/platform/ios/React-ImageManager.podspec index 8173886afab08b..e89f300be4f78e 100644 --- a/packages/react-native/ReactCommon/react/renderer/imagemanager/platform/ios/React-ImageManager.podspec +++ b/packages/react-native/ReactCommon/react/renderer/imagemanager/platform/ios/React-ImageManager.podspec @@ -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\"", diff --git a/packages/react-native/ReactCommon/react/renderer/runtimescheduler/React-runtimescheduler.podspec b/packages/react-native/ReactCommon/react/renderer/runtimescheduler/React-runtimescheduler.podspec index eefa2411e3bd63..d4e9a70f9e9e85 100644 --- a/packages/react-native/ReactCommon/react/renderer/runtimescheduler/React-runtimescheduler.podspec +++ b/packages/react-native/ReactCommon/react/renderer/runtimescheduler/React-runtimescheduler.podspec @@ -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" diff --git a/packages/react-native/ReactCommon/react/utils/React-utils.podspec b/packages/react-native/ReactCommon/react/utils/React-utils.podspec index 18370236534029..795be868379d61 100644 --- a/packages/react-native/ReactCommon/react/utils/React-utils.podspec +++ b/packages/react-native/ReactCommon/react/utils/React-utils.podspec @@ -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