Skip to content

Commit 51e9d6c

Browse files
Saadnajmipull[bot]ryanlntnntremganandraj
committed
Don't install boost twice (#1330)
* add pull yml * match handleOpenURLNotification event payload with iOS (#755) (#2) Co-authored-by: Ryan Linton <[email protected]> * [pull] master from microsoft:master (#11) * Deprecated api (#853) * Remove deprecated/unused context param * Update a few Mac deprecated APIs * Packing RN dependencies, hermes and ignoring javadoc failure, (#852) * Ignore javadoc failure * Bringing few more changes from 0.63-stable * Fixing a patch in engine selection * Fixing a patch in nuget spec * Fixing the output directory of nuget pack * Packaging dependencies in the nuget * Fix onMouseEnter/onMouseLeave callbacks not firing on Pressable (#855) * add pull yml * match handleOpenURLNotification event payload with iOS (#755) (#2) Co-authored-by: Ryan Linton <[email protected]> * fix mouse evetns on pressable * delete extra yml from this branch * Add macOS tags * reorder props to have onMouseEnter/onMouseLeave always be before onPress Co-authored-by: pull[bot] <39814207+pull[bot]@users.noreply.github.com> Co-authored-by: Ryan Linton <[email protected]> * Grammar fixes. (#856) Updates simple grammar issues. Co-authored-by: Nick Trescases <[email protected]> Co-authored-by: Anandraj <[email protected]> Co-authored-by: Saad Najmi <[email protected]> Co-authored-by: pull[bot] <39814207+pull[bot]@users.noreply.github.com> Co-authored-by: Ryan Linton <[email protected]> Co-authored-by: Muhammad Hamza Zaman <[email protected]> * remove boost-for-react-native * remove more * remove pull * add back header search path Co-authored-by: pull[bot] <39814207+pull[bot]@users.noreply.github.com> Co-authored-by: Ryan Linton <[email protected]> Co-authored-by: Nick Trescases <[email protected]> Co-authored-by: Anandraj <[email protected]> Co-authored-by: Muhammad Hamza Zaman <[email protected]>
1 parent bcd6d6d commit 51e9d6c

File tree

6 files changed

+8
-35
lines changed

6 files changed

+8
-35
lines changed

ReactTurboModuleCxx/React-TurboModuleCxx-RNW.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Pod::Spec.new do |s|
2828
"vnext/Microsoft.ReactNative.Cxx/NativeModules.h"
2929
s.library = "stdc++"
3030
s.pod_target_xcconfig = { "USE_HEADERMAP" => "YES",
31-
"HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost-for-react-native\"",
31+
"HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\"",
3232
"CLANG_CXX_LANGUAGE_STANDARD" => "c++17" }
3333

3434
s.dependency "RCT-Folly", folly_version

ReactTurboModuleCxx/React-TurboModuleCxx-WinRTPort.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Pod::Spec.new do |s|
3636
ss.source_files = "WinRT/*.{h,cpp,mm}"
3737
ss.library = "stdc++"
3838
ss.pod_target_xcconfig = { "USE_HEADERMAP" => "YES",
39-
"HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost-for-react-native\"",
39+
"HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\"",
4040
"CLANG_CXX_LANGUAGE_STANDARD" => "c++17" }
4141
ss.header_dir = "winrt"
4242

packages/rn-tester/NativeModuleExample/ScreenshotManager.podspec

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,9 @@ Pod::Spec.new do |s|
3737
# [TODO(macOS GH#774)
3838
s.osx.dependency "React-TurboModuleCxx-RNW"
3939
s.osx.pod_target_xcconfig = { "USE_HEADERMAP" => "YES",
40-
"HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost-for-react-native\"",
41-
"CLANG_CXX_LANGUAGE_STANDARD" => "c++17" }
40+
"HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\"",
41+
"CLANG_CXX_LANGUAGE_STANDARD" => "c++17",
42+
}
4243
# ]TODO(macOS GH#774)
4344

4445
# s.dependency "..."

packages/rn-tester/Podfile.lock

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
PODS:
22
- boost (1.76.0)
3-
- boost-for-react-native (1.63.0)
43
- CocoaAsyncSocket (7.6.5)
54
- DoubleConversion (1.1.6)
65
- FBLazyVector (0.68.44)
@@ -404,7 +403,6 @@ PODS:
404403

405404
DEPENDENCIES:
406405
- boost (from `../../third-party-podspecs/boost.podspec`)
407-
- boost-for-react-native (from `../../third-party-podspecs/boost-for-react-native.podspec`)
408406
- DoubleConversion (from `../../third-party-podspecs/DoubleConversion.podspec`)
409407
- FBLazyVector (from `../../Libraries/FBLazyVector`)
410408
- FBReactNativeSpec (from `../../React/FBReactNativeSpec`)
@@ -487,8 +485,6 @@ SPEC REPOS:
487485
EXTERNAL SOURCES:
488486
boost:
489487
:podspec: "../../third-party-podspecs/boost.podspec"
490-
boost-for-react-native:
491-
:podspec: "../../third-party-podspecs/boost-for-react-native.podspec"
492488
DoubleConversion:
493489
:podspec: "../../third-party-podspecs/DoubleConversion.podspec"
494490
FBLazyVector:
@@ -562,7 +558,6 @@ EXTERNAL SOURCES:
562558

563559
SPEC CHECKSUMS:
564560
boost: 613e39eac4239cc72b15421247b5ab05361266a2
565-
boost-for-react-native: 8f7c9ecfe357664c072ffbe2432569667cbf1f1b
566561
CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
567562
DoubleConversion: ed15e075aa758ac0e4c1f8b830bd4e4d40d669e8
568563
FBLazyVector: 5e3a5fcfde8511debb4f95264986a8c63f49d03a
@@ -606,10 +601,10 @@ SPEC CHECKSUMS:
606601
React-RCTText: a3d0700143c50bd62ece73aca523433b23492ef7
607602
React-RCTVibration: 8baeace58672df45939cc99431964ceb09c97118
608603
React-runtimeexecutor: b3487150849699a6c771bfb1d26121f0f1feba5f
609-
React-TurboModuleCxx-RNW: f31a1c090bea0429ed6c57a2826738eae632df08
610-
React-TurboModuleCxx-WinRTPort: 1d05288612f38976d898570dd74fb62a13592016
604+
React-TurboModuleCxx-RNW: 7865a14b5d6f25c9873c78afc6b9ce038e61c88f
605+
React-TurboModuleCxx-WinRTPort: a7fbcc51dccbd962844571af0dce4390118bf64e
611606
ReactCommon: 9929ea9d7b5437074c33caa89899b11eaffccd1c
612-
ScreenshotManager: e6d64b9235992fa6cdf931a8fa4e149241595911
607+
ScreenshotManager: a2479ac2273d34c8c2c1e4b8e33fe46fb2f0fb60
613608
SocketRocket: fccef3f9c5cedea1353a9ef6ada904fde10d6608
614609
Yoga: 95587167f85a392e1906a571d9ed09e500087e88
615610
YogaKit: f782866e155069a2cca2517aafea43200b01fd5a

scripts/react_native_pods.rb

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,6 @@ def use_react_native! (options={})
7979
pod 'boost', :podspec => "#{prefix}/third-party-podspecs/boost.podspec"
8080
pod 'RCT-Folly', :podspec => "#{prefix}/third-party-podspecs/RCT-Folly.podspec"
8181

82-
# TODO(macOS GH#214)
83-
pod 'boost-for-react-native', :podspec => "#{prefix}/third-party-podspecs/boost-for-react-native.podspec"
84-
8582
if ENV['USE_CODEGEN_DISCOVERY'] == '1'
8683
app_path = options[:app_path]
8784
config_file_dir = options[:config_file_dir]

third-party-podspecs/boost-for-react-native.podspec

Lines changed: 0 additions & 20 deletions
This file was deleted.

0 commit comments

Comments
 (0)