Skip to content

Commit 8f5b6f6

Browse files
Saadnajmipull[bot]ryanlntnntremganandraj
authored
Don't install boost twice (#1330)
* add pull yml * match handleOpenURLNotification event payload with iOS (#755) (#2) Co-authored-by: Ryan Linton <ryanlntn@gmail.com> * [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 <ryanlntn@gmail.com> * 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 <ryanlntn@gmail.com> * Grammar fixes. (#856) Updates simple grammar issues. Co-authored-by: Nick Trescases <42704557+ntre@users.noreply.github.com> Co-authored-by: Anandraj <anandrag@microsoft.com> Co-authored-by: Saad Najmi <saadnajmi2@gmail.com> Co-authored-by: pull[bot] <39814207+pull[bot]@users.noreply.github.com> Co-authored-by: Ryan Linton <ryanlntn@gmail.com> Co-authored-by: Muhammad Hamza Zaman <mh.zaman.4069@gmail.com> * 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 <ryanlntn@gmail.com> Co-authored-by: Nick Trescases <42704557+ntre@users.noreply.github.com> Co-authored-by: Anandraj <anandrag@microsoft.com> Co-authored-by: Muhammad Hamza Zaman <mh.zaman.4069@gmail.com>
1 parent af44954 commit 8f5b6f6

File tree

6 files changed

+36
-63
lines changed

6 files changed

+36
-63
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: 31 additions & 36 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 (1000.0.0)
@@ -405,7 +404,6 @@ PODS:
405404

406405
DEPENDENCIES:
407406
- boost (from `../../third-party-podspecs/boost.podspec`)
408-
- boost-for-react-native (from `../../third-party-podspecs/boost-for-react-native.podspec`)
409407
- DoubleConversion (from `../../third-party-podspecs/DoubleConversion.podspec`)
410408
- FBLazyVector (from `../../Libraries/FBLazyVector`)
411409
- FBReactNativeSpec (from `../../React/FBReactNativeSpec`)
@@ -490,8 +488,6 @@ SPEC REPOS:
490488
EXTERNAL SOURCES:
491489
boost:
492490
:podspec: "../../third-party-podspecs/boost.podspec"
493-
boost-for-react-native:
494-
:podspec: "../../third-party-podspecs/boost-for-react-native.podspec"
495491
DoubleConversion:
496492
:podspec: "../../third-party-podspecs/DoubleConversion.podspec"
497493
FBLazyVector:
@@ -565,11 +561,10 @@ EXTERNAL SOURCES:
565561

566562
SPEC CHECKSUMS:
567563
boost: 613e39eac4239cc72b15421247b5ab05361266a2
568-
boost-for-react-native: 8f7c9ecfe357664c072ffbe2432569667cbf1f1b
569564
CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
570565
DoubleConversion: ed15e075aa758ac0e4c1f8b830bd4e4d40d669e8
571-
FBLazyVector: 35b18537ecc3a2461a885e5249945da03482a4e7
572-
FBReactNativeSpec: 8dedae72c67e05603f9408b7ff5f677d59ff92d4
566+
FBLazyVector: 8c015ab0962fa7ca8b83a2f85486553ee12fa2c3
567+
FBReactNativeSpec: d5e0e1eab0166d3998da480c3277a4fc9d5beef9
573568
Flipper: 26fc4b7382499f1281eb8cb921e5c3ad6de91fe0
574569
Flipper-Boost-iOSX: fd1e2b8cbef7e662a122412d7ac5f5bea715403c
575570
Flipper-DoubleConversion: 57ffbe81ef95306cc9e69c4aa3aeeeeb58a6a28c
@@ -585,37 +580,37 @@ SPEC CHECKSUMS:
585580
OCMock: 9491e4bec59e0b267d52a9184ff5605995e74be8
586581
OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c
587582
RCT-Folly: 24c6da766832002a4a2aac5f79ee0ca50fbe8507
588-
RCTRequired: f5fa1ec23428c9197116314fc2dcca3f931d10d6
589-
RCTTypeSafety: 613b497d3e3c9775b5338a5b893fe312116bee99
590-
React: 3aab012ad8923b879d6f56316b7a734984e1409a
591-
React-callinvoker: ff94f9f26c62112b4cea78611593052e91f436fc
583+
RCTRequired: 1efc34e0e287a4e1b514fcc9e163651c44c3dd9d
584+
RCTTypeSafety: 239fff897dcb1fe657556057955c7e571d201d94
585+
React: 0bb0907e6c1cd7ab1d1944c513fb8a278724135d
586+
React-callinvoker: d982ccf1b8ac51b93deee087cb8ca5af41269e70
592587
React-Codegen: b3fbef96f960cb15fc61250078b0700cfd4cd8a1
593-
React-Core: 39770c6bdef3d63c40679d854b5370263cc0e30f
594-
React-CoreModules: 841d0e71c04409eb26f2f8b616fcab1e7982978c
595-
React-cxxreact: 35f56b3e915d5905e8fc479ae67b6adb4da23f47
596-
React-jsi: d200345c4f26faf40c19c79d977f0a8b09658b06
597-
React-jsiexecutor: a4ca48df1ef597ed320f3356276e65acf7f02c3e
598-
React-jsinspector: 816af5ca53e3ce409fcd96864a28484833511100
599-
React-logger: fde4e68ea54d421cabc20ff1e03d717e22b014b3
600-
React-perflogger: 727132c85210ff6662454e33d66ec1cb5099544d
601-
React-RCTActionSheet: 8efaa1b67754e0f2b66a17c10a2eb8f65eab1875
602-
React-RCTAnimation: dda2a7bfdc07f687ef31494bcbe7362e0866936f
603-
React-RCTBlob: 61d77dfe96034ee17298adc1974baecb50b15d3c
604-
React-RCTImage: 213c6c2df68d4f405c1900b25953cb7ce4b23b10
605-
React-RCTLinking: 8fa4585d6cb937715cb1b3e8d7622a75a7ffe61e
606-
React-RCTNetwork: 15c304f62bf3e9ecc0f6830bb0a3790c2ccf3b9a
607-
React-RCTPushNotification: d6149589e44dc141bee2594b5a900aafc012f91c
608-
React-RCTSettings: 3ff5d0d9c3ba4b5f5cd714aa1c7614a2e78d1b04
609-
React-RCTTest: cd57dece9555a129cb29992f4c9d9f2392da9a4d
610-
React-RCTText: 9274b0cd3c1c61aba7c3a4f397eff3e1dec2fefe
611-
React-RCTVibration: 8f2fb21aa06a3cd077b2f7adc20fdac92430fa64
612-
React-runtimeexecutor: 9eff48b0b754b6f39b26588642b02770a1ebf747
613-
React-TurboModuleCxx-RNW: f2e32cbfced49190a61d66c993a8975de79a158a
614-
React-TurboModuleCxx-WinRTPort: 68fb0acf2cae761d68b2cd06506a814b27099bc7
615-
ReactCommon: a9c9befde9a6d1646dd5c5700ae65eb42134fdeb
616-
ScreenshotManager: 1704bd762dccfafbdb1efa1fc0dab28d4f53e0c2
588+
React-Core: 7388e919ba68e29e2068bb2dc4c83ee0e176c277
589+
React-CoreModules: 7424cb36a2e91d9af6b01d1b20c9701a2fcdc322
590+
React-cxxreact: d7be72a8ac63c058dff0da14a2340e461dee5a06
591+
React-jsi: 6679d5fd952443b2945ad502f8f592f5a61916db
592+
React-jsiexecutor: 8a92c56f39dbbaaf23b834b78a4aa950ac61f1f3
593+
React-jsinspector: f5d9b01ea66dd10e25ed711a73e7b370c5f6a00b
594+
React-logger: a87dbd13ef3409c729c9900954d19b3f0af0c57d
595+
React-perflogger: 63baa12c036f63a56a591806089cba2178bfa5ce
596+
React-RCTActionSheet: 657e35f1549f792ff8cb2175165a2e34eacc405e
597+
React-RCTAnimation: 661b7b7d6b9244103f34a691a2a17cf08b870cda
598+
React-RCTBlob: d033f8473850f445c0043bd17a53ac768d8ae003
599+
React-RCTImage: f0ec96d288e9a97bdad40a91aa9371e5859db561
600+
React-RCTLinking: 245902d2b32f1934b776add9af6fa6d13418b036
601+
React-RCTNetwork: 51aba5631b28b959225ff1cc7e270975e571f1c6
602+
React-RCTPushNotification: 0ce584762d852b8e7fb4ab76d531e2ce13ff2ca3
603+
React-RCTSettings: d2c584eedf27f3e127e7c4e4ab8628e58b615782
604+
React-RCTTest: 8e9fdc24c24ece07e0e5b3c3e1424c160025d194
605+
React-RCTText: 9f60e6cc120fff66ebed92077d076210d203ffb1
606+
React-RCTVibration: cd53df9d069038a6caa7274481f9cd94d0ea53f3
607+
React-runtimeexecutor: 792724a76f30693d1db43dd2f5e96d7858adbf36
608+
React-TurboModuleCxx-RNW: 881411415eafe818f9cc3c4016167cc3d219402b
609+
React-TurboModuleCxx-WinRTPort: 50cd9648f6b21aab53d1c62c466dc6567263a983
610+
ReactCommon: cbfca257bdf2378d6036321c28ad21765b833f3a
611+
ScreenshotManager: b378292226c78474e70b139ba2e19f584836c520
617612
SocketRocket: fccef3f9c5cedea1353a9ef6ada904fde10d6608
618-
Yoga: 494a90bd4210f26c9d17bc6197ab12d93dc04609
613+
Yoga: ddfd728ee27a2b67dfdd249da09a6393d6d5514d
619614
YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
620615

621616
PODFILE CHECKSUM: cbf4f9be33910397d5f84dd4fcbe56d3d61d42fa

‎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)