Skip to content
Merged
Show file tree
Hide file tree
Changes from 34 commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
c2b2e2f
add pull yml
Saadnajmi Mar 22, 2021
ab88c7d
Merge pull request #1 from microsoft/master
Saadnajmi Apr 2, 2021
7a9006b
match handleOpenURLNotification event payload with iOS (#755) (#2)
pull[bot] Apr 21, 2021
497aa72
Merge pull request #3 from microsoft/master
Saadnajmi Apr 28, 2021
1c81e5b
Merge pull request #4 from microsoft/master
Saadnajmi May 6, 2021
28aed35
Merge branch 'master' of github.com:microsoft/react-native-macos
Saadnajmi May 20, 2021
62dc473
Merge branch 'master' of github.com:Saadnajmi/react-native-macos
Saadnajmi May 20, 2021
93c7296
Merge branch 'master' of github.com:microsoft/react-native-macos
Saadnajmi May 21, 2021
780b2b7
Merge branch 'master' of github.com:microsoft/react-native-macos
Saadnajmi Jun 11, 2021
99d5182
Merge branch 'master' of github.com:microsoft/react-native-macos
Saadnajmi Aug 22, 2021
09e872d
Merge branch 'master' of github.com:microsoft/react-native-macos
Saadnajmi Sep 3, 2021
9a25530
Merge branch 'master' of github.com:microsoft/react-native-macos
Saadnajmi Oct 6, 2021
d82a01b
Merge branch 'master' of github.com:microsoft/react-native-macos
Saadnajmi Oct 12, 2021
d9faa3a
[pull] master from microsoft:master (#11)
pull[bot] Oct 14, 2021
39bd488
Merge branch 'master' of github.com:microsoft/react-native-macos
Saadnajmi Oct 21, 2021
c583ed3
Merge branch 'master' of github.com:microsoft/react-native-macos
Saadnajmi Oct 25, 2021
9cea270
Merge branch 'master' of github.com:Saadnajmi/react-native-macos
Saadnajmi Nov 7, 2021
7571092
Merge branch 'master' of github.com:microsoft/react-native-macos
Saadnajmi Nov 7, 2021
2153ef5
Merge branch 'master' of github.com:microsoft/react-native-macos
Saadnajmi Dec 8, 2021
47ee4ab
Merge branch 'microsoft:master' into master
Saadnajmi Jan 3, 2022
c74bf4d
Merge branch 'microsoft:main' into main
Saadnajmi Jan 30, 2022
5f905ef
Merge branch 'microsoft:main' into main
Saadnajmi Feb 24, 2022
2869642
Merge branch 'microsoft:main' into main
Saadnajmi Mar 7, 2022
b97b271
Merge branch 'microsoft:main' into main
Saadnajmi Apr 23, 2022
199621a
Merge branch 'main' of github.com:microsoft/react-native-macos
Saadnajmi Apr 29, 2022
5ec261f
Merge branch 'microsoft:main' into main
Saadnajmi Jun 20, 2022
81ef374
Merge branch 'main' of github.com:microsoft/react-native-macos
Saadnajmi Jul 21, 2022
c84b815
Merge branch 'main' of github.com:microsoft/react-native-macos
Saadnajmi Jul 22, 2022
e583c4d
remove boost-for-react-native
Saadnajmi Jul 22, 2022
90e099b
remove more
Saadnajmi Aug 5, 2022
86d097c
remove pull
Saadnajmi Aug 5, 2022
a2562bb
Merge branch 'main' into remove-extra-boost
Saadnajmi Aug 5, 2022
61ce011
add back header search path
Saadnajmi Aug 5, 2022
d40c151
Merge branch 'remove-extra-boost' of github.com:Saadnajmi/react-nativ…
Saadnajmi Aug 5, 2022
ab650dc
Merge branch 'main' of github.com:microsoft/react-native-macos into r…
Saadnajmi Sep 12, 2022
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 ReactTurboModuleCxx/React-TurboModuleCxx-RNW.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ 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" }
# ]TODO(macOS GH#774)

Expand Down
67 changes: 31 additions & 36 deletions packages/rn-tester/Podfile.lock
Original file line number Diff line number Diff line change
@@ -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 (1000.0.0)
Expand Down Expand Up @@ -405,7 +404,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`)
Expand Down Expand Up @@ -490,8 +488,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:
Expand Down Expand Up @@ -565,11 +561,10 @@ EXTERNAL SOURCES:

SPEC CHECKSUMS:
boost: 613e39eac4239cc72b15421247b5ab05361266a2
boost-for-react-native: 8f7c9ecfe357664c072ffbe2432569667cbf1f1b
CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
DoubleConversion: ed15e075aa758ac0e4c1f8b830bd4e4d40d669e8
FBLazyVector: b108c891d75690bc6ea373026fadff60278ba2ba
FBReactNativeSpec: 97fdaebe93fcd802dc6d15f048d3e4ff368c51c5
FBLazyVector: 77500d354186452e37e173115b6a5807fadc8b12
FBReactNativeSpec: 77c710b2f8a56ac22142e3bb75dad6f2ddb04562
Flipper: 26fc4b7382499f1281eb8cb921e5c3ad6de91fe0
Flipper-Boost-iOSX: fd1e2b8cbef7e662a122412d7ac5f5bea715403c
Flipper-DoubleConversion: 57ffbe81ef95306cc9e69c4aa3aeeeeb58a6a28c
Expand All @@ -585,39 +580,39 @@ SPEC CHECKSUMS:
OCMock: 9491e4bec59e0b267d52a9184ff5605995e74be8
OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c
RCT-Folly: 24c6da766832002a4a2aac5f79ee0ca50fbe8507
RCTRequired: d1c8013645605671f1d985dbda4340461b7b296b
RCTTypeSafety: 8703cdf1e2d03565dd2405805bc3ab95d8d1a4d3
React: a5429e9b63b6ec8eb89f48b27b7b7f75f9279660
React-callinvoker: 8073ac13522ce7838a68cbd6a5cf47c0ea36faa4
RCTRequired: 92900cdd6ad14326152a065a3a08bda5775b9714
RCTTypeSafety: 0a3b03c76d15cb8154b1dc6e8b6143cb0d1d46ec
React: 7d5488818509ec7591cc169d40fb6bc5f78c8f44
React-callinvoker: 37a5c4c9606c38748cfef65fd91cf2be4002b7a2
React-Codegen: b3fbef96f960cb15fc61250078b0700cfd4cd8a1
React-Core: 3fa6a6c91404a54b7007f201b6a3cecfa1bbbe01
React-CoreModules: 6cfd337a8ba5537091469d952a38c7c46e7ac252
React-cxxreact: 21aaaedfc51c3401ef4d32029440cc2f04ad5223
React-jsi: 693cd702f12fb19280d742885fa1e7c6c4a00fe7
React-jsiexecutor: 0159ebf6e084b3e308ee5b0d55a99364bd579bd3
React-jsinspector: f767ca2da6537ed40e0c3596f55c3bd424a57aa8
React-logger: 634c59ae87045bd453bacf893e3c2e28999bdb88
React-perflogger: 726a7f95639f3c5f6c17af49d4eb90b68ade141c
React-RCTActionSheet: 0474946a84df5c1f2d172917860801cdada01d50
React-RCTAnimation: 53e91aa377084358d8980442b00718000e53ebc6
React-RCTBlob: 4819f7b3dcb81b07b1496a927107e2119c5ff326
React-RCTImage: 6a55bb79d6991c7163b3dd1aadb1a0ec8573563c
React-RCTLinking: 5d92a811d48477c333df7955cd017c7094659933
React-RCTNetwork: 81661f0727cfcb3243d1444d413446fd939b28ac
React-RCTPushNotification: 0863b0b0e1a804d670f0a1dca70a094cb3da6e2f
React-RCTSettings: 3c770d256c89984c509e118dd6f18b22cd6ea745
React-RCTTest: eb624496d14a5486db0f147d21ac5718ce4f2e4b
React-RCTText: ff8a41a7eb7a6c200b5455596779db64e5819e03
React-RCTVibration: 5c066e3935cfc5ce986823bac69abb68180ede32
React-runtimeexecutor: 9386159203e96e1598f5ec4979c62d37616f7179
React-Core: 0bfbeae9574e9c49794afa4a5c0407d628043619
React-CoreModules: 2d035da04d01275f73f8f3d3b5a06b47a9fa3fcf
React-cxxreact: a19d55aa6296b4ec9b3ef1e0e78b83c723f950c8
React-jsi: fc624bcf84e781ed6a431c79bd8629f3f6ff72da
React-jsiexecutor: 410138a4401477bbf3dcfc1a0e3648fb7456711b
React-jsinspector: e44c9838f5c60f59ba05365e861d655fd945aba0
React-logger: 21d1b15b5684cff4a1faa490630098ef0e7d32eb
React-perflogger: b992740f097c37f97dd59213c247491b047e3719
React-RCTActionSheet: f7f4f241197b71d9fe16dcf083e18848838ce7a1
React-RCTAnimation: 2eaf92e5c019909ca6b02ec575d3ee2052f57f57
React-RCTBlob: 04ee40a1efc1c4a10de9769b3cadc450c7f0c40f
React-RCTImage: c06d79f3322229d9c856923c5f849526e561e9b5
React-RCTLinking: 05b7a433976f3858817312561bd5626379632c93
React-RCTNetwork: c35d12625476f2aaec081b3e0ca726b87b436d8e
React-RCTPushNotification: 0a4b6d09dd89391710ef170d12aa5fe284c5c499
React-RCTSettings: c86104048118bdb5f324a34182025cfa69f8beaa
React-RCTTest: c24e8762769d2892e06955d58cf1dba3c1875981
React-RCTText: 81a0208a2054d07f9103cd815f941690d4f09c85
React-RCTVibration: 23e4977f299c9aa08f449a51c8b6a9b4097092cd
React-runtimeexecutor: ddc3327a28f2fc733bc3de75aea9812a3751d4d9
React-TurboModuleCxx-RNW: f2e32cbfced49190a61d66c993a8975de79a158a
React-TurboModuleCxx-WinRTPort: 2de77e70e91d76bd77708314731fa87829150acb
ReactCommon: f8793021ace6b93a7127ff22c60c7fe4cb44cc57
ScreenshotManager: db4b25867db6c0d6e5a42037e9c2990e6a558644
React-TurboModuleCxx-WinRTPort: 51c5e43ecfa60b54fc6f88add86ed8a68be44e44
ReactCommon: 7d26fdc906aa0bc8f9fdc4ca25594589625010eb
ScreenshotManager: e50cf3bf82427278c4b9a3ee86272c62b2777659
SocketRocket: fccef3f9c5cedea1353a9ef6ada904fde10d6608
Yoga: 5ada9a2c039e30dc56c2a1966a60497dc061e7d2
Yoga: 671bc9605d8e61773f32c06bab53d03ca17474fe
YogaKit: f782866e155069a2cca2517aafea43200b01fd5a

PODFILE CHECKSUM: 2887942075d3a45ef7ee8a635fd4e81ce396f6ec

COCOAPODS: 1.11.2
COCOAPODS: 1.11.3
3 changes: 0 additions & 3 deletions scripts/react_native_pods.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
20 changes: 0 additions & 20 deletions third-party-podspecs/boost-for-react-native.podspec

This file was deleted.