diff --git a/ReactTurboModuleCxx/React-TurboModuleCxx-RNW.podspec b/ReactTurboModuleCxx/React-TurboModuleCxx-RNW.podspec index 94db33ef54833c..ebea26d2336dfc 100644 --- a/ReactTurboModuleCxx/React-TurboModuleCxx-RNW.podspec +++ b/ReactTurboModuleCxx/React-TurboModuleCxx-RNW.podspec @@ -28,7 +28,7 @@ Pod::Spec.new do |s| "vnext/Microsoft.ReactNative.Cxx/NativeModules.h" s.library = "stdc++" s.pod_target_xcconfig = { "USE_HEADERMAP" => "YES", - "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost-for-react-native\"", + "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\"", "CLANG_CXX_LANGUAGE_STANDARD" => "c++17" } s.dependency "RCT-Folly", folly_version diff --git a/ReactTurboModuleCxx/React-TurboModuleCxx-WinRTPort.podspec b/ReactTurboModuleCxx/React-TurboModuleCxx-WinRTPort.podspec index 58fec0a9cbf0a7..4b9d65ec027c85 100644 --- a/ReactTurboModuleCxx/React-TurboModuleCxx-WinRTPort.podspec +++ b/ReactTurboModuleCxx/React-TurboModuleCxx-WinRTPort.podspec @@ -36,7 +36,7 @@ Pod::Spec.new do |s| ss.source_files = "WinRT/*.{h,cpp,mm}" ss.library = "stdc++" ss.pod_target_xcconfig = { "USE_HEADERMAP" => "YES", - "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost-for-react-native\"", + "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\"", "CLANG_CXX_LANGUAGE_STANDARD" => "c++17" } ss.header_dir = "winrt" diff --git a/packages/rn-tester/NativeModuleExample/ScreenshotManager.podspec b/packages/rn-tester/NativeModuleExample/ScreenshotManager.podspec index b8a5839fd6a10f..256517e6d75cb5 100644 --- a/packages/rn-tester/NativeModuleExample/ScreenshotManager.podspec +++ b/packages/rn-tester/NativeModuleExample/ScreenshotManager.podspec @@ -37,8 +37,9 @@ Pod::Spec.new do |s| # [TODO(macOS GH#774) s.osx.dependency "React-TurboModuleCxx-RNW" s.osx.pod_target_xcconfig = { "USE_HEADERMAP" => "YES", - "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost-for-react-native\"", - "CLANG_CXX_LANGUAGE_STANDARD" => "c++17" } + "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\"", + "CLANG_CXX_LANGUAGE_STANDARD" => "c++17", + } # ]TODO(macOS GH#774) # s.dependency "..." diff --git a/packages/rn-tester/Podfile.lock b/packages/rn-tester/Podfile.lock index 276ab20940d929..1be07cfa7e309e 100644 --- a/packages/rn-tester/Podfile.lock +++ b/packages/rn-tester/Podfile.lock @@ -1,6 +1,5 @@ PODS: - boost (1.76.0) - - boost-for-react-native (1.63.0) - CocoaAsyncSocket (7.6.5) - DoubleConversion (1.1.6) - FBLazyVector (0.68.44) @@ -404,7 +403,6 @@ PODS: DEPENDENCIES: - boost (from `../../third-party-podspecs/boost.podspec`) - - boost-for-react-native (from `../../third-party-podspecs/boost-for-react-native.podspec`) - DoubleConversion (from `../../third-party-podspecs/DoubleConversion.podspec`) - FBLazyVector (from `../../Libraries/FBLazyVector`) - FBReactNativeSpec (from `../../React/FBReactNativeSpec`) @@ -487,8 +485,6 @@ SPEC REPOS: EXTERNAL SOURCES: boost: :podspec: "../../third-party-podspecs/boost.podspec" - boost-for-react-native: - :podspec: "../../third-party-podspecs/boost-for-react-native.podspec" DoubleConversion: :podspec: "../../third-party-podspecs/DoubleConversion.podspec" FBLazyVector: @@ -562,7 +558,6 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: boost: 613e39eac4239cc72b15421247b5ab05361266a2 - boost-for-react-native: 8f7c9ecfe357664c072ffbe2432569667cbf1f1b CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99 DoubleConversion: ed15e075aa758ac0e4c1f8b830bd4e4d40d669e8 FBLazyVector: 5e3a5fcfde8511debb4f95264986a8c63f49d03a @@ -606,10 +601,10 @@ SPEC CHECKSUMS: React-RCTText: a3d0700143c50bd62ece73aca523433b23492ef7 React-RCTVibration: 8baeace58672df45939cc99431964ceb09c97118 React-runtimeexecutor: b3487150849699a6c771bfb1d26121f0f1feba5f - React-TurboModuleCxx-RNW: f31a1c090bea0429ed6c57a2826738eae632df08 - React-TurboModuleCxx-WinRTPort: 1d05288612f38976d898570dd74fb62a13592016 + React-TurboModuleCxx-RNW: 7865a14b5d6f25c9873c78afc6b9ce038e61c88f + React-TurboModuleCxx-WinRTPort: a7fbcc51dccbd962844571af0dce4390118bf64e ReactCommon: 9929ea9d7b5437074c33caa89899b11eaffccd1c - ScreenshotManager: e6d64b9235992fa6cdf931a8fa4e149241595911 + ScreenshotManager: a2479ac2273d34c8c2c1e4b8e33fe46fb2f0fb60 SocketRocket: fccef3f9c5cedea1353a9ef6ada904fde10d6608 Yoga: 95587167f85a392e1906a571d9ed09e500087e88 YogaKit: f782866e155069a2cca2517aafea43200b01fd5a diff --git a/scripts/react_native_pods.rb b/scripts/react_native_pods.rb index 01d20250313c82..995e69448052e2 100644 --- a/scripts/react_native_pods.rb +++ b/scripts/react_native_pods.rb @@ -79,9 +79,6 @@ def use_react_native! (options={}) pod 'boost', :podspec => "#{prefix}/third-party-podspecs/boost.podspec" pod 'RCT-Folly', :podspec => "#{prefix}/third-party-podspecs/RCT-Folly.podspec" - # TODO(macOS GH#214) - pod 'boost-for-react-native', :podspec => "#{prefix}/third-party-podspecs/boost-for-react-native.podspec" - if ENV['USE_CODEGEN_DISCOVERY'] == '1' app_path = options[:app_path] config_file_dir = options[:config_file_dir] diff --git a/third-party-podspecs/boost-for-react-native.podspec b/third-party-podspecs/boost-for-react-native.podspec deleted file mode 100644 index 27caa8bc4139ac..00000000000000 --- a/third-party-podspecs/boost-for-react-native.podspec +++ /dev/null @@ -1,20 +0,0 @@ -# TODO(macOS GH#214) -Pod::Spec.new do |spec| - spec.name = 'boost-for-react-native' - spec.version = '1.63.0' - spec.license = { :type => 'Boost Software License', :file => "LICENSE_1_0.txt" } - spec.homepage = 'http://www.boost.org' - spec.summary = 'Boost provides free peer-reviewed portable C++ source libraries.' - spec.authors = 'Rene Rivera' - spec.source = { :git => 'https://github.com/react-native-community/boost-for-react-native.git', - :tag => 'v1.63.0-0' } - - # Pinning to the same version as React.podspec. - # TODO: Move this osx addition back upstream to https://github.com/react-native-community/boost-for-react-native - spec.platforms = { :ios => '8.0', :osx => "10.15" } - spec.requires_arc = false - - spec.module_name = 'boost' - spec.header_dir = 'boost' - spec.preserve_path = 'boost' -end