From 169c9a40263a561a8133edabd7d786be57a3ad43 Mon Sep 17 00:00:00 2001 From: Kudo Chien Date: Fri, 4 Mar 2022 17:37:02 +0800 Subject: [PATCH 1/6] [ios] fix use_frameworks! for old architecture --- Libraries/Blob/RCTBlobManager.mm | 2 +- Libraries/Blob/RCTFileReaderModule.mm | 2 +- Libraries/Blob/React-RCTBlob.podspec | 4 ++-- Libraries/Image/RCTImageEditingManager.mm | 2 +- Libraries/Image/RCTImageLoader.mm | 2 +- Libraries/Image/RCTImageStoreManager.mm | 2 +- Libraries/Image/React-RCTImage.podspec | 4 ++-- Libraries/LinkingIOS/RCTLinkingManager.mm | 2 +- Libraries/LinkingIOS/React-RCTLinking.podspec | 4 ++-- .../NativeAnimation/RCTNativeAnimatedModule.mm | 2 +- .../RCTNativeAnimatedTurboModule.mm | 2 +- .../NativeAnimation/React-RCTAnimation.podspec | 4 ++-- Libraries/Network/RCTNetworking.mm | 2 +- Libraries/Network/React-RCTNetwork.podspec | 4 ++-- .../RCTPushNotificationManager.mm | 2 +- .../React-RCTPushNotification.podspec | 4 ++-- Libraries/Settings/RCTSettingsManager.mm | 2 +- Libraries/Settings/React-RCTSettings.podspec | 4 ++-- Libraries/Vibration/RCTVibration.mm | 2 +- Libraries/Vibration/React-RCTVibration.podspec | 4 ++-- React/CoreModules/RCTAccessibilityManager.mm | 2 +- React/CoreModules/RCTActionSheetManager.mm | 2 +- React/CoreModules/RCTAlertManager.mm | 2 +- React/CoreModules/RCTAppState.mm | 2 +- React/CoreModules/RCTAppearance.mm | 2 +- React/CoreModules/RCTAsyncLocalStorage.mm | 2 +- React/CoreModules/RCTClipboard.mm | 2 +- React/CoreModules/RCTDevLoadingView.mm | 2 +- React/CoreModules/RCTDevMenu.mm | 2 +- React/CoreModules/RCTDevSettings.mm | 2 +- React/CoreModules/RCTDevSplitBundleLoader.mm | 2 +- React/CoreModules/RCTDeviceInfo.mm | 2 +- React/CoreModules/RCTExceptionsManager.mm | 2 +- React/CoreModules/RCTI18nManager.mm | 2 +- React/CoreModules/RCTKeyboardObserver.mm | 2 +- React/CoreModules/RCTLogBox.mm | 2 +- React/CoreModules/RCTPlatform.mm | 2 +- React/CoreModules/RCTRedBox.mm | 2 +- React/CoreModules/RCTSourceCode.mm | 2 +- React/CoreModules/RCTStatusBarManager.mm | 2 +- React/CoreModules/RCTTiming.mm | 2 +- React/CoreModules/RCTWebSocketModule.mm | 2 +- React/CoreModules/React-CoreModules.podspec | 4 ++-- React/React-RCTFabric.podspec | 2 +- .../NativeComponentExample/MyNativeView.podspec | 2 +- scripts/react_native_pods.rb | 14 +++++++------- 46 files changed, 61 insertions(+), 61 deletions(-) diff --git a/Libraries/Blob/RCTBlobManager.mm b/Libraries/Blob/RCTBlobManager.mm index 567e16ffee56c1..e5968f3bc3a2bc 100755 --- a/Libraries/Blob/RCTBlobManager.mm +++ b/Libraries/Blob/RCTBlobManager.mm @@ -9,7 +9,7 @@ #import -#import +#import #import #import #import diff --git a/Libraries/Blob/RCTFileReaderModule.mm b/Libraries/Blob/RCTFileReaderModule.mm index e834c61cc7970f..1c744d284f9655 100644 --- a/Libraries/Blob/RCTFileReaderModule.mm +++ b/Libraries/Blob/RCTFileReaderModule.mm @@ -8,7 +8,7 @@ #import -#import +#import #import #import diff --git a/Libraries/Blob/React-RCTBlob.podspec b/Libraries/Blob/React-RCTBlob.podspec index c5eb26e7aab7eb..b245f2ca17c6bb 100644 --- a/Libraries/Blob/React-RCTBlob.podspec +++ b/Libraries/Blob/React-RCTBlob.podspec @@ -35,11 +35,11 @@ Pod::Spec.new do |s| s.pod_target_xcconfig = { "USE_HEADERMAP" => "YES", "CLANG_CXX_LANGUAGE_STANDARD" => "c++17", - "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\"" + "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/ReactCodegen/react/renderer/components\"" } s.dependency "RCT-Folly", folly_version - s.dependency "React-Codegen", version + s.dependency "ReactCodegen", version s.dependency "ReactCommon/turbomodule/core", version s.dependency "React-jsi", version s.dependency "React-Core/RCTBlobHeaders", version diff --git a/Libraries/Image/RCTImageEditingManager.mm b/Libraries/Image/RCTImageEditingManager.mm index 1f75fe3006f8d9..d4337b2b71126a 100644 --- a/Libraries/Image/RCTImageEditingManager.mm +++ b/Libraries/Image/RCTImageEditingManager.mm @@ -7,7 +7,7 @@ #import -#import +#import #import #import #import diff --git a/Libraries/Image/RCTImageLoader.mm b/Libraries/Image/RCTImageLoader.mm index 39e33ecdd285a6..4a1b880520b044 100644 --- a/Libraries/Image/RCTImageLoader.mm +++ b/Libraries/Image/RCTImageLoader.mm @@ -11,7 +11,7 @@ #import -#import +#import #import #import #import diff --git a/Libraries/Image/RCTImageStoreManager.mm b/Libraries/Image/RCTImageStoreManager.mm index c62ad09275372f..3f64716ff09878 100644 --- a/Libraries/Image/RCTImageStoreManager.mm +++ b/Libraries/Image/RCTImageStoreManager.mm @@ -10,7 +10,7 @@ #import #import -#import +#import #import #import #import diff --git a/Libraries/Image/React-RCTImage.podspec b/Libraries/Image/React-RCTImage.podspec index 704d80662cd7e9..645b444f8c0328 100644 --- a/Libraries/Image/React-RCTImage.podspec +++ b/Libraries/Image/React-RCTImage.podspec @@ -36,11 +36,11 @@ Pod::Spec.new do |s| s.pod_target_xcconfig = { "USE_HEADERMAP" => "YES", "CLANG_CXX_LANGUAGE_STANDARD" => "c++17", - "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\"" + "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/ReactCodegen/react/renderer/components\"" } s.dependency "RCT-Folly", folly_version - s.dependency "React-Codegen", version + s.dependency "ReactCodegen", version s.dependency "RCTTypeSafety", version s.dependency "ReactCommon/turbomodule/core", version s.dependency "React-jsi", version diff --git a/Libraries/LinkingIOS/RCTLinkingManager.mm b/Libraries/LinkingIOS/RCTLinkingManager.mm index dc45866b7a0188..79495fedf64646 100644 --- a/Libraries/LinkingIOS/RCTLinkingManager.mm +++ b/Libraries/LinkingIOS/RCTLinkingManager.mm @@ -7,7 +7,7 @@ #import -#import +#import #import #import #import diff --git a/Libraries/LinkingIOS/React-RCTLinking.podspec b/Libraries/LinkingIOS/React-RCTLinking.podspec index bb1de98b3d3d52..65e61ca27caaa7 100644 --- a/Libraries/LinkingIOS/React-RCTLinking.podspec +++ b/Libraries/LinkingIOS/React-RCTLinking.podspec @@ -36,10 +36,10 @@ Pod::Spec.new do |s| s.pod_target_xcconfig = { "USE_HEADERMAP" => "YES", "CLANG_CXX_LANGUAGE_STANDARD" => "c++17", - "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\"" + "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/ReactCodegen/react/renderer/components\"" } - s.dependency "React-Codegen", version + s.dependency "ReactCodegen", version s.dependency "React-Core/RCTLinkingHeaders", version s.dependency "ReactCommon/turbomodule/core", version s.dependency "React-jsi", version diff --git a/Libraries/NativeAnimation/RCTNativeAnimatedModule.mm b/Libraries/NativeAnimation/RCTNativeAnimatedModule.mm index ddf060b2adc00b..6be0ecdf96d295 100644 --- a/Libraries/NativeAnimation/RCTNativeAnimatedModule.mm +++ b/Libraries/NativeAnimation/RCTNativeAnimatedModule.mm @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import +#import #import #import #import diff --git a/Libraries/NativeAnimation/RCTNativeAnimatedTurboModule.mm b/Libraries/NativeAnimation/RCTNativeAnimatedTurboModule.mm index 0e3be345049bc6..985d219609ceb8 100644 --- a/Libraries/NativeAnimation/RCTNativeAnimatedTurboModule.mm +++ b/Libraries/NativeAnimation/RCTNativeAnimatedTurboModule.mm @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import +#import #import #import #import diff --git a/Libraries/NativeAnimation/React-RCTAnimation.podspec b/Libraries/NativeAnimation/React-RCTAnimation.podspec index d4b9cd0b13a167..ef0fcf6b6061e6 100644 --- a/Libraries/NativeAnimation/React-RCTAnimation.podspec +++ b/Libraries/NativeAnimation/React-RCTAnimation.podspec @@ -35,11 +35,11 @@ Pod::Spec.new do |s| s.pod_target_xcconfig = { "USE_HEADERMAP" => "YES", "CLANG_CXX_LANGUAGE_STANDARD" => "c++17", - "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\"" + "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/ReactCodegen/react/renderer/components\"" } s.dependency "RCT-Folly", folly_version - s.dependency "React-Codegen", version + s.dependency "ReactCodegen", version s.dependency "RCTTypeSafety", version s.dependency "ReactCommon/turbomodule/core", version s.dependency "React-jsi", version diff --git a/Libraries/Network/RCTNetworking.mm b/Libraries/Network/RCTNetworking.mm index c9004d648bed33..3b7a34d10bd4bf 100644 --- a/Libraries/Network/RCTNetworking.mm +++ b/Libraries/Network/RCTNetworking.mm @@ -8,7 +8,7 @@ #import -#import +#import #import #import #import diff --git a/Libraries/Network/React-RCTNetwork.podspec b/Libraries/Network/React-RCTNetwork.podspec index 3fde6323d94e3a..98a9221966301c 100644 --- a/Libraries/Network/React-RCTNetwork.podspec +++ b/Libraries/Network/React-RCTNetwork.podspec @@ -35,12 +35,12 @@ Pod::Spec.new do |s| s.pod_target_xcconfig = { "USE_HEADERMAP" => "YES", "CLANG_CXX_LANGUAGE_STANDARD" => "c++17", - "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\"" + "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/ReactCodegen/react/renderer/components\"" } s.frameworks = "MobileCoreServices" s.dependency "RCT-Folly", folly_version - s.dependency "React-Codegen", version + s.dependency "ReactCodegen", version s.dependency "RCTTypeSafety", version s.dependency "ReactCommon/turbomodule/core", version s.dependency "React-jsi", version diff --git a/Libraries/PushNotificationIOS/RCTPushNotificationManager.mm b/Libraries/PushNotificationIOS/RCTPushNotificationManager.mm index 68b120104419c1..49562bd2826be4 100644 --- a/Libraries/PushNotificationIOS/RCTPushNotificationManager.mm +++ b/Libraries/PushNotificationIOS/RCTPushNotificationManager.mm @@ -9,7 +9,7 @@ #import -#import +#import #import #import #import diff --git a/Libraries/PushNotificationIOS/React-RCTPushNotification.podspec b/Libraries/PushNotificationIOS/React-RCTPushNotification.podspec index f7dcee8601282a..7e04b055d09a43 100644 --- a/Libraries/PushNotificationIOS/React-RCTPushNotification.podspec +++ b/Libraries/PushNotificationIOS/React-RCTPushNotification.podspec @@ -36,11 +36,11 @@ Pod::Spec.new do |s| s.pod_target_xcconfig = { "USE_HEADERMAP" => "YES", "CLANG_CXX_LANGUAGE_STANDARD" => "c++17", - "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\"" + "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/ReactCodegen/react/renderer/components\"" } s.framework = "UserNotifications" - s.dependency "React-Codegen", version + s.dependency "ReactCodegen", version s.dependency "RCTTypeSafety", version s.dependency "React-Core/RCTPushNotificationHeaders", version s.dependency "ReactCommon/turbomodule/core", version diff --git a/Libraries/Settings/RCTSettingsManager.mm b/Libraries/Settings/RCTSettingsManager.mm index 4badb6068eba3e..acc57ef1b4e11f 100644 --- a/Libraries/Settings/RCTSettingsManager.mm +++ b/Libraries/Settings/RCTSettingsManager.mm @@ -7,7 +7,7 @@ #import -#import +#import #import #import #import diff --git a/Libraries/Settings/React-RCTSettings.podspec b/Libraries/Settings/React-RCTSettings.podspec index 72557510f2ab76..be82ada4eff1d9 100644 --- a/Libraries/Settings/React-RCTSettings.podspec +++ b/Libraries/Settings/React-RCTSettings.podspec @@ -36,11 +36,11 @@ Pod::Spec.new do |s| s.pod_target_xcconfig = { "USE_HEADERMAP" => "YES", "CLANG_CXX_LANGUAGE_STANDARD" => "c++17", - "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\"" + "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/ReactCodegen/react/renderer/components\"" } s.dependency "RCT-Folly", folly_version - s.dependency "React-Codegen", version + s.dependency "ReactCodegen", version s.dependency "RCTTypeSafety", version s.dependency "ReactCommon/turbomodule/core", version s.dependency "React-jsi", version diff --git a/Libraries/Vibration/RCTVibration.mm b/Libraries/Vibration/RCTVibration.mm index 68e4669d60c711..384dfd83f06374 100644 --- a/Libraries/Vibration/RCTVibration.mm +++ b/Libraries/Vibration/RCTVibration.mm @@ -8,7 +8,7 @@ #import #import -#import +#import #import #import "RCTVibrationPlugins.h" diff --git a/Libraries/Vibration/React-RCTVibration.podspec b/Libraries/Vibration/React-RCTVibration.podspec index 4ac3a6387c830a..838af73100db00 100644 --- a/Libraries/Vibration/React-RCTVibration.podspec +++ b/Libraries/Vibration/React-RCTVibration.podspec @@ -36,12 +36,12 @@ Pod::Spec.new do |s| s.pod_target_xcconfig = { "USE_HEADERMAP" => "YES", "CLANG_CXX_LANGUAGE_STANDARD" => "c++17", - "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\"" + "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/ReactCodegen/react/renderer/components\"" } s.frameworks = "AudioToolbox" s.dependency "RCT-Folly", folly_version - s.dependency "React-Codegen", version + s.dependency "ReactCodegen", version s.dependency "ReactCommon/turbomodule/core", version s.dependency "React-jsi", version s.dependency "React-Core/RCTVibrationHeaders", version diff --git a/React/CoreModules/RCTAccessibilityManager.mm b/React/CoreModules/RCTAccessibilityManager.mm index f7ee29c812c1a4..7817a43dc9194a 100644 --- a/React/CoreModules/RCTAccessibilityManager.mm +++ b/React/CoreModules/RCTAccessibilityManager.mm @@ -8,7 +8,7 @@ #import "RCTAccessibilityManager.h" #import "RCTAccessibilityManager+Internal.h" -#import +#import #import #import #import diff --git a/React/CoreModules/RCTActionSheetManager.mm b/React/CoreModules/RCTActionSheetManager.mm index e2b579244de69f..7fcb886583235d 100644 --- a/React/CoreModules/RCTActionSheetManager.mm +++ b/React/CoreModules/RCTActionSheetManager.mm @@ -13,7 +13,7 @@ #import #import -#import +#import #import #import "CoreModulesPlugins.h" diff --git a/React/CoreModules/RCTAlertManager.mm b/React/CoreModules/RCTAlertManager.mm index c4a1cde52dcbeb..39358f31d08eb7 100644 --- a/React/CoreModules/RCTAlertManager.mm +++ b/React/CoreModules/RCTAlertManager.mm @@ -7,7 +7,7 @@ #import "RCTAlertManager.h" -#import +#import #import #import #import diff --git a/React/CoreModules/RCTAppState.mm b/React/CoreModules/RCTAppState.mm index 5de33f4b037d1c..58f18de4b1c70f 100644 --- a/React/CoreModules/RCTAppState.mm +++ b/React/CoreModules/RCTAppState.mm @@ -7,7 +7,7 @@ #import "RCTAppState.h" -#import +#import #import #import #import diff --git a/React/CoreModules/RCTAppearance.mm b/React/CoreModules/RCTAppearance.mm index 71259d4a98d119..e4f692d11a2fb0 100644 --- a/React/CoreModules/RCTAppearance.mm +++ b/React/CoreModules/RCTAppearance.mm @@ -7,7 +7,7 @@ #import "RCTAppearance.h" -#import +#import #import #import diff --git a/React/CoreModules/RCTAsyncLocalStorage.mm b/React/CoreModules/RCTAsyncLocalStorage.mm index 326ea78f8d69db..02eabb75f18760 100644 --- a/React/CoreModules/RCTAsyncLocalStorage.mm +++ b/React/CoreModules/RCTAsyncLocalStorage.mm @@ -11,7 +11,7 @@ #import #import -#import +#import #import #import diff --git a/React/CoreModules/RCTClipboard.mm b/React/CoreModules/RCTClipboard.mm index 2dc098a4730273..f30a6609f607e8 100644 --- a/React/CoreModules/RCTClipboard.mm +++ b/React/CoreModules/RCTClipboard.mm @@ -7,7 +7,7 @@ #import "RCTClipboard.h" -#import +#import #import #import "CoreModulesPlugins.h" diff --git a/React/CoreModules/RCTDevLoadingView.mm b/React/CoreModules/RCTDevLoadingView.mm index 316c2489207d1d..4fdceed5161826 100644 --- a/React/CoreModules/RCTDevLoadingView.mm +++ b/React/CoreModules/RCTDevLoadingView.mm @@ -9,7 +9,7 @@ #import -#import +#import #import #import #import diff --git a/React/CoreModules/RCTDevMenu.mm b/React/CoreModules/RCTDevMenu.mm index 6d47652b6afe42..7024e3e2b94b22 100644 --- a/React/CoreModules/RCTDevMenu.mm +++ b/React/CoreModules/RCTDevMenu.mm @@ -7,7 +7,7 @@ #import -#import +#import #import #import #import diff --git a/React/CoreModules/RCTDevSettings.mm b/React/CoreModules/RCTDevSettings.mm index 837865b5477fe7..39c9089f0c0067 100644 --- a/React/CoreModules/RCTDevSettings.mm +++ b/React/CoreModules/RCTDevSettings.mm @@ -9,7 +9,7 @@ #import -#import +#import #import #import #import diff --git a/React/CoreModules/RCTDevSplitBundleLoader.mm b/React/CoreModules/RCTDevSplitBundleLoader.mm index 8eb756db0e0232..27d2edb673d6c1 100644 --- a/React/CoreModules/RCTDevSplitBundleLoader.mm +++ b/React/CoreModules/RCTDevSplitBundleLoader.mm @@ -7,7 +7,7 @@ #import -#import +#import #import #import #import diff --git a/React/CoreModules/RCTDeviceInfo.mm b/React/CoreModules/RCTDeviceInfo.mm index b948e8e479b726..03f3e57e073d7a 100644 --- a/React/CoreModules/RCTDeviceInfo.mm +++ b/React/CoreModules/RCTDeviceInfo.mm @@ -7,7 +7,7 @@ #import "RCTDeviceInfo.h" -#import +#import #import #import #import diff --git a/React/CoreModules/RCTExceptionsManager.mm b/React/CoreModules/RCTExceptionsManager.mm index ca1aafca6d4a34..b3300d5d12c0eb 100644 --- a/React/CoreModules/RCTExceptionsManager.mm +++ b/React/CoreModules/RCTExceptionsManager.mm @@ -7,7 +7,7 @@ #import "RCTExceptionsManager.h" -#import +#import #import #import #import diff --git a/React/CoreModules/RCTI18nManager.mm b/React/CoreModules/RCTI18nManager.mm index 7d3b9eaa11cf1a..dc4858286a142a 100644 --- a/React/CoreModules/RCTI18nManager.mm +++ b/React/CoreModules/RCTI18nManager.mm @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import +#import #import #import "RCTI18nManager.h" diff --git a/React/CoreModules/RCTKeyboardObserver.mm b/React/CoreModules/RCTKeyboardObserver.mm index ce483ddceb95fc..df4ab97c2728c8 100644 --- a/React/CoreModules/RCTKeyboardObserver.mm +++ b/React/CoreModules/RCTKeyboardObserver.mm @@ -7,7 +7,7 @@ #import "RCTKeyboardObserver.h" -#import +#import #import #import "CoreModulesPlugins.h" diff --git a/React/CoreModules/RCTLogBox.mm b/React/CoreModules/RCTLogBox.mm index d8113e96b5fb2c..b99d7604ab9a12 100644 --- a/React/CoreModules/RCTLogBox.mm +++ b/React/CoreModules/RCTLogBox.mm @@ -7,7 +7,7 @@ #import "RCTLogBox.h" -#import +#import #import #import #import diff --git a/React/CoreModules/RCTPlatform.mm b/React/CoreModules/RCTPlatform.mm index bf0fed1cdff19c..fb1ea54e03e080 100644 --- a/React/CoreModules/RCTPlatform.mm +++ b/React/CoreModules/RCTPlatform.mm @@ -9,7 +9,7 @@ #import -#import +#import #import #import diff --git a/React/CoreModules/RCTRedBox.mm b/React/CoreModules/RCTRedBox.mm index 4d86309b064727..792738aa84af93 100644 --- a/React/CoreModules/RCTRedBox.mm +++ b/React/CoreModules/RCTRedBox.mm @@ -7,7 +7,7 @@ #import "RCTRedBox.h" -#import +#import #import #import #import diff --git a/React/CoreModules/RCTSourceCode.mm b/React/CoreModules/RCTSourceCode.mm index 2589b34d3daafc..6a8aa9b363aff6 100644 --- a/React/CoreModules/RCTSourceCode.mm +++ b/React/CoreModules/RCTSourceCode.mm @@ -7,7 +7,7 @@ #import "RCTSourceCode.h" -#import +#import #import diff --git a/React/CoreModules/RCTStatusBarManager.mm b/React/CoreModules/RCTStatusBarManager.mm index 19d1d8f89ba9ee..0ce161450c85d9 100644 --- a/React/CoreModules/RCTStatusBarManager.mm +++ b/React/CoreModules/RCTStatusBarManager.mm @@ -12,7 +12,7 @@ #import #import -#import +#import @implementation RCTConvert (UIStatusBar) diff --git a/React/CoreModules/RCTTiming.mm b/React/CoreModules/RCTTiming.mm index 13d0d57296bbba..1587c622821078 100644 --- a/React/CoreModules/RCTTiming.mm +++ b/React/CoreModules/RCTTiming.mm @@ -7,7 +7,7 @@ #import "RCTTiming.h" -#import +#import #import #import diff --git a/React/CoreModules/RCTWebSocketModule.mm b/React/CoreModules/RCTWebSocketModule.mm index c099328eaff69b..3f8907e9b32c5b 100644 --- a/React/CoreModules/RCTWebSocketModule.mm +++ b/React/CoreModules/RCTWebSocketModule.mm @@ -9,7 +9,7 @@ #import -#import +#import #import #import #import diff --git a/React/CoreModules/React-CoreModules.podspec b/React/CoreModules/React-CoreModules.podspec index ce310b4c546ea5..b0dd428e0678b5 100644 --- a/React/CoreModules/React-CoreModules.podspec +++ b/React/CoreModules/React-CoreModules.podspec @@ -34,10 +34,10 @@ Pod::Spec.new do |s| s.pod_target_xcconfig = { "USE_HEADERMAP" => "YES", "CLANG_CXX_LANGUAGE_STANDARD" => "c++17", - "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/React/CoreModules\" \"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\"" + "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/React/CoreModules\" \"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/ReactCodegen/react/renderer/components\"" } - s.dependency "React-Codegen", version + s.dependency "ReactCodegen", version s.dependency "RCT-Folly", folly_version s.dependency "RCTTypeSafety", version s.dependency "React-Core/CoreModulesHeaders", version diff --git a/React/React-RCTFabric.podspec b/React/React-RCTFabric.podspec index f15c1b7d89e1bc..5d007c82c84ce2 100644 --- a/React/React-RCTFabric.podspec +++ b/React/React-RCTFabric.podspec @@ -36,7 +36,7 @@ Pod::Spec.new do |s| s.compiler_flags = folly_compiler_flags + ' ' + boost_compiler_flags s.header_dir = "React" s.framework = "JavaScriptCore" - s.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/Headers/Private/React-Core\" \"$(PODS_ROOT)/Headers/Public/React-Codegen\"" } + s.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/Headers/Private/React-Core\" \"$(PODS_ROOT)/Headers/Public/ReactCodegen\"" } s.xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/glog\" \"$(PODS_ROOT)/RCT-Folly\"", "CLANG_CXX_LANGUAGE_STANDARD" => "c++17", "OTHER_CFLAGS" => "$(inherited) -DRN_FABRIC_ENABLED" + " " + folly_flags } diff --git a/packages/rn-tester/NativeComponentExample/MyNativeView.podspec b/packages/rn-tester/NativeComponentExample/MyNativeView.podspec index 51bd7950a176a8..433588ff09b9a9 100644 --- a/packages/rn-tester/NativeComponentExample/MyNativeView.podspec +++ b/packages/rn-tester/NativeComponentExample/MyNativeView.podspec @@ -33,7 +33,7 @@ Pod::Spec.new do |s| s.dependency "React" s.dependency "React-RCTFabric" - s.dependency "React-Codegen" + s.dependency "ReactCodegen" s.dependency "RCTRequired" s.dependency "RCTTypeSafety" s.dependency "ReactCommon/turbomodule/core" diff --git a/scripts/react_native_pods.rb b/scripts/react_native_pods.rb index 928317cad46237..1a9462603aebbc 100644 --- a/scripts/react_native_pods.rb +++ b/scripts/react_native_pods.rb @@ -95,7 +95,7 @@ def use_react_native! (options={}) generate_react_codegen_podspec!(react_codegen_spec) end - pod 'React-Codegen', :path => $CODEGEN_OUTPUT_DIR + pod 'ReactCodegen', :path => $CODEGEN_OUTPUT_DIR if fabric_enabled checkAndGenerateEmptyThirdPartyProvider!(prefix) @@ -349,7 +349,7 @@ def get_react_codegen_spec(options={}) boost_compiler_flags = '-Wno-documentation' spec = { - 'name' => "React-Codegen", + 'name' => "ReactCodegen", 'version' => version, 'summary' => 'Temp pod for generated files for React Native', 'homepage' => 'https://facebook.com/', @@ -366,7 +366,7 @@ def get_react_codegen_spec(options={}) [ "\"$(PODS_ROOT)/boost\"", "\"$(PODS_ROOT)/RCT-Folly\"", - "\"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\"", + "\"${PODS_ROOT}/Headers/Public/ReactCodegen/react/renderer/components\"", "\"$(PODS_ROOT)/Headers/Private/React-Fabric\"", "\"$(PODS_ROOT)/Headers/Private/React-RCTFabric\"", ].join(' ') @@ -391,7 +391,7 @@ def get_react_codegen_spec(options={}) end if script_phases - Pod::UI.puts "[Codegen] Adding script_phases to React-Codegen." + Pod::UI.puts "[Codegen] Adding script_phases to ReactCodegen." spec[:'script_phases'] = script_phases end @@ -472,14 +472,14 @@ def generate_react_codegen_podspec!(spec) # This podspec file should only be create once in the session/pod install. # This happens when multiple targets are calling use_react_native!. if has_react_codegen_podspec_generated() - Pod::UI.puts "[Codegen] Skipping React-Codegen podspec generation." + Pod::UI.puts "[Codegen] Skipping ReactCodegen podspec generation." return end relative_installation_root = Pod::Config.instance.installation_root.relative_path_from(Pathname.pwd) output_dir = "#{relative_installation_root}/#{$CODEGEN_OUTPUT_DIR}" Pod::Executable.execute_command("mkdir", ["-p", output_dir]); - podspec_path = File.join(output_dir, 'React-Codegen.podspec.json') + podspec_path = File.join(output_dir, 'ReactCodegen.podspec.json') Pod::UI.puts "[Codegen] Generating #{podspec_path}" File.open(podspec_path, 'w') do |f| @@ -516,7 +516,7 @@ def use_react_native_codegen_discovery!(options={}) exit 1 end - # Generate React-Codegen podspec here to add the script phases. + # Generate ReactCodegen podspec here to add the script phases. script_phases = get_react_codegen_script_phases(options) react_codegen_spec = get_react_codegen_spec(fabric_enabled: fabric_enabled, script_phases: script_phases) generate_react_codegen_podspec!(react_codegen_spec) From 2cccddcacf513e67c91877ca55921a3f0867d358 Mon Sep 17 00:00:00 2001 From: Kudo Chien Date: Fri, 4 Mar 2022 18:03:38 +0800 Subject: [PATCH 2/6] update podfile.lock --- packages/rn-tester/Podfile.lock | 114 ++++++++++++++++---------------- 1 file changed, 57 insertions(+), 57 deletions(-) diff --git a/packages/rn-tester/Podfile.lock b/packages/rn-tester/Podfile.lock index 4721993ddff08d..369326fb382d3f 100644 --- a/packages/rn-tester/Podfile.lock +++ b/packages/rn-tester/Podfile.lock @@ -111,17 +111,6 @@ PODS: - React-RCTText (= 1000.0.0) - React-RCTVibration (= 1000.0.0) - React-callinvoker (1000.0.0) - - React-Codegen (1000.0.0): - - FBReactNativeSpec (= 1000.0.0) - - RCT-Folly (= 2021.06.28.00-v2) - - RCTRequired (= 1000.0.0) - - RCTTypeSafety (= 1000.0.0) - - React-Core (= 1000.0.0) - - React-graphics (= 1000.0.0) - - React-jsi (= 1000.0.0) - - React-jsiexecutor (= 1000.0.0) - - React-rncore (= 1000.0.0) - - ReactCommon/turbomodule/core (= 1000.0.0) - React-Core (1000.0.0): - glog - RCT-Folly (= 2021.06.28.00-v2) @@ -261,10 +250,10 @@ PODS: - React-CoreModules (1000.0.0): - RCT-Folly (= 2021.06.28.00-v2) - RCTTypeSafety (= 1000.0.0) - - React-Codegen (= 1000.0.0) - React-Core/CoreModulesHeaders (= 1000.0.0) - React-jsi (= 1000.0.0) - React-RCTImage (= 1000.0.0) + - ReactCodegen (= 1000.0.0) - ReactCommon/turbomodule/core (= 1000.0.0) - React-cxxreact (1000.0.0): - boost (= 1.76.0) @@ -620,17 +609,17 @@ PODS: - React-RCTAnimation (1000.0.0): - RCT-Folly (= 2021.06.28.00-v2) - RCTTypeSafety (= 1000.0.0) - - React-Codegen (= 1000.0.0) - React-Core/RCTAnimationHeaders (= 1000.0.0) - React-jsi (= 1000.0.0) + - ReactCodegen (= 1000.0.0) - ReactCommon/turbomodule/core (= 1000.0.0) - React-RCTBlob (1000.0.0): - RCT-Folly (= 2021.06.28.00-v2) - - React-Codegen (= 1000.0.0) - React-Core/RCTBlobHeaders (= 1000.0.0) - React-Core/RCTWebSocket (= 1000.0.0) - React-jsi (= 1000.0.0) - React-RCTNetwork (= 1000.0.0) + - ReactCodegen (= 1000.0.0) - ReactCommon/turbomodule/core (= 1000.0.0) - React-RCTFabric (1000.0.0): - RCT-Folly/Fabric (= 2021.06.28.00-v2) @@ -640,35 +629,35 @@ PODS: - React-RCTImage (1000.0.0): - RCT-Folly (= 2021.06.28.00-v2) - RCTTypeSafety (= 1000.0.0) - - React-Codegen (= 1000.0.0) - React-Core/RCTImageHeaders (= 1000.0.0) - React-jsi (= 1000.0.0) - React-RCTNetwork (= 1000.0.0) + - ReactCodegen (= 1000.0.0) - ReactCommon/turbomodule/core (= 1000.0.0) - React-RCTLinking (1000.0.0): - - React-Codegen (= 1000.0.0) - React-Core/RCTLinkingHeaders (= 1000.0.0) - React-jsi (= 1000.0.0) + - ReactCodegen (= 1000.0.0) - ReactCommon/turbomodule/core (= 1000.0.0) - React-RCTNetwork (1000.0.0): - RCT-Folly (= 2021.06.28.00-v2) - RCTTypeSafety (= 1000.0.0) - - React-Codegen (= 1000.0.0) - React-Core/RCTNetworkHeaders (= 1000.0.0) - React-jsi (= 1000.0.0) + - ReactCodegen (= 1000.0.0) - ReactCommon/turbomodule/core (= 1000.0.0) - React-RCTPushNotification (1000.0.0): - RCTTypeSafety (= 1000.0.0) - - React-Codegen (= 1000.0.0) - React-Core/RCTPushNotificationHeaders (= 1000.0.0) - React-jsi (= 1000.0.0) + - ReactCodegen (= 1000.0.0) - ReactCommon/turbomodule/core (= 1000.0.0) - React-RCTSettings (1000.0.0): - RCT-Folly (= 2021.06.28.00-v2) - RCTTypeSafety (= 1000.0.0) - - React-Codegen (= 1000.0.0) - React-Core/RCTSettingsHeaders (= 1000.0.0) - React-jsi (= 1000.0.0) + - ReactCodegen (= 1000.0.0) - ReactCommon/turbomodule/core (= 1000.0.0) - React-RCTTest (1000.0.0): - RCT-Folly (= 2021.06.28.00-v2) @@ -680,13 +669,24 @@ PODS: - React-Core/RCTTextHeaders (= 1000.0.0) - React-RCTVibration (1000.0.0): - RCT-Folly (= 2021.06.28.00-v2) - - React-Codegen (= 1000.0.0) - React-Core/RCTVibrationHeaders (= 1000.0.0) - React-jsi (= 1000.0.0) + - ReactCodegen (= 1000.0.0) - ReactCommon/turbomodule/core (= 1000.0.0) - React-rncore (1000.0.0) - React-runtimeexecutor (1000.0.0): - React-jsi (= 1000.0.0) + - ReactCodegen (1000.0.0): + - FBReactNativeSpec (= 1000.0.0) + - RCT-Folly (= 2021.06.28.00-v2) + - RCTRequired (= 1000.0.0) + - RCTTypeSafety (= 1000.0.0) + - React-Core (= 1000.0.0) + - React-graphics (= 1000.0.0) + - React-jsi (= 1000.0.0) + - React-jsiexecutor (= 1000.0.0) + - React-rncore (= 1000.0.0) + - ReactCommon/turbomodule/core (= 1000.0.0) - ReactCommon/turbomodule/core (1000.0.0): - DoubleConversion - glog @@ -750,7 +750,6 @@ DEPENDENCIES: - RCTTypeSafety (from `../../Libraries/TypeSafety`) - React (from `../../`) - React-callinvoker (from `../../ReactCommon/callinvoker`) - - React-Codegen (from `build/generated/ios`) - React-Core (from `../../`) - React-Core/DevSupport (from `../../`) - React-Core/RCTWebSocket (from `../../`) @@ -778,6 +777,7 @@ DEPENDENCIES: - React-RCTVibration (from `../../Libraries/Vibration`) - React-rncore (from `../../ReactCommon`) - React-runtimeexecutor (from `../../ReactCommon/runtimeexecutor`) + - ReactCodegen (from `build/generated/ios`) - ReactCommon/turbomodule/core (from `../../ReactCommon`) - ReactCommon/turbomodule/samples (from `../../ReactCommon`) - ScreenshotManager (from `NativeModuleExample`) @@ -822,8 +822,6 @@ EXTERNAL SOURCES: :path: "../../" React-callinvoker: :path: "../../ReactCommon/callinvoker" - React-Codegen: - :path: build/generated/ios React-Core: :path: "../../" React-CoreModules: @@ -872,6 +870,8 @@ EXTERNAL SOURCES: :path: "../../ReactCommon" React-runtimeexecutor: :path: "../../ReactCommon/runtimeexecutor" + ReactCodegen: + :path: build/generated/ios ReactCommon: :path: "../../ReactCommon" ScreenshotManager: @@ -883,8 +883,8 @@ SPEC CHECKSUMS: boost: a7c83b31436843459a1961bfd74b96033dc77234 CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99 DoubleConversion: 831926d9b8bf8166fd87886c4abab286c2422662 - FBLazyVector: b81a2b70c72d8b0aefb652cea22c11e9ffd02949 - FBReactNativeSpec: 04dbf2a5d787706cace2f2af8ff3790333b761cd + FBLazyVector: bece73b0dd55cf2df03aa9bf5deedadab70a030b + FBReactNativeSpec: fe6435958f771fe3e452dd1a53d8cd3f078e7485 Flipper: 26fc4b7382499f1281eb8cb921e5c3ad6de91fe0 Flipper-Boost-iOSX: fd1e2b8cbef7e662a122412d7ac5f5bea715403c Flipper-DoubleConversion: 57ffbe81ef95306cc9e69c4aa3aeeeeb58a6a28c @@ -899,39 +899,39 @@ SPEC CHECKSUMS: libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c RCT-Folly: 4d8508a426467c48885f1151029bc15fa5d7b3b8 - RCTRequired: af2d6080a4b9ba0885b28ca78879a92066c71cab - RCTTypeSafety: 2d6c5149fd3b8f2ba89987b47169423efb740300 - React: f64c9f6db5428717922a3292ba6a448615a2e143 - React-callinvoker: c5d61e29df57793f0dc10ec2bc01c846f863e51f - React-Codegen: c4ae835565487e494740b756ce953d8f635a76df - React-Core: 30784d0eacbd709a3a6a5ae7c02c928634a6247e - React-CoreModules: e784fdac1d0293963fc06646aa76cfdcd906a754 - React-cxxreact: cfc1663dae1ea52b465bbf021ef7b1527c5dc80c - React-Fabric: 30b8fa96a0c56d1c11348f77607464eb87bb3f9f - React-graphics: 9a84942b49ea1375ce83844041fa2ba766cfe0b9 - React-jsi: c1c0108d86e1378aabf7c9146ed7d12d87c7df85 - React-jsiexecutor: d08ec14edc8f2e19af51550cd1505332eae35c7b - React-jsinspector: 7d223826b0e7a61b3540c21b9eca2603b1d4e823 - React-logger: 2009c0280c286a76200d6b7c5fe242fad51ddd7a - React-perflogger: fe66bd6d8b17ebcfdf0159bf41fe28d8035ac20c - React-RCTActionSheet: 3131a0b9280aa0e51bdf54b3d79aecd8503db62c - React-RCTAnimation: 218e2557f9803c1d8b4fd814b6c54b223ee18cda - React-RCTBlob: f94c621fa9851a5f81da471016ce5d91d29b2c7f - React-RCTFabric: 134127990b95158033ff22db25f5474d4aeecc96 - React-RCTImage: 996407b090e9fa8bb2213b6887676b1541052cb5 - React-RCTLinking: 6fcb5735f35935e0e53dc45e97f77234d7920232 - React-RCTNetwork: 2d51ae6d31c26bbcaab9abd56e523f8010cc57ae - React-RCTPushNotification: c5dfa4ab4da2b5312223334a55b30527218197d4 - React-RCTSettings: 9f897f32b7c4d0bc9a2718b7cb7d4f193889f5e3 - React-RCTTest: 7cbcd615b1e74ad59c9ad4257e6c323482114173 - React-RCTText: e9146b2c0550a83d1335bfe2553760070a2d75c7 - React-RCTVibration: 9a73a3550a0ee184530341f91f9b85ad9cf3465a - React-rncore: 69bf49af24eafcd61f1e352c0cbff5cf17e70ed4 - React-runtimeexecutor: 4b0c6eb341c7d3ceb5e2385cb0fdb9bf701024f3 - ReactCommon: 9607f2246289d573adcbd144c02c19ae5246d6a5 - ScreenshotManager: 2e9d0bca1461f67405d21ca06a609cb844c3fb3c + RCTRequired: 0b998799db606372c665c4f1ce5fa863ad920775 + RCTTypeSafety: 751e0d0d8d8ee87707331414f953b585b6e84976 + React: b9e5e05d2b0b293e44fb35c2f466ef8418faf158 + React-callinvoker: 1aff3239a135f075accdc01db36e29e9837d5ad0 + React-Core: 68aa1d1b4b2c00b66af2a6aae2136b4030812f48 + React-CoreModules: bdabd7212ab05ba97b0c3d621b2e84d59279e08f + React-cxxreact: d4e1d7cb6621323ae4d304a9d404b823de235f13 + React-Fabric: 3e0ec8bbfe1694433c843bc15bf78c5aaea30426 + React-graphics: b21dcfec3c759f1014fee98b6996f3baf0b8e727 + React-jsi: 0d450449e3b35e57e4cc04c7c245b67f920af98d + React-jsiexecutor: 90d1a67a0a63e47f6cf93a180c1014310ff100ab + React-jsinspector: 875ba2ac00a5eb499bc2a1df8d916586c348c178 + React-logger: 6cf1fdad6d98ec76336c7ec06be84f28e4a1cb40 + React-perflogger: 28ea7ae731ae1597cb7e9dd5c44cdfd9740fbd9f + React-RCTActionSheet: 6dc5ee939b5380945c2799abf7930c1b71a403db + React-RCTAnimation: aa1d045762c917cacbc073304801fc6bb7ab92f6 + React-RCTBlob: 22a6b551cf7fad1a7b4519c37fff2833c4306651 + React-RCTFabric: 104e380609c41c580b1d8f0815a24e8cb701d450 + React-RCTImage: 7ecd183340e347d8a78e608faf7c0fc379dfc882 + React-RCTLinking: 1881f9d76ed8ac204a2badf0bf1cf088d15afd3d + React-RCTNetwork: c3f0204a39726e93ed6ba069df5de22898894cd7 + React-RCTPushNotification: 2f60960c9b3c83212c6dc0ae74d3f421a61b27a5 + React-RCTSettings: e851366ed5a2121dc3762efe271ffb8950014f1c + React-RCTTest: 1868ab4a976e25a3d700caf02eb044c76140c15a + React-RCTText: 59c42a6f2b649f7eff202fa92ee8e0ac905cf7cf + React-RCTVibration: 97ace96012644aa88d3375544f5aa6407cf9279e + React-rncore: 9fc548f15fe1002220d3144029e5d35e49826efd + React-runtimeexecutor: 0287fdb9ff03110373543d01a7911aa29ded1d2b + ReactCodegen: 17d4fb8e36e0fc1ad9417b6c0ca3ef00992ddc45 + ReactCommon: f85e22bb22e631b170f8169f35709b0af99f7b52 + ScreenshotManager: d77873eeea360cba44d426f58ebeb694c175ddb8 SocketRocket: fccef3f9c5cedea1353a9ef6ada904fde10d6608 - Yoga: c0d06f5380d34e939f55420669a60fe08b79bd75 + Yoga: 1021a52350b261cbb5c453b3b5070adf64886dc3 YogaKit: f782866e155069a2cca2517aafea43200b01fd5a PODFILE CHECKSUM: 064c91fbb8ac895e453a791ebaaae5cfe9c8557d From e1c44c1e10f08c0e358122a80d572433ab939732 Mon Sep 17 00:00:00 2001 From: Kudo Chien Date: Wed, 9 Mar 2022 15:06:24 +0800 Subject: [PATCH 3/6] Revert "update podfile.lock" This reverts commit 2cccddcacf513e67c91877ca55921a3f0867d358. --- packages/rn-tester/Podfile.lock | 114 ++++++++++++++++---------------- 1 file changed, 57 insertions(+), 57 deletions(-) diff --git a/packages/rn-tester/Podfile.lock b/packages/rn-tester/Podfile.lock index 369326fb382d3f..4721993ddff08d 100644 --- a/packages/rn-tester/Podfile.lock +++ b/packages/rn-tester/Podfile.lock @@ -111,6 +111,17 @@ PODS: - React-RCTText (= 1000.0.0) - React-RCTVibration (= 1000.0.0) - React-callinvoker (1000.0.0) + - React-Codegen (1000.0.0): + - FBReactNativeSpec (= 1000.0.0) + - RCT-Folly (= 2021.06.28.00-v2) + - RCTRequired (= 1000.0.0) + - RCTTypeSafety (= 1000.0.0) + - React-Core (= 1000.0.0) + - React-graphics (= 1000.0.0) + - React-jsi (= 1000.0.0) + - React-jsiexecutor (= 1000.0.0) + - React-rncore (= 1000.0.0) + - ReactCommon/turbomodule/core (= 1000.0.0) - React-Core (1000.0.0): - glog - RCT-Folly (= 2021.06.28.00-v2) @@ -250,10 +261,10 @@ PODS: - React-CoreModules (1000.0.0): - RCT-Folly (= 2021.06.28.00-v2) - RCTTypeSafety (= 1000.0.0) + - React-Codegen (= 1000.0.0) - React-Core/CoreModulesHeaders (= 1000.0.0) - React-jsi (= 1000.0.0) - React-RCTImage (= 1000.0.0) - - ReactCodegen (= 1000.0.0) - ReactCommon/turbomodule/core (= 1000.0.0) - React-cxxreact (1000.0.0): - boost (= 1.76.0) @@ -609,17 +620,17 @@ PODS: - React-RCTAnimation (1000.0.0): - RCT-Folly (= 2021.06.28.00-v2) - RCTTypeSafety (= 1000.0.0) + - React-Codegen (= 1000.0.0) - React-Core/RCTAnimationHeaders (= 1000.0.0) - React-jsi (= 1000.0.0) - - ReactCodegen (= 1000.0.0) - ReactCommon/turbomodule/core (= 1000.0.0) - React-RCTBlob (1000.0.0): - RCT-Folly (= 2021.06.28.00-v2) + - React-Codegen (= 1000.0.0) - React-Core/RCTBlobHeaders (= 1000.0.0) - React-Core/RCTWebSocket (= 1000.0.0) - React-jsi (= 1000.0.0) - React-RCTNetwork (= 1000.0.0) - - ReactCodegen (= 1000.0.0) - ReactCommon/turbomodule/core (= 1000.0.0) - React-RCTFabric (1000.0.0): - RCT-Folly/Fabric (= 2021.06.28.00-v2) @@ -629,35 +640,35 @@ PODS: - React-RCTImage (1000.0.0): - RCT-Folly (= 2021.06.28.00-v2) - RCTTypeSafety (= 1000.0.0) + - React-Codegen (= 1000.0.0) - React-Core/RCTImageHeaders (= 1000.0.0) - React-jsi (= 1000.0.0) - React-RCTNetwork (= 1000.0.0) - - ReactCodegen (= 1000.0.0) - ReactCommon/turbomodule/core (= 1000.0.0) - React-RCTLinking (1000.0.0): + - React-Codegen (= 1000.0.0) - React-Core/RCTLinkingHeaders (= 1000.0.0) - React-jsi (= 1000.0.0) - - ReactCodegen (= 1000.0.0) - ReactCommon/turbomodule/core (= 1000.0.0) - React-RCTNetwork (1000.0.0): - RCT-Folly (= 2021.06.28.00-v2) - RCTTypeSafety (= 1000.0.0) + - React-Codegen (= 1000.0.0) - React-Core/RCTNetworkHeaders (= 1000.0.0) - React-jsi (= 1000.0.0) - - ReactCodegen (= 1000.0.0) - ReactCommon/turbomodule/core (= 1000.0.0) - React-RCTPushNotification (1000.0.0): - RCTTypeSafety (= 1000.0.0) + - React-Codegen (= 1000.0.0) - React-Core/RCTPushNotificationHeaders (= 1000.0.0) - React-jsi (= 1000.0.0) - - ReactCodegen (= 1000.0.0) - ReactCommon/turbomodule/core (= 1000.0.0) - React-RCTSettings (1000.0.0): - RCT-Folly (= 2021.06.28.00-v2) - RCTTypeSafety (= 1000.0.0) + - React-Codegen (= 1000.0.0) - React-Core/RCTSettingsHeaders (= 1000.0.0) - React-jsi (= 1000.0.0) - - ReactCodegen (= 1000.0.0) - ReactCommon/turbomodule/core (= 1000.0.0) - React-RCTTest (1000.0.0): - RCT-Folly (= 2021.06.28.00-v2) @@ -669,24 +680,13 @@ PODS: - React-Core/RCTTextHeaders (= 1000.0.0) - React-RCTVibration (1000.0.0): - RCT-Folly (= 2021.06.28.00-v2) + - React-Codegen (= 1000.0.0) - React-Core/RCTVibrationHeaders (= 1000.0.0) - React-jsi (= 1000.0.0) - - ReactCodegen (= 1000.0.0) - ReactCommon/turbomodule/core (= 1000.0.0) - React-rncore (1000.0.0) - React-runtimeexecutor (1000.0.0): - React-jsi (= 1000.0.0) - - ReactCodegen (1000.0.0): - - FBReactNativeSpec (= 1000.0.0) - - RCT-Folly (= 2021.06.28.00-v2) - - RCTRequired (= 1000.0.0) - - RCTTypeSafety (= 1000.0.0) - - React-Core (= 1000.0.0) - - React-graphics (= 1000.0.0) - - React-jsi (= 1000.0.0) - - React-jsiexecutor (= 1000.0.0) - - React-rncore (= 1000.0.0) - - ReactCommon/turbomodule/core (= 1000.0.0) - ReactCommon/turbomodule/core (1000.0.0): - DoubleConversion - glog @@ -750,6 +750,7 @@ DEPENDENCIES: - RCTTypeSafety (from `../../Libraries/TypeSafety`) - React (from `../../`) - React-callinvoker (from `../../ReactCommon/callinvoker`) + - React-Codegen (from `build/generated/ios`) - React-Core (from `../../`) - React-Core/DevSupport (from `../../`) - React-Core/RCTWebSocket (from `../../`) @@ -777,7 +778,6 @@ DEPENDENCIES: - React-RCTVibration (from `../../Libraries/Vibration`) - React-rncore (from `../../ReactCommon`) - React-runtimeexecutor (from `../../ReactCommon/runtimeexecutor`) - - ReactCodegen (from `build/generated/ios`) - ReactCommon/turbomodule/core (from `../../ReactCommon`) - ReactCommon/turbomodule/samples (from `../../ReactCommon`) - ScreenshotManager (from `NativeModuleExample`) @@ -822,6 +822,8 @@ EXTERNAL SOURCES: :path: "../../" React-callinvoker: :path: "../../ReactCommon/callinvoker" + React-Codegen: + :path: build/generated/ios React-Core: :path: "../../" React-CoreModules: @@ -870,8 +872,6 @@ EXTERNAL SOURCES: :path: "../../ReactCommon" React-runtimeexecutor: :path: "../../ReactCommon/runtimeexecutor" - ReactCodegen: - :path: build/generated/ios ReactCommon: :path: "../../ReactCommon" ScreenshotManager: @@ -883,8 +883,8 @@ SPEC CHECKSUMS: boost: a7c83b31436843459a1961bfd74b96033dc77234 CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99 DoubleConversion: 831926d9b8bf8166fd87886c4abab286c2422662 - FBLazyVector: bece73b0dd55cf2df03aa9bf5deedadab70a030b - FBReactNativeSpec: fe6435958f771fe3e452dd1a53d8cd3f078e7485 + FBLazyVector: b81a2b70c72d8b0aefb652cea22c11e9ffd02949 + FBReactNativeSpec: 04dbf2a5d787706cace2f2af8ff3790333b761cd Flipper: 26fc4b7382499f1281eb8cb921e5c3ad6de91fe0 Flipper-Boost-iOSX: fd1e2b8cbef7e662a122412d7ac5f5bea715403c Flipper-DoubleConversion: 57ffbe81ef95306cc9e69c4aa3aeeeeb58a6a28c @@ -899,39 +899,39 @@ SPEC CHECKSUMS: libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c RCT-Folly: 4d8508a426467c48885f1151029bc15fa5d7b3b8 - RCTRequired: 0b998799db606372c665c4f1ce5fa863ad920775 - RCTTypeSafety: 751e0d0d8d8ee87707331414f953b585b6e84976 - React: b9e5e05d2b0b293e44fb35c2f466ef8418faf158 - React-callinvoker: 1aff3239a135f075accdc01db36e29e9837d5ad0 - React-Core: 68aa1d1b4b2c00b66af2a6aae2136b4030812f48 - React-CoreModules: bdabd7212ab05ba97b0c3d621b2e84d59279e08f - React-cxxreact: d4e1d7cb6621323ae4d304a9d404b823de235f13 - React-Fabric: 3e0ec8bbfe1694433c843bc15bf78c5aaea30426 - React-graphics: b21dcfec3c759f1014fee98b6996f3baf0b8e727 - React-jsi: 0d450449e3b35e57e4cc04c7c245b67f920af98d - React-jsiexecutor: 90d1a67a0a63e47f6cf93a180c1014310ff100ab - React-jsinspector: 875ba2ac00a5eb499bc2a1df8d916586c348c178 - React-logger: 6cf1fdad6d98ec76336c7ec06be84f28e4a1cb40 - React-perflogger: 28ea7ae731ae1597cb7e9dd5c44cdfd9740fbd9f - React-RCTActionSheet: 6dc5ee939b5380945c2799abf7930c1b71a403db - React-RCTAnimation: aa1d045762c917cacbc073304801fc6bb7ab92f6 - React-RCTBlob: 22a6b551cf7fad1a7b4519c37fff2833c4306651 - React-RCTFabric: 104e380609c41c580b1d8f0815a24e8cb701d450 - React-RCTImage: 7ecd183340e347d8a78e608faf7c0fc379dfc882 - React-RCTLinking: 1881f9d76ed8ac204a2badf0bf1cf088d15afd3d - React-RCTNetwork: c3f0204a39726e93ed6ba069df5de22898894cd7 - React-RCTPushNotification: 2f60960c9b3c83212c6dc0ae74d3f421a61b27a5 - React-RCTSettings: e851366ed5a2121dc3762efe271ffb8950014f1c - React-RCTTest: 1868ab4a976e25a3d700caf02eb044c76140c15a - React-RCTText: 59c42a6f2b649f7eff202fa92ee8e0ac905cf7cf - React-RCTVibration: 97ace96012644aa88d3375544f5aa6407cf9279e - React-rncore: 9fc548f15fe1002220d3144029e5d35e49826efd - React-runtimeexecutor: 0287fdb9ff03110373543d01a7911aa29ded1d2b - ReactCodegen: 17d4fb8e36e0fc1ad9417b6c0ca3ef00992ddc45 - ReactCommon: f85e22bb22e631b170f8169f35709b0af99f7b52 - ScreenshotManager: d77873eeea360cba44d426f58ebeb694c175ddb8 + RCTRequired: af2d6080a4b9ba0885b28ca78879a92066c71cab + RCTTypeSafety: 2d6c5149fd3b8f2ba89987b47169423efb740300 + React: f64c9f6db5428717922a3292ba6a448615a2e143 + React-callinvoker: c5d61e29df57793f0dc10ec2bc01c846f863e51f + React-Codegen: c4ae835565487e494740b756ce953d8f635a76df + React-Core: 30784d0eacbd709a3a6a5ae7c02c928634a6247e + React-CoreModules: e784fdac1d0293963fc06646aa76cfdcd906a754 + React-cxxreact: cfc1663dae1ea52b465bbf021ef7b1527c5dc80c + React-Fabric: 30b8fa96a0c56d1c11348f77607464eb87bb3f9f + React-graphics: 9a84942b49ea1375ce83844041fa2ba766cfe0b9 + React-jsi: c1c0108d86e1378aabf7c9146ed7d12d87c7df85 + React-jsiexecutor: d08ec14edc8f2e19af51550cd1505332eae35c7b + React-jsinspector: 7d223826b0e7a61b3540c21b9eca2603b1d4e823 + React-logger: 2009c0280c286a76200d6b7c5fe242fad51ddd7a + React-perflogger: fe66bd6d8b17ebcfdf0159bf41fe28d8035ac20c + React-RCTActionSheet: 3131a0b9280aa0e51bdf54b3d79aecd8503db62c + React-RCTAnimation: 218e2557f9803c1d8b4fd814b6c54b223ee18cda + React-RCTBlob: f94c621fa9851a5f81da471016ce5d91d29b2c7f + React-RCTFabric: 134127990b95158033ff22db25f5474d4aeecc96 + React-RCTImage: 996407b090e9fa8bb2213b6887676b1541052cb5 + React-RCTLinking: 6fcb5735f35935e0e53dc45e97f77234d7920232 + React-RCTNetwork: 2d51ae6d31c26bbcaab9abd56e523f8010cc57ae + React-RCTPushNotification: c5dfa4ab4da2b5312223334a55b30527218197d4 + React-RCTSettings: 9f897f32b7c4d0bc9a2718b7cb7d4f193889f5e3 + React-RCTTest: 7cbcd615b1e74ad59c9ad4257e6c323482114173 + React-RCTText: e9146b2c0550a83d1335bfe2553760070a2d75c7 + React-RCTVibration: 9a73a3550a0ee184530341f91f9b85ad9cf3465a + React-rncore: 69bf49af24eafcd61f1e352c0cbff5cf17e70ed4 + React-runtimeexecutor: 4b0c6eb341c7d3ceb5e2385cb0fdb9bf701024f3 + ReactCommon: 9607f2246289d573adcbd144c02c19ae5246d6a5 + ScreenshotManager: 2e9d0bca1461f67405d21ca06a609cb844c3fb3c SocketRocket: fccef3f9c5cedea1353a9ef6ada904fde10d6608 - Yoga: 1021a52350b261cbb5c453b3b5070adf64886dc3 + Yoga: c0d06f5380d34e939f55420669a60fe08b79bd75 YogaKit: f782866e155069a2cca2517aafea43200b01fd5a PODFILE CHECKSUM: 064c91fbb8ac895e453a791ebaaae5cfe9c8557d From 07142a2664a5756afcff4293849ed48aab48c115 Mon Sep 17 00:00:00 2001 From: Kudo Chien Date: Wed, 9 Mar 2022 15:06:28 +0800 Subject: [PATCH 4/6] Revert "[ios] fix use_frameworks! for old architecture" This reverts commit 169c9a40263a561a8133edabd7d786be57a3ad43. --- Libraries/Blob/RCTBlobManager.mm | 2 +- Libraries/Blob/RCTFileReaderModule.mm | 2 +- Libraries/Blob/React-RCTBlob.podspec | 4 ++-- Libraries/Image/RCTImageEditingManager.mm | 2 +- Libraries/Image/RCTImageLoader.mm | 2 +- Libraries/Image/RCTImageStoreManager.mm | 2 +- Libraries/Image/React-RCTImage.podspec | 4 ++-- Libraries/LinkingIOS/RCTLinkingManager.mm | 2 +- Libraries/LinkingIOS/React-RCTLinking.podspec | 4 ++-- .../NativeAnimation/RCTNativeAnimatedModule.mm | 2 +- .../RCTNativeAnimatedTurboModule.mm | 2 +- .../NativeAnimation/React-RCTAnimation.podspec | 4 ++-- Libraries/Network/RCTNetworking.mm | 2 +- Libraries/Network/React-RCTNetwork.podspec | 4 ++-- .../RCTPushNotificationManager.mm | 2 +- .../React-RCTPushNotification.podspec | 4 ++-- Libraries/Settings/RCTSettingsManager.mm | 2 +- Libraries/Settings/React-RCTSettings.podspec | 4 ++-- Libraries/Vibration/RCTVibration.mm | 2 +- Libraries/Vibration/React-RCTVibration.podspec | 4 ++-- React/CoreModules/RCTAccessibilityManager.mm | 2 +- React/CoreModules/RCTActionSheetManager.mm | 2 +- React/CoreModules/RCTAlertManager.mm | 2 +- React/CoreModules/RCTAppState.mm | 2 +- React/CoreModules/RCTAppearance.mm | 2 +- React/CoreModules/RCTAsyncLocalStorage.mm | 2 +- React/CoreModules/RCTClipboard.mm | 2 +- React/CoreModules/RCTDevLoadingView.mm | 2 +- React/CoreModules/RCTDevMenu.mm | 2 +- React/CoreModules/RCTDevSettings.mm | 2 +- React/CoreModules/RCTDevSplitBundleLoader.mm | 2 +- React/CoreModules/RCTDeviceInfo.mm | 2 +- React/CoreModules/RCTExceptionsManager.mm | 2 +- React/CoreModules/RCTI18nManager.mm | 2 +- React/CoreModules/RCTKeyboardObserver.mm | 2 +- React/CoreModules/RCTLogBox.mm | 2 +- React/CoreModules/RCTPlatform.mm | 2 +- React/CoreModules/RCTRedBox.mm | 2 +- React/CoreModules/RCTSourceCode.mm | 2 +- React/CoreModules/RCTStatusBarManager.mm | 2 +- React/CoreModules/RCTTiming.mm | 2 +- React/CoreModules/RCTWebSocketModule.mm | 2 +- React/CoreModules/React-CoreModules.podspec | 4 ++-- React/React-RCTFabric.podspec | 2 +- .../NativeComponentExample/MyNativeView.podspec | 2 +- scripts/react_native_pods.rb | 14 +++++++------- 46 files changed, 61 insertions(+), 61 deletions(-) diff --git a/Libraries/Blob/RCTBlobManager.mm b/Libraries/Blob/RCTBlobManager.mm index e5968f3bc3a2bc..567e16ffee56c1 100755 --- a/Libraries/Blob/RCTBlobManager.mm +++ b/Libraries/Blob/RCTBlobManager.mm @@ -9,7 +9,7 @@ #import -#import +#import #import #import #import diff --git a/Libraries/Blob/RCTFileReaderModule.mm b/Libraries/Blob/RCTFileReaderModule.mm index 1c744d284f9655..e834c61cc7970f 100644 --- a/Libraries/Blob/RCTFileReaderModule.mm +++ b/Libraries/Blob/RCTFileReaderModule.mm @@ -8,7 +8,7 @@ #import -#import +#import #import #import diff --git a/Libraries/Blob/React-RCTBlob.podspec b/Libraries/Blob/React-RCTBlob.podspec index b245f2ca17c6bb..c5eb26e7aab7eb 100644 --- a/Libraries/Blob/React-RCTBlob.podspec +++ b/Libraries/Blob/React-RCTBlob.podspec @@ -35,11 +35,11 @@ Pod::Spec.new do |s| s.pod_target_xcconfig = { "USE_HEADERMAP" => "YES", "CLANG_CXX_LANGUAGE_STANDARD" => "c++17", - "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/ReactCodegen/react/renderer/components\"" + "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\"" } s.dependency "RCT-Folly", folly_version - s.dependency "ReactCodegen", version + s.dependency "React-Codegen", version s.dependency "ReactCommon/turbomodule/core", version s.dependency "React-jsi", version s.dependency "React-Core/RCTBlobHeaders", version diff --git a/Libraries/Image/RCTImageEditingManager.mm b/Libraries/Image/RCTImageEditingManager.mm index d4337b2b71126a..1f75fe3006f8d9 100644 --- a/Libraries/Image/RCTImageEditingManager.mm +++ b/Libraries/Image/RCTImageEditingManager.mm @@ -7,7 +7,7 @@ #import -#import +#import #import #import #import diff --git a/Libraries/Image/RCTImageLoader.mm b/Libraries/Image/RCTImageLoader.mm index 4a1b880520b044..39e33ecdd285a6 100644 --- a/Libraries/Image/RCTImageLoader.mm +++ b/Libraries/Image/RCTImageLoader.mm @@ -11,7 +11,7 @@ #import -#import +#import #import #import #import diff --git a/Libraries/Image/RCTImageStoreManager.mm b/Libraries/Image/RCTImageStoreManager.mm index 3f64716ff09878..c62ad09275372f 100644 --- a/Libraries/Image/RCTImageStoreManager.mm +++ b/Libraries/Image/RCTImageStoreManager.mm @@ -10,7 +10,7 @@ #import #import -#import +#import #import #import #import diff --git a/Libraries/Image/React-RCTImage.podspec b/Libraries/Image/React-RCTImage.podspec index 645b444f8c0328..704d80662cd7e9 100644 --- a/Libraries/Image/React-RCTImage.podspec +++ b/Libraries/Image/React-RCTImage.podspec @@ -36,11 +36,11 @@ Pod::Spec.new do |s| s.pod_target_xcconfig = { "USE_HEADERMAP" => "YES", "CLANG_CXX_LANGUAGE_STANDARD" => "c++17", - "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/ReactCodegen/react/renderer/components\"" + "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\"" } s.dependency "RCT-Folly", folly_version - s.dependency "ReactCodegen", version + s.dependency "React-Codegen", version s.dependency "RCTTypeSafety", version s.dependency "ReactCommon/turbomodule/core", version s.dependency "React-jsi", version diff --git a/Libraries/LinkingIOS/RCTLinkingManager.mm b/Libraries/LinkingIOS/RCTLinkingManager.mm index 79495fedf64646..dc45866b7a0188 100644 --- a/Libraries/LinkingIOS/RCTLinkingManager.mm +++ b/Libraries/LinkingIOS/RCTLinkingManager.mm @@ -7,7 +7,7 @@ #import -#import +#import #import #import #import diff --git a/Libraries/LinkingIOS/React-RCTLinking.podspec b/Libraries/LinkingIOS/React-RCTLinking.podspec index 65e61ca27caaa7..bb1de98b3d3d52 100644 --- a/Libraries/LinkingIOS/React-RCTLinking.podspec +++ b/Libraries/LinkingIOS/React-RCTLinking.podspec @@ -36,10 +36,10 @@ Pod::Spec.new do |s| s.pod_target_xcconfig = { "USE_HEADERMAP" => "YES", "CLANG_CXX_LANGUAGE_STANDARD" => "c++17", - "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/ReactCodegen/react/renderer/components\"" + "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\"" } - s.dependency "ReactCodegen", version + s.dependency "React-Codegen", version s.dependency "React-Core/RCTLinkingHeaders", version s.dependency "ReactCommon/turbomodule/core", version s.dependency "React-jsi", version diff --git a/Libraries/NativeAnimation/RCTNativeAnimatedModule.mm b/Libraries/NativeAnimation/RCTNativeAnimatedModule.mm index 6be0ecdf96d295..ddf060b2adc00b 100644 --- a/Libraries/NativeAnimation/RCTNativeAnimatedModule.mm +++ b/Libraries/NativeAnimation/RCTNativeAnimatedModule.mm @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import +#import #import #import #import diff --git a/Libraries/NativeAnimation/RCTNativeAnimatedTurboModule.mm b/Libraries/NativeAnimation/RCTNativeAnimatedTurboModule.mm index 985d219609ceb8..0e3be345049bc6 100644 --- a/Libraries/NativeAnimation/RCTNativeAnimatedTurboModule.mm +++ b/Libraries/NativeAnimation/RCTNativeAnimatedTurboModule.mm @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import +#import #import #import #import diff --git a/Libraries/NativeAnimation/React-RCTAnimation.podspec b/Libraries/NativeAnimation/React-RCTAnimation.podspec index ef0fcf6b6061e6..d4b9cd0b13a167 100644 --- a/Libraries/NativeAnimation/React-RCTAnimation.podspec +++ b/Libraries/NativeAnimation/React-RCTAnimation.podspec @@ -35,11 +35,11 @@ Pod::Spec.new do |s| s.pod_target_xcconfig = { "USE_HEADERMAP" => "YES", "CLANG_CXX_LANGUAGE_STANDARD" => "c++17", - "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/ReactCodegen/react/renderer/components\"" + "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\"" } s.dependency "RCT-Folly", folly_version - s.dependency "ReactCodegen", version + s.dependency "React-Codegen", version s.dependency "RCTTypeSafety", version s.dependency "ReactCommon/turbomodule/core", version s.dependency "React-jsi", version diff --git a/Libraries/Network/RCTNetworking.mm b/Libraries/Network/RCTNetworking.mm index 3b7a34d10bd4bf..c9004d648bed33 100644 --- a/Libraries/Network/RCTNetworking.mm +++ b/Libraries/Network/RCTNetworking.mm @@ -8,7 +8,7 @@ #import -#import +#import #import #import #import diff --git a/Libraries/Network/React-RCTNetwork.podspec b/Libraries/Network/React-RCTNetwork.podspec index 98a9221966301c..3fde6323d94e3a 100644 --- a/Libraries/Network/React-RCTNetwork.podspec +++ b/Libraries/Network/React-RCTNetwork.podspec @@ -35,12 +35,12 @@ Pod::Spec.new do |s| s.pod_target_xcconfig = { "USE_HEADERMAP" => "YES", "CLANG_CXX_LANGUAGE_STANDARD" => "c++17", - "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/ReactCodegen/react/renderer/components\"" + "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\"" } s.frameworks = "MobileCoreServices" s.dependency "RCT-Folly", folly_version - s.dependency "ReactCodegen", version + s.dependency "React-Codegen", version s.dependency "RCTTypeSafety", version s.dependency "ReactCommon/turbomodule/core", version s.dependency "React-jsi", version diff --git a/Libraries/PushNotificationIOS/RCTPushNotificationManager.mm b/Libraries/PushNotificationIOS/RCTPushNotificationManager.mm index 49562bd2826be4..68b120104419c1 100644 --- a/Libraries/PushNotificationIOS/RCTPushNotificationManager.mm +++ b/Libraries/PushNotificationIOS/RCTPushNotificationManager.mm @@ -9,7 +9,7 @@ #import -#import +#import #import #import #import diff --git a/Libraries/PushNotificationIOS/React-RCTPushNotification.podspec b/Libraries/PushNotificationIOS/React-RCTPushNotification.podspec index 7e04b055d09a43..f7dcee8601282a 100644 --- a/Libraries/PushNotificationIOS/React-RCTPushNotification.podspec +++ b/Libraries/PushNotificationIOS/React-RCTPushNotification.podspec @@ -36,11 +36,11 @@ Pod::Spec.new do |s| s.pod_target_xcconfig = { "USE_HEADERMAP" => "YES", "CLANG_CXX_LANGUAGE_STANDARD" => "c++17", - "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/ReactCodegen/react/renderer/components\"" + "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\"" } s.framework = "UserNotifications" - s.dependency "ReactCodegen", version + s.dependency "React-Codegen", version s.dependency "RCTTypeSafety", version s.dependency "React-Core/RCTPushNotificationHeaders", version s.dependency "ReactCommon/turbomodule/core", version diff --git a/Libraries/Settings/RCTSettingsManager.mm b/Libraries/Settings/RCTSettingsManager.mm index acc57ef1b4e11f..4badb6068eba3e 100644 --- a/Libraries/Settings/RCTSettingsManager.mm +++ b/Libraries/Settings/RCTSettingsManager.mm @@ -7,7 +7,7 @@ #import -#import +#import #import #import #import diff --git a/Libraries/Settings/React-RCTSettings.podspec b/Libraries/Settings/React-RCTSettings.podspec index be82ada4eff1d9..72557510f2ab76 100644 --- a/Libraries/Settings/React-RCTSettings.podspec +++ b/Libraries/Settings/React-RCTSettings.podspec @@ -36,11 +36,11 @@ Pod::Spec.new do |s| s.pod_target_xcconfig = { "USE_HEADERMAP" => "YES", "CLANG_CXX_LANGUAGE_STANDARD" => "c++17", - "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/ReactCodegen/react/renderer/components\"" + "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\"" } s.dependency "RCT-Folly", folly_version - s.dependency "ReactCodegen", version + s.dependency "React-Codegen", version s.dependency "RCTTypeSafety", version s.dependency "ReactCommon/turbomodule/core", version s.dependency "React-jsi", version diff --git a/Libraries/Vibration/RCTVibration.mm b/Libraries/Vibration/RCTVibration.mm index 384dfd83f06374..68e4669d60c711 100644 --- a/Libraries/Vibration/RCTVibration.mm +++ b/Libraries/Vibration/RCTVibration.mm @@ -8,7 +8,7 @@ #import #import -#import +#import #import #import "RCTVibrationPlugins.h" diff --git a/Libraries/Vibration/React-RCTVibration.podspec b/Libraries/Vibration/React-RCTVibration.podspec index 838af73100db00..4ac3a6387c830a 100644 --- a/Libraries/Vibration/React-RCTVibration.podspec +++ b/Libraries/Vibration/React-RCTVibration.podspec @@ -36,12 +36,12 @@ Pod::Spec.new do |s| s.pod_target_xcconfig = { "USE_HEADERMAP" => "YES", "CLANG_CXX_LANGUAGE_STANDARD" => "c++17", - "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/ReactCodegen/react/renderer/components\"" + "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\"" } s.frameworks = "AudioToolbox" s.dependency "RCT-Folly", folly_version - s.dependency "ReactCodegen", version + s.dependency "React-Codegen", version s.dependency "ReactCommon/turbomodule/core", version s.dependency "React-jsi", version s.dependency "React-Core/RCTVibrationHeaders", version diff --git a/React/CoreModules/RCTAccessibilityManager.mm b/React/CoreModules/RCTAccessibilityManager.mm index 7817a43dc9194a..f7ee29c812c1a4 100644 --- a/React/CoreModules/RCTAccessibilityManager.mm +++ b/React/CoreModules/RCTAccessibilityManager.mm @@ -8,7 +8,7 @@ #import "RCTAccessibilityManager.h" #import "RCTAccessibilityManager+Internal.h" -#import +#import #import #import #import diff --git a/React/CoreModules/RCTActionSheetManager.mm b/React/CoreModules/RCTActionSheetManager.mm index 7fcb886583235d..e2b579244de69f 100644 --- a/React/CoreModules/RCTActionSheetManager.mm +++ b/React/CoreModules/RCTActionSheetManager.mm @@ -13,7 +13,7 @@ #import #import -#import +#import #import #import "CoreModulesPlugins.h" diff --git a/React/CoreModules/RCTAlertManager.mm b/React/CoreModules/RCTAlertManager.mm index 39358f31d08eb7..c4a1cde52dcbeb 100644 --- a/React/CoreModules/RCTAlertManager.mm +++ b/React/CoreModules/RCTAlertManager.mm @@ -7,7 +7,7 @@ #import "RCTAlertManager.h" -#import +#import #import #import #import diff --git a/React/CoreModules/RCTAppState.mm b/React/CoreModules/RCTAppState.mm index 58f18de4b1c70f..5de33f4b037d1c 100644 --- a/React/CoreModules/RCTAppState.mm +++ b/React/CoreModules/RCTAppState.mm @@ -7,7 +7,7 @@ #import "RCTAppState.h" -#import +#import #import #import #import diff --git a/React/CoreModules/RCTAppearance.mm b/React/CoreModules/RCTAppearance.mm index e4f692d11a2fb0..71259d4a98d119 100644 --- a/React/CoreModules/RCTAppearance.mm +++ b/React/CoreModules/RCTAppearance.mm @@ -7,7 +7,7 @@ #import "RCTAppearance.h" -#import +#import #import #import diff --git a/React/CoreModules/RCTAsyncLocalStorage.mm b/React/CoreModules/RCTAsyncLocalStorage.mm index 02eabb75f18760..326ea78f8d69db 100644 --- a/React/CoreModules/RCTAsyncLocalStorage.mm +++ b/React/CoreModules/RCTAsyncLocalStorage.mm @@ -11,7 +11,7 @@ #import #import -#import +#import #import #import diff --git a/React/CoreModules/RCTClipboard.mm b/React/CoreModules/RCTClipboard.mm index f30a6609f607e8..2dc098a4730273 100644 --- a/React/CoreModules/RCTClipboard.mm +++ b/React/CoreModules/RCTClipboard.mm @@ -7,7 +7,7 @@ #import "RCTClipboard.h" -#import +#import #import #import "CoreModulesPlugins.h" diff --git a/React/CoreModules/RCTDevLoadingView.mm b/React/CoreModules/RCTDevLoadingView.mm index 4fdceed5161826..316c2489207d1d 100644 --- a/React/CoreModules/RCTDevLoadingView.mm +++ b/React/CoreModules/RCTDevLoadingView.mm @@ -9,7 +9,7 @@ #import -#import +#import #import #import #import diff --git a/React/CoreModules/RCTDevMenu.mm b/React/CoreModules/RCTDevMenu.mm index 7024e3e2b94b22..6d47652b6afe42 100644 --- a/React/CoreModules/RCTDevMenu.mm +++ b/React/CoreModules/RCTDevMenu.mm @@ -7,7 +7,7 @@ #import -#import +#import #import #import #import diff --git a/React/CoreModules/RCTDevSettings.mm b/React/CoreModules/RCTDevSettings.mm index 39c9089f0c0067..837865b5477fe7 100644 --- a/React/CoreModules/RCTDevSettings.mm +++ b/React/CoreModules/RCTDevSettings.mm @@ -9,7 +9,7 @@ #import -#import +#import #import #import #import diff --git a/React/CoreModules/RCTDevSplitBundleLoader.mm b/React/CoreModules/RCTDevSplitBundleLoader.mm index 27d2edb673d6c1..8eb756db0e0232 100644 --- a/React/CoreModules/RCTDevSplitBundleLoader.mm +++ b/React/CoreModules/RCTDevSplitBundleLoader.mm @@ -7,7 +7,7 @@ #import -#import +#import #import #import #import diff --git a/React/CoreModules/RCTDeviceInfo.mm b/React/CoreModules/RCTDeviceInfo.mm index 03f3e57e073d7a..b948e8e479b726 100644 --- a/React/CoreModules/RCTDeviceInfo.mm +++ b/React/CoreModules/RCTDeviceInfo.mm @@ -7,7 +7,7 @@ #import "RCTDeviceInfo.h" -#import +#import #import #import #import diff --git a/React/CoreModules/RCTExceptionsManager.mm b/React/CoreModules/RCTExceptionsManager.mm index b3300d5d12c0eb..ca1aafca6d4a34 100644 --- a/React/CoreModules/RCTExceptionsManager.mm +++ b/React/CoreModules/RCTExceptionsManager.mm @@ -7,7 +7,7 @@ #import "RCTExceptionsManager.h" -#import +#import #import #import #import diff --git a/React/CoreModules/RCTI18nManager.mm b/React/CoreModules/RCTI18nManager.mm index dc4858286a142a..7d3b9eaa11cf1a 100644 --- a/React/CoreModules/RCTI18nManager.mm +++ b/React/CoreModules/RCTI18nManager.mm @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import +#import #import #import "RCTI18nManager.h" diff --git a/React/CoreModules/RCTKeyboardObserver.mm b/React/CoreModules/RCTKeyboardObserver.mm index df4ab97c2728c8..ce483ddceb95fc 100644 --- a/React/CoreModules/RCTKeyboardObserver.mm +++ b/React/CoreModules/RCTKeyboardObserver.mm @@ -7,7 +7,7 @@ #import "RCTKeyboardObserver.h" -#import +#import #import #import "CoreModulesPlugins.h" diff --git a/React/CoreModules/RCTLogBox.mm b/React/CoreModules/RCTLogBox.mm index b99d7604ab9a12..d8113e96b5fb2c 100644 --- a/React/CoreModules/RCTLogBox.mm +++ b/React/CoreModules/RCTLogBox.mm @@ -7,7 +7,7 @@ #import "RCTLogBox.h" -#import +#import #import #import #import diff --git a/React/CoreModules/RCTPlatform.mm b/React/CoreModules/RCTPlatform.mm index fb1ea54e03e080..bf0fed1cdff19c 100644 --- a/React/CoreModules/RCTPlatform.mm +++ b/React/CoreModules/RCTPlatform.mm @@ -9,7 +9,7 @@ #import -#import +#import #import #import diff --git a/React/CoreModules/RCTRedBox.mm b/React/CoreModules/RCTRedBox.mm index 792738aa84af93..4d86309b064727 100644 --- a/React/CoreModules/RCTRedBox.mm +++ b/React/CoreModules/RCTRedBox.mm @@ -7,7 +7,7 @@ #import "RCTRedBox.h" -#import +#import #import #import #import diff --git a/React/CoreModules/RCTSourceCode.mm b/React/CoreModules/RCTSourceCode.mm index 6a8aa9b363aff6..2589b34d3daafc 100644 --- a/React/CoreModules/RCTSourceCode.mm +++ b/React/CoreModules/RCTSourceCode.mm @@ -7,7 +7,7 @@ #import "RCTSourceCode.h" -#import +#import #import diff --git a/React/CoreModules/RCTStatusBarManager.mm b/React/CoreModules/RCTStatusBarManager.mm index 0ce161450c85d9..19d1d8f89ba9ee 100644 --- a/React/CoreModules/RCTStatusBarManager.mm +++ b/React/CoreModules/RCTStatusBarManager.mm @@ -12,7 +12,7 @@ #import #import -#import +#import @implementation RCTConvert (UIStatusBar) diff --git a/React/CoreModules/RCTTiming.mm b/React/CoreModules/RCTTiming.mm index 1587c622821078..13d0d57296bbba 100644 --- a/React/CoreModules/RCTTiming.mm +++ b/React/CoreModules/RCTTiming.mm @@ -7,7 +7,7 @@ #import "RCTTiming.h" -#import +#import #import #import diff --git a/React/CoreModules/RCTWebSocketModule.mm b/React/CoreModules/RCTWebSocketModule.mm index 3f8907e9b32c5b..c099328eaff69b 100644 --- a/React/CoreModules/RCTWebSocketModule.mm +++ b/React/CoreModules/RCTWebSocketModule.mm @@ -9,7 +9,7 @@ #import -#import +#import #import #import #import diff --git a/React/CoreModules/React-CoreModules.podspec b/React/CoreModules/React-CoreModules.podspec index b0dd428e0678b5..ce310b4c546ea5 100644 --- a/React/CoreModules/React-CoreModules.podspec +++ b/React/CoreModules/React-CoreModules.podspec @@ -34,10 +34,10 @@ Pod::Spec.new do |s| s.pod_target_xcconfig = { "USE_HEADERMAP" => "YES", "CLANG_CXX_LANGUAGE_STANDARD" => "c++17", - "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/React/CoreModules\" \"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/ReactCodegen/react/renderer/components\"" + "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/React/CoreModules\" \"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\"" } - s.dependency "ReactCodegen", version + s.dependency "React-Codegen", version s.dependency "RCT-Folly", folly_version s.dependency "RCTTypeSafety", version s.dependency "React-Core/CoreModulesHeaders", version diff --git a/React/React-RCTFabric.podspec b/React/React-RCTFabric.podspec index 5d007c82c84ce2..f15c1b7d89e1bc 100644 --- a/React/React-RCTFabric.podspec +++ b/React/React-RCTFabric.podspec @@ -36,7 +36,7 @@ Pod::Spec.new do |s| s.compiler_flags = folly_compiler_flags + ' ' + boost_compiler_flags s.header_dir = "React" s.framework = "JavaScriptCore" - s.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/Headers/Private/React-Core\" \"$(PODS_ROOT)/Headers/Public/ReactCodegen\"" } + s.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/Headers/Private/React-Core\" \"$(PODS_ROOT)/Headers/Public/React-Codegen\"" } s.xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/glog\" \"$(PODS_ROOT)/RCT-Folly\"", "CLANG_CXX_LANGUAGE_STANDARD" => "c++17", "OTHER_CFLAGS" => "$(inherited) -DRN_FABRIC_ENABLED" + " " + folly_flags } diff --git a/packages/rn-tester/NativeComponentExample/MyNativeView.podspec b/packages/rn-tester/NativeComponentExample/MyNativeView.podspec index 433588ff09b9a9..51bd7950a176a8 100644 --- a/packages/rn-tester/NativeComponentExample/MyNativeView.podspec +++ b/packages/rn-tester/NativeComponentExample/MyNativeView.podspec @@ -33,7 +33,7 @@ Pod::Spec.new do |s| s.dependency "React" s.dependency "React-RCTFabric" - s.dependency "ReactCodegen" + s.dependency "React-Codegen" s.dependency "RCTRequired" s.dependency "RCTTypeSafety" s.dependency "ReactCommon/turbomodule/core" diff --git a/scripts/react_native_pods.rb b/scripts/react_native_pods.rb index 1a9462603aebbc..928317cad46237 100644 --- a/scripts/react_native_pods.rb +++ b/scripts/react_native_pods.rb @@ -95,7 +95,7 @@ def use_react_native! (options={}) generate_react_codegen_podspec!(react_codegen_spec) end - pod 'ReactCodegen', :path => $CODEGEN_OUTPUT_DIR + pod 'React-Codegen', :path => $CODEGEN_OUTPUT_DIR if fabric_enabled checkAndGenerateEmptyThirdPartyProvider!(prefix) @@ -349,7 +349,7 @@ def get_react_codegen_spec(options={}) boost_compiler_flags = '-Wno-documentation' spec = { - 'name' => "ReactCodegen", + 'name' => "React-Codegen", 'version' => version, 'summary' => 'Temp pod for generated files for React Native', 'homepage' => 'https://facebook.com/', @@ -366,7 +366,7 @@ def get_react_codegen_spec(options={}) [ "\"$(PODS_ROOT)/boost\"", "\"$(PODS_ROOT)/RCT-Folly\"", - "\"${PODS_ROOT}/Headers/Public/ReactCodegen/react/renderer/components\"", + "\"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\"", "\"$(PODS_ROOT)/Headers/Private/React-Fabric\"", "\"$(PODS_ROOT)/Headers/Private/React-RCTFabric\"", ].join(' ') @@ -391,7 +391,7 @@ def get_react_codegen_spec(options={}) end if script_phases - Pod::UI.puts "[Codegen] Adding script_phases to ReactCodegen." + Pod::UI.puts "[Codegen] Adding script_phases to React-Codegen." spec[:'script_phases'] = script_phases end @@ -472,14 +472,14 @@ def generate_react_codegen_podspec!(spec) # This podspec file should only be create once in the session/pod install. # This happens when multiple targets are calling use_react_native!. if has_react_codegen_podspec_generated() - Pod::UI.puts "[Codegen] Skipping ReactCodegen podspec generation." + Pod::UI.puts "[Codegen] Skipping React-Codegen podspec generation." return end relative_installation_root = Pod::Config.instance.installation_root.relative_path_from(Pathname.pwd) output_dir = "#{relative_installation_root}/#{$CODEGEN_OUTPUT_DIR}" Pod::Executable.execute_command("mkdir", ["-p", output_dir]); - podspec_path = File.join(output_dir, 'ReactCodegen.podspec.json') + podspec_path = File.join(output_dir, 'React-Codegen.podspec.json') Pod::UI.puts "[Codegen] Generating #{podspec_path}" File.open(podspec_path, 'w') do |f| @@ -516,7 +516,7 @@ def use_react_native_codegen_discovery!(options={}) exit 1 end - # Generate ReactCodegen podspec here to add the script phases. + # Generate React-Codegen podspec here to add the script phases. script_phases = get_react_codegen_script_phases(options) react_codegen_spec = get_react_codegen_spec(fabric_enabled: fabric_enabled, script_phases: script_phases) generate_react_codegen_podspec!(react_codegen_spec) From e031cb09c96605184e269f3bf1ba4b4802127e95 Mon Sep 17 00:00:00 2001 From: Kudo Chien Date: Wed, 9 Mar 2022 21:24:33 +0800 Subject: [PATCH 5/6] Merge FBReactNativeSpec and React-Codegen as unified FBReactNativeSpec.podspec --- Libraries/Blob/React-RCTBlob.podspec | 4 +- Libraries/Image/React-RCTImage.podspec | 4 +- Libraries/LinkingIOS/React-RCTLinking.podspec | 4 +- .../React-RCTAnimation.podspec | 4 +- Libraries/Network/React-RCTNetwork.podspec | 4 +- .../React-RCTPushNotification.podspec | 4 +- Libraries/Settings/React-RCTSettings.podspec | 4 +- .../Vibration/React-RCTVibration.podspec | 4 +- React/CoreModules/React-CoreModules.podspec | 4 +- .../FBReactNativeSpec.podspec | 58 ------------------- React/React-RCTFabric.podspec | 2 +- .../MyNativeView.podspec | 2 +- scripts/react_native_pods.rb | 52 ++++++++++++----- 13 files changed, 56 insertions(+), 94 deletions(-) delete mode 100644 React/FBReactNativeSpec/FBReactNativeSpec.podspec diff --git a/Libraries/Blob/React-RCTBlob.podspec b/Libraries/Blob/React-RCTBlob.podspec index c5eb26e7aab7eb..6851840a92c481 100644 --- a/Libraries/Blob/React-RCTBlob.podspec +++ b/Libraries/Blob/React-RCTBlob.podspec @@ -35,11 +35,11 @@ Pod::Spec.new do |s| s.pod_target_xcconfig = { "USE_HEADERMAP" => "YES", "CLANG_CXX_LANGUAGE_STANDARD" => "c++17", - "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\"" + "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/FBReactNativeSpec/react/renderer/components\"" } s.dependency "RCT-Folly", folly_version - s.dependency "React-Codegen", version + s.dependency "FBReactNativeSpec", version s.dependency "ReactCommon/turbomodule/core", version s.dependency "React-jsi", version s.dependency "React-Core/RCTBlobHeaders", version diff --git a/Libraries/Image/React-RCTImage.podspec b/Libraries/Image/React-RCTImage.podspec index 704d80662cd7e9..0bdf77623d3eba 100644 --- a/Libraries/Image/React-RCTImage.podspec +++ b/Libraries/Image/React-RCTImage.podspec @@ -36,11 +36,11 @@ Pod::Spec.new do |s| s.pod_target_xcconfig = { "USE_HEADERMAP" => "YES", "CLANG_CXX_LANGUAGE_STANDARD" => "c++17", - "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\"" + "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/FBReactNativeSpec/react/renderer/components\"" } s.dependency "RCT-Folly", folly_version - s.dependency "React-Codegen", version + s.dependency "FBReactNativeSpec", version s.dependency "RCTTypeSafety", version s.dependency "ReactCommon/turbomodule/core", version s.dependency "React-jsi", version diff --git a/Libraries/LinkingIOS/React-RCTLinking.podspec b/Libraries/LinkingIOS/React-RCTLinking.podspec index bb1de98b3d3d52..2a424f11625149 100644 --- a/Libraries/LinkingIOS/React-RCTLinking.podspec +++ b/Libraries/LinkingIOS/React-RCTLinking.podspec @@ -36,10 +36,10 @@ Pod::Spec.new do |s| s.pod_target_xcconfig = { "USE_HEADERMAP" => "YES", "CLANG_CXX_LANGUAGE_STANDARD" => "c++17", - "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\"" + "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/FBReactNativeSpec/react/renderer/components\"" } - s.dependency "React-Codegen", version + s.dependency "FBReactNativeSpec", version s.dependency "React-Core/RCTLinkingHeaders", version s.dependency "ReactCommon/turbomodule/core", version s.dependency "React-jsi", version diff --git a/Libraries/NativeAnimation/React-RCTAnimation.podspec b/Libraries/NativeAnimation/React-RCTAnimation.podspec index d4b9cd0b13a167..9b78412fdaa160 100644 --- a/Libraries/NativeAnimation/React-RCTAnimation.podspec +++ b/Libraries/NativeAnimation/React-RCTAnimation.podspec @@ -35,11 +35,11 @@ Pod::Spec.new do |s| s.pod_target_xcconfig = { "USE_HEADERMAP" => "YES", "CLANG_CXX_LANGUAGE_STANDARD" => "c++17", - "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\"" + "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/FBReactNativeSpec/react/renderer/components\"" } s.dependency "RCT-Folly", folly_version - s.dependency "React-Codegen", version + s.dependency "FBReactNativeSpec", version s.dependency "RCTTypeSafety", version s.dependency "ReactCommon/turbomodule/core", version s.dependency "React-jsi", version diff --git a/Libraries/Network/React-RCTNetwork.podspec b/Libraries/Network/React-RCTNetwork.podspec index 3fde6323d94e3a..a5da01ebf47583 100644 --- a/Libraries/Network/React-RCTNetwork.podspec +++ b/Libraries/Network/React-RCTNetwork.podspec @@ -35,12 +35,12 @@ Pod::Spec.new do |s| s.pod_target_xcconfig = { "USE_HEADERMAP" => "YES", "CLANG_CXX_LANGUAGE_STANDARD" => "c++17", - "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\"" + "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/FBReactNativeSpec/react/renderer/components\"" } s.frameworks = "MobileCoreServices" s.dependency "RCT-Folly", folly_version - s.dependency "React-Codegen", version + s.dependency "FBReactNativeSpec", version s.dependency "RCTTypeSafety", version s.dependency "ReactCommon/turbomodule/core", version s.dependency "React-jsi", version diff --git a/Libraries/PushNotificationIOS/React-RCTPushNotification.podspec b/Libraries/PushNotificationIOS/React-RCTPushNotification.podspec index f7dcee8601282a..bf3cf08bb19843 100644 --- a/Libraries/PushNotificationIOS/React-RCTPushNotification.podspec +++ b/Libraries/PushNotificationIOS/React-RCTPushNotification.podspec @@ -36,11 +36,11 @@ Pod::Spec.new do |s| s.pod_target_xcconfig = { "USE_HEADERMAP" => "YES", "CLANG_CXX_LANGUAGE_STANDARD" => "c++17", - "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\"" + "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/FBReactNativeSpec/react/renderer/components\"" } s.framework = "UserNotifications" - s.dependency "React-Codegen", version + s.dependency "FBReactNativeSpec", version s.dependency "RCTTypeSafety", version s.dependency "React-Core/RCTPushNotificationHeaders", version s.dependency "ReactCommon/turbomodule/core", version diff --git a/Libraries/Settings/React-RCTSettings.podspec b/Libraries/Settings/React-RCTSettings.podspec index 72557510f2ab76..db3b3ae8a519ce 100644 --- a/Libraries/Settings/React-RCTSettings.podspec +++ b/Libraries/Settings/React-RCTSettings.podspec @@ -36,11 +36,11 @@ Pod::Spec.new do |s| s.pod_target_xcconfig = { "USE_HEADERMAP" => "YES", "CLANG_CXX_LANGUAGE_STANDARD" => "c++17", - "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\"" + "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/FBReactNativeSpec/react/renderer/components\"" } s.dependency "RCT-Folly", folly_version - s.dependency "React-Codegen", version + s.dependency "FBReactNativeSpec", version s.dependency "RCTTypeSafety", version s.dependency "ReactCommon/turbomodule/core", version s.dependency "React-jsi", version diff --git a/Libraries/Vibration/React-RCTVibration.podspec b/Libraries/Vibration/React-RCTVibration.podspec index 4ac3a6387c830a..b9b68bf9c62940 100644 --- a/Libraries/Vibration/React-RCTVibration.podspec +++ b/Libraries/Vibration/React-RCTVibration.podspec @@ -36,12 +36,12 @@ Pod::Spec.new do |s| s.pod_target_xcconfig = { "USE_HEADERMAP" => "YES", "CLANG_CXX_LANGUAGE_STANDARD" => "c++17", - "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\"" + "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/FBReactNativeSpec/react/renderer/components\"" } s.frameworks = "AudioToolbox" s.dependency "RCT-Folly", folly_version - s.dependency "React-Codegen", version + s.dependency "FBReactNativeSpec", version s.dependency "ReactCommon/turbomodule/core", version s.dependency "React-jsi", version s.dependency "React-Core/RCTVibrationHeaders", version diff --git a/React/CoreModules/React-CoreModules.podspec b/React/CoreModules/React-CoreModules.podspec index ce310b4c546ea5..a0ef6eda25fa93 100644 --- a/React/CoreModules/React-CoreModules.podspec +++ b/React/CoreModules/React-CoreModules.podspec @@ -34,10 +34,10 @@ Pod::Spec.new do |s| s.pod_target_xcconfig = { "USE_HEADERMAP" => "YES", "CLANG_CXX_LANGUAGE_STANDARD" => "c++17", - "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/React/CoreModules\" \"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\"" + "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/React/CoreModules\" \"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/FBReactNativeSpec/react/renderer/components\"" } - s.dependency "React-Codegen", version + s.dependency "FBReactNativeSpec", version s.dependency "RCT-Folly", folly_version s.dependency "RCTTypeSafety", version s.dependency "React-Core/CoreModulesHeaders", version diff --git a/React/FBReactNativeSpec/FBReactNativeSpec.podspec b/React/FBReactNativeSpec/FBReactNativeSpec.podspec deleted file mode 100644 index 61c46302c0946d..00000000000000 --- a/React/FBReactNativeSpec/FBReactNativeSpec.podspec +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright (c) Meta Platforms, Inc. and affiliates. -# -# This source code is licensed under the MIT license found in the -# LICENSE file in the root directory of this source tree. - -require "json" - -react_native_path = "../.." -require_relative "#{react_native_path}/scripts/react_native_pods.rb" - -package = JSON.parse(File.read(File.join(__dir__, "..", "..", "package.json"))) -version = package['version'] - -source = { :git => 'https://github.com/facebook/react-native.git' } -if version == '1000.0.0' - # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in. - source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1") -else - source[:tag] = "v#{version}" -end - -folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32' -folly_version = '2021.06.28.00-v2' - -Pod::Spec.new do |s| - s.name = "FBReactNativeSpec" - s.version = version - s.summary = "-" # TODO - s.homepage = "https://reactnative.dev/" - s.license = package["license"] - s.author = "Facebook, Inc. and its affiliates" - s.platforms = { :ios => "11.0" } - s.compiler_flags = folly_compiler_flags + ' -Wno-nullability-completeness' - s.source = source - # This podspec is used to trigger the codegen, and built files are generated in a different location. - # We don't want this pod to actually include any files. - s.header_dir = "FBReactNativeSpec" - - s.pod_target_xcconfig = { - "USE_HEADERMAP" => "YES", - "CLANG_CXX_LANGUAGE_STANDARD" => "c++17", - "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\"" - } - - s.dependency "RCT-Folly", folly_version - s.dependency "RCTRequired", version - s.dependency "RCTTypeSafety", version - s.dependency "React-Core", version - s.dependency "React-jsi", version - s.dependency "ReactCommon/turbomodule/core", version - - use_react_native_codegen!(s, { - :react_native_path => react_native_path, - :js_srcs_dir => "#{react_native_path}/Libraries", - :library_name => "FBReactNativeSpec", - :library_type => "modules", - }) -end diff --git a/React/React-RCTFabric.podspec b/React/React-RCTFabric.podspec index f15c1b7d89e1bc..34328d6ff29f3c 100644 --- a/React/React-RCTFabric.podspec +++ b/React/React-RCTFabric.podspec @@ -36,7 +36,7 @@ Pod::Spec.new do |s| s.compiler_flags = folly_compiler_flags + ' ' + boost_compiler_flags s.header_dir = "React" s.framework = "JavaScriptCore" - s.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/Headers/Private/React-Core\" \"$(PODS_ROOT)/Headers/Public/React-Codegen\"" } + s.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/Headers/Private/React-Core\" \"$(PODS_ROOT)/Headers/Public/FBReactNativeSpec\"" } s.xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/glog\" \"$(PODS_ROOT)/RCT-Folly\"", "CLANG_CXX_LANGUAGE_STANDARD" => "c++17", "OTHER_CFLAGS" => "$(inherited) -DRN_FABRIC_ENABLED" + " " + folly_flags } diff --git a/packages/rn-tester/NativeComponentExample/MyNativeView.podspec b/packages/rn-tester/NativeComponentExample/MyNativeView.podspec index 51bd7950a176a8..cc1f312eb1cf4e 100644 --- a/packages/rn-tester/NativeComponentExample/MyNativeView.podspec +++ b/packages/rn-tester/NativeComponentExample/MyNativeView.podspec @@ -33,7 +33,7 @@ Pod::Spec.new do |s| s.dependency "React" s.dependency "React-RCTFabric" - s.dependency "React-Codegen" + s.dependency "FBReactNativeSpec" s.dependency "RCTRequired" s.dependency "RCTTypeSafety" s.dependency "ReactCommon/turbomodule/core" diff --git a/scripts/react_native_pods.rb b/scripts/react_native_pods.rb index 928317cad46237..4f5f9fcd15b49a 100644 --- a/scripts/react_native_pods.rb +++ b/scripts/react_native_pods.rb @@ -42,7 +42,6 @@ def use_react_native! (options={}) # The Pods which should be included in all projects pod 'FBLazyVector', :path => "#{prefix}/Libraries/FBLazyVector" - pod 'FBReactNativeSpec', :path => "#{prefix}/React/FBReactNativeSpec" pod 'RCTRequired', :path => "#{prefix}/Libraries/RCTRequired" pod 'RCTTypeSafety', :path => "#{prefix}/Libraries/TypeSafety" pod 'React', :path => "#{prefix}/" @@ -95,7 +94,7 @@ def use_react_native! (options={}) generate_react_codegen_podspec!(react_codegen_spec) end - pod 'React-Codegen', :path => $CODEGEN_OUTPUT_DIR + pod 'FBReactNativeSpec', :path => $CODEGEN_OUTPUT_DIR if fabric_enabled checkAndGenerateEmptyThirdPartyProvider!(prefix) @@ -349,7 +348,7 @@ def get_react_codegen_spec(options={}) boost_compiler_flags = '-Wno-documentation' spec = { - 'name' => "React-Codegen", + 'name' => "FBReactNativeSpec", 'version' => version, 'summary' => 'Temp pod for generated files for React Native', 'homepage' => 'https://facebook.com/', @@ -357,7 +356,6 @@ def get_react_codegen_spec(options={}) 'authors' => 'Facebook', 'compiler_flags' => "#{folly_compiler_flags} #{boost_compiler_flags} -Wno-nullability-completeness -std=c++17", 'source' => { :git => '' }, - 'header_mappings_dir' => './', 'platforms' => { 'ios' => '11.0', }, @@ -366,13 +364,12 @@ def get_react_codegen_spec(options={}) [ "\"$(PODS_ROOT)/boost\"", "\"$(PODS_ROOT)/RCT-Folly\"", - "\"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\"", + "\"${PODS_ROOT}/Headers/Public/FBReactNativeSpec/react/renderer/components\"", "\"$(PODS_ROOT)/Headers/Private/React-Fabric\"", "\"$(PODS_ROOT)/Headers/Private/React-RCTFabric\"", ].join(' ') }, 'dependencies': { - "FBReactNativeSpec": [version], "React-jsiexecutor": [version], "RCT-Folly": [folly_version], "RCTRequired": [version], @@ -388,13 +385,27 @@ def get_react_codegen_spec(options={}) 'React-graphics': [version], 'React-rncore': [version], }); + + # only setup header_mappings_dir for fabric mode, because there are still some other imports like `rncore`. + # however, set header_mappings_dir will break `use_frameworks!` build for FBReactNativeSpec. + # so far `use_frameworks!` with fabric is not supported. + spec[:header_mappings_dir] = '.' end if script_phases - Pod::UI.puts "[Codegen] Adding script_phases to React-Codegen." + Pod::UI.puts "[Codegen] Adding script_phases to FBReactNativeSpec." spec[:'script_phases'] = script_phases end + codegen_output_dir = Pod::Config.instance.installation_root + $CODEGEN_OUTPUT_DIR + use_react_native_codegen!(spec, { + :react_native_path => Pathname.new("#{__dir__}/..").relative_path_from(codegen_output_dir), + :js_srcs_dir => Pathname.new("#{__dir__}/../Libraries").relative_path_from(Pathname.pwd), + :js_srcs_dir_in_script_phase => Pathname.new("#{__dir__}/../Libraries").relative_path_from(codegen_output_dir), + :library_name => "FBReactNativeSpec", + :library_type => "modules", + }) + return spec end @@ -449,7 +460,7 @@ def get_react_codegen_script_phases(options={}) 'execution_position': :before_compile, 'input_files' => input_files, 'show_env_vars_in_log': true, - 'output_files': ["${DERIVED_FILE_DIR}/react-codegen.log"], + 'output_files': ["${DERIVED_FILE_DIR}/FBReactNativeSpec.log"], 'script': get_script_phases_with_codegen_discovery( react_native_path: react_native_path, relative_app_root: relative_app_root, @@ -472,14 +483,14 @@ def generate_react_codegen_podspec!(spec) # This podspec file should only be create once in the session/pod install. # This happens when multiple targets are calling use_react_native!. if has_react_codegen_podspec_generated() - Pod::UI.puts "[Codegen] Skipping React-Codegen podspec generation." + Pod::UI.puts "[Codegen] Skipping FBReactNativeSpec podspec generation." return end relative_installation_root = Pod::Config.instance.installation_root.relative_path_from(Pathname.pwd) output_dir = "#{relative_installation_root}/#{$CODEGEN_OUTPUT_DIR}" Pod::Executable.execute_command("mkdir", ["-p", output_dir]); - podspec_path = File.join(output_dir, 'React-Codegen.podspec.json') + podspec_path = File.join(output_dir, 'FBReactNativeSpec.podspec.json') Pod::UI.puts "[Codegen] Generating #{podspec_path}" File.open(podspec_path, 'w') do |f| @@ -516,7 +527,7 @@ def use_react_native_codegen_discovery!(options={}) exit 1 end - # Generate React-Codegen podspec here to add the script phases. + # Generate FBReactNativeSpec podspec here to add the script phases. script_phases = get_react_codegen_script_phases(options) react_codegen_spec = get_react_codegen_spec(fabric_enabled: fabric_enabled, script_phases: script_phases) generate_react_codegen_podspec!(react_codegen_spec) @@ -577,6 +588,7 @@ def use_react_native_codegen!(spec, options={}) # The path to JavaScript files js_srcs_dir = options[:js_srcs_dir] ||= "./" + js_srcs_dir_in_script_phase = options[:js_srcs_dir_in_script_phase] ||= js_srcs_dir library_type = options[:library_type] if library_type @@ -605,27 +617,35 @@ def use_react_native_codegen!(spec, options={}) # Prepare filesystem by creating empty files that will be picked up as references by CocoaPods. prepare_command = "mkdir -p #{generated_dirs.join(" ")} && touch -a #{generated_files.join(" ")}" system(prepare_command) # Always run prepare_command when a podspec uses the codegen, as CocoaPods may skip invoking this command in certain scenarios. Replace with pre_integrate_hook after updating to CocoaPods 1.11 - spec.prepare_command = prepare_command - spec.script_phase = { + script_phases = [{ :name => 'Generate Specs', :input_files => input_files, # This also needs to be relative to Xcode :output_files => ["${DERIVED_FILE_DIR}/codegen-#{library_name}.log"].concat(generated_files.map { |filename| " ${PODS_TARGET_SRCROOT}/#{filename}"} ), # The final generated files will be created when this script is invoked at Xcode build time. :script => get_script_phases_no_codegen_discovery( react_native_path: react_native_path, - codegen_output_dir: $CODEGEN_OUTPUT_DIR, + codegen_output_dir: output_dir, codegen_module_dir: $CODEGEN_MODULE_DIR, codegen_component_dir: $CODEGEN_COMPONENT_DIR, library_name: library_name, library_type: library_type, js_srcs_pattern: js_srcs_pattern, - js_srcs_dir: js_srcs_dir, + js_srcs_dir: js_srcs_dir_in_script_phase, file_list: file_list ), :execution_position => :before_compile, :show_env_vars_in_log => true - } + }] + + if spec.class == Pod::Specification + spec.prepare_command = prepare_command + spec.script_phases += script_phases + else + spec[:prepare_command] = prepare_command + spec[:script_phases] ||= [] + spec[:script_phases] += script_phases + end end def locatePathToHermesSource!(react_native_path) From ac955236ef5a2790552a7ebf414feb2d02e79498 Mon Sep 17 00:00:00 2001 From: Kudo Chien Date: Wed, 9 Mar 2022 22:05:49 +0800 Subject: [PATCH 6/6] update podfile.lock --- packages/rn-tester/Podfile.lock | 106 ++++++++++++++------------------ 1 file changed, 47 insertions(+), 59 deletions(-) diff --git a/packages/rn-tester/Podfile.lock b/packages/rn-tester/Podfile.lock index 4721993ddff08d..f8368f3b3d1ad7 100644 --- a/packages/rn-tester/Podfile.lock +++ b/packages/rn-tester/Podfile.lock @@ -8,7 +8,10 @@ PODS: - RCTRequired (= 1000.0.0) - RCTTypeSafety (= 1000.0.0) - React-Core (= 1000.0.0) + - React-graphics (= 1000.0.0) - React-jsi (= 1000.0.0) + - React-jsiexecutor (= 1000.0.0) + - React-rncore (= 1000.0.0) - ReactCommon/turbomodule/core (= 1000.0.0) - Flipper (0.125.0): - Flipper-Folly (~> 2.6) @@ -111,17 +114,6 @@ PODS: - React-RCTText (= 1000.0.0) - React-RCTVibration (= 1000.0.0) - React-callinvoker (1000.0.0) - - React-Codegen (1000.0.0): - - FBReactNativeSpec (= 1000.0.0) - - RCT-Folly (= 2021.06.28.00-v2) - - RCTRequired (= 1000.0.0) - - RCTTypeSafety (= 1000.0.0) - - React-Core (= 1000.0.0) - - React-graphics (= 1000.0.0) - - React-jsi (= 1000.0.0) - - React-jsiexecutor (= 1000.0.0) - - React-rncore (= 1000.0.0) - - ReactCommon/turbomodule/core (= 1000.0.0) - React-Core (1000.0.0): - glog - RCT-Folly (= 2021.06.28.00-v2) @@ -259,9 +251,9 @@ PODS: - React-perflogger (= 1000.0.0) - Yoga - React-CoreModules (1000.0.0): + - FBReactNativeSpec (= 1000.0.0) - RCT-Folly (= 2021.06.28.00-v2) - RCTTypeSafety (= 1000.0.0) - - React-Codegen (= 1000.0.0) - React-Core/CoreModulesHeaders (= 1000.0.0) - React-jsi (= 1000.0.0) - React-RCTImage (= 1000.0.0) @@ -618,15 +610,15 @@ PODS: - React-RCTActionSheet (1000.0.0): - React-Core/RCTActionSheetHeaders (= 1000.0.0) - React-RCTAnimation (1000.0.0): + - FBReactNativeSpec (= 1000.0.0) - RCT-Folly (= 2021.06.28.00-v2) - RCTTypeSafety (= 1000.0.0) - - React-Codegen (= 1000.0.0) - React-Core/RCTAnimationHeaders (= 1000.0.0) - React-jsi (= 1000.0.0) - ReactCommon/turbomodule/core (= 1000.0.0) - React-RCTBlob (1000.0.0): + - FBReactNativeSpec (= 1000.0.0) - RCT-Folly (= 2021.06.28.00-v2) - - React-Codegen (= 1000.0.0) - React-Core/RCTBlobHeaders (= 1000.0.0) - React-Core/RCTWebSocket (= 1000.0.0) - React-jsi (= 1000.0.0) @@ -638,35 +630,35 @@ PODS: - React-Fabric (= 1000.0.0) - React-RCTImage (= 1000.0.0) - React-RCTImage (1000.0.0): + - FBReactNativeSpec (= 1000.0.0) - RCT-Folly (= 2021.06.28.00-v2) - RCTTypeSafety (= 1000.0.0) - - React-Codegen (= 1000.0.0) - React-Core/RCTImageHeaders (= 1000.0.0) - React-jsi (= 1000.0.0) - React-RCTNetwork (= 1000.0.0) - ReactCommon/turbomodule/core (= 1000.0.0) - React-RCTLinking (1000.0.0): - - React-Codegen (= 1000.0.0) + - FBReactNativeSpec (= 1000.0.0) - React-Core/RCTLinkingHeaders (= 1000.0.0) - React-jsi (= 1000.0.0) - ReactCommon/turbomodule/core (= 1000.0.0) - React-RCTNetwork (1000.0.0): + - FBReactNativeSpec (= 1000.0.0) - RCT-Folly (= 2021.06.28.00-v2) - RCTTypeSafety (= 1000.0.0) - - React-Codegen (= 1000.0.0) - React-Core/RCTNetworkHeaders (= 1000.0.0) - React-jsi (= 1000.0.0) - ReactCommon/turbomodule/core (= 1000.0.0) - React-RCTPushNotification (1000.0.0): + - FBReactNativeSpec (= 1000.0.0) - RCTTypeSafety (= 1000.0.0) - - React-Codegen (= 1000.0.0) - React-Core/RCTPushNotificationHeaders (= 1000.0.0) - React-jsi (= 1000.0.0) - ReactCommon/turbomodule/core (= 1000.0.0) - React-RCTSettings (1000.0.0): + - FBReactNativeSpec (= 1000.0.0) - RCT-Folly (= 2021.06.28.00-v2) - RCTTypeSafety (= 1000.0.0) - - React-Codegen (= 1000.0.0) - React-Core/RCTSettingsHeaders (= 1000.0.0) - React-jsi (= 1000.0.0) - ReactCommon/turbomodule/core (= 1000.0.0) @@ -679,8 +671,8 @@ PODS: - React-RCTText (1000.0.0): - React-Core/RCTTextHeaders (= 1000.0.0) - React-RCTVibration (1000.0.0): + - FBReactNativeSpec (= 1000.0.0) - RCT-Folly (= 2021.06.28.00-v2) - - React-Codegen (= 1000.0.0) - React-Core/RCTVibrationHeaders (= 1000.0.0) - React-jsi (= 1000.0.0) - ReactCommon/turbomodule/core (= 1000.0.0) @@ -720,7 +712,7 @@ DEPENDENCIES: - boost (from `../../third-party-podspecs/boost.podspec`) - DoubleConversion (from `../../third-party-podspecs/DoubleConversion.podspec`) - FBLazyVector (from `../../Libraries/FBLazyVector`) - - FBReactNativeSpec (from `../../React/FBReactNativeSpec`) + - FBReactNativeSpec (from `build/generated/ios`) - Flipper (= 0.125.0) - Flipper-Boost-iOSX (= 1.76.0.1.11) - Flipper-DoubleConversion (= 3.1.7) @@ -750,7 +742,6 @@ DEPENDENCIES: - RCTTypeSafety (from `../../Libraries/TypeSafety`) - React (from `../../`) - React-callinvoker (from `../../ReactCommon/callinvoker`) - - React-Codegen (from `build/generated/ios`) - React-Core (from `../../`) - React-Core/DevSupport (from `../../`) - React-Core/RCTWebSocket (from `../../`) @@ -809,7 +800,7 @@ EXTERNAL SOURCES: FBLazyVector: :path: "../../Libraries/FBLazyVector" FBReactNativeSpec: - :path: "../../React/FBReactNativeSpec" + :path: build/generated/ios glog: :podspec: "../../third-party-podspecs/glog.podspec" RCT-Folly: @@ -822,8 +813,6 @@ EXTERNAL SOURCES: :path: "../../" React-callinvoker: :path: "../../ReactCommon/callinvoker" - React-Codegen: - :path: build/generated/ios React-Core: :path: "../../" React-CoreModules: @@ -883,8 +872,8 @@ SPEC CHECKSUMS: boost: a7c83b31436843459a1961bfd74b96033dc77234 CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99 DoubleConversion: 831926d9b8bf8166fd87886c4abab286c2422662 - FBLazyVector: b81a2b70c72d8b0aefb652cea22c11e9ffd02949 - FBReactNativeSpec: 04dbf2a5d787706cace2f2af8ff3790333b761cd + FBLazyVector: a005a8685b3a8640f1ce9a97698e0394ecbe9b16 + FBReactNativeSpec: 5e47289b84d0b5f2abe6c6d1499505eff745ca89 Flipper: 26fc4b7382499f1281eb8cb921e5c3ad6de91fe0 Flipper-Boost-iOSX: fd1e2b8cbef7e662a122412d7ac5f5bea715403c Flipper-DoubleConversion: 57ffbe81ef95306cc9e69c4aa3aeeeeb58a6a28c @@ -899,39 +888,38 @@ SPEC CHECKSUMS: libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c RCT-Folly: 4d8508a426467c48885f1151029bc15fa5d7b3b8 - RCTRequired: af2d6080a4b9ba0885b28ca78879a92066c71cab - RCTTypeSafety: 2d6c5149fd3b8f2ba89987b47169423efb740300 - React: f64c9f6db5428717922a3292ba6a448615a2e143 - React-callinvoker: c5d61e29df57793f0dc10ec2bc01c846f863e51f - React-Codegen: c4ae835565487e494740b756ce953d8f635a76df - React-Core: 30784d0eacbd709a3a6a5ae7c02c928634a6247e - React-CoreModules: e784fdac1d0293963fc06646aa76cfdcd906a754 - React-cxxreact: cfc1663dae1ea52b465bbf021ef7b1527c5dc80c - React-Fabric: 30b8fa96a0c56d1c11348f77607464eb87bb3f9f - React-graphics: 9a84942b49ea1375ce83844041fa2ba766cfe0b9 - React-jsi: c1c0108d86e1378aabf7c9146ed7d12d87c7df85 - React-jsiexecutor: d08ec14edc8f2e19af51550cd1505332eae35c7b - React-jsinspector: 7d223826b0e7a61b3540c21b9eca2603b1d4e823 - React-logger: 2009c0280c286a76200d6b7c5fe242fad51ddd7a - React-perflogger: fe66bd6d8b17ebcfdf0159bf41fe28d8035ac20c - React-RCTActionSheet: 3131a0b9280aa0e51bdf54b3d79aecd8503db62c - React-RCTAnimation: 218e2557f9803c1d8b4fd814b6c54b223ee18cda - React-RCTBlob: f94c621fa9851a5f81da471016ce5d91d29b2c7f - React-RCTFabric: 134127990b95158033ff22db25f5474d4aeecc96 - React-RCTImage: 996407b090e9fa8bb2213b6887676b1541052cb5 - React-RCTLinking: 6fcb5735f35935e0e53dc45e97f77234d7920232 - React-RCTNetwork: 2d51ae6d31c26bbcaab9abd56e523f8010cc57ae - React-RCTPushNotification: c5dfa4ab4da2b5312223334a55b30527218197d4 - React-RCTSettings: 9f897f32b7c4d0bc9a2718b7cb7d4f193889f5e3 - React-RCTTest: 7cbcd615b1e74ad59c9ad4257e6c323482114173 - React-RCTText: e9146b2c0550a83d1335bfe2553760070a2d75c7 - React-RCTVibration: 9a73a3550a0ee184530341f91f9b85ad9cf3465a - React-rncore: 69bf49af24eafcd61f1e352c0cbff5cf17e70ed4 - React-runtimeexecutor: 4b0c6eb341c7d3ceb5e2385cb0fdb9bf701024f3 - ReactCommon: 9607f2246289d573adcbd144c02c19ae5246d6a5 - ScreenshotManager: 2e9d0bca1461f67405d21ca06a609cb844c3fb3c + RCTRequired: 815a6a9cea9cfc47cbfb4033c6dedf3db3671bba + RCTTypeSafety: 1c5c32d597e1630f613fac335c2f97f25ea279b7 + React: 73b95b3acb9069b222c527eeac24a55f8d0db327 + React-callinvoker: 672b6f5bf7fc60721d54d54502350c7f96aac86c + React-Core: 8246bc913c2032806dd5d807ba8f4f40c57e5f1c + React-CoreModules: f3586a9d20aa99202eb5d4c2ffd0362cd0a83ae6 + React-cxxreact: b2e253f4a2e9cf479245831f14e3bdede29782d7 + React-Fabric: b3a8fd20a390bfcbc768defc770c0a4080fd67dd + React-graphics: 5ac4aae4362199ec2df3855638170f3c3f7061dd + React-jsi: 599288ef0c58f4fe2f2ce2eaded751ae1fad0b8a + React-jsiexecutor: 717c1163ca923ea96c47639230ad581133baa95b + React-jsinspector: 6d8d003e8c3e9507772ba38725b1a4be7ca99e00 + React-logger: b535dbd8d1bb04d63afe9aea9ce59612ac38d5b3 + React-perflogger: eb52a39b66ad73c077799d3c6fb3b92fdddb879f + React-RCTActionSheet: 7b6917a8c46d2bca76ef4707863d7b36d9070e50 + React-RCTAnimation: 09fc831ccb5ebad4d49f00b7879a3c9bb9bac8e2 + React-RCTBlob: c08ed4da5ee422ff9d9b2f1a475cb210962032be + React-RCTFabric: 7fb7a5f8dfaccdddb95f0581a4b70618275aff87 + React-RCTImage: 34442ba1b1804f2d4cd6495dc7427719f2c98d06 + React-RCTLinking: 54becb47a53d37a2461a1d268f18c17dcedee5d1 + React-RCTNetwork: 487c62fdf74879d930354bfbdb8306eb63bbca23 + React-RCTPushNotification: 56265e21fdbf7c74b6a6c558d6c2224f7376c17a + React-RCTSettings: a5b84c10d1c73c204b6742d7d29af3d3652de1cc + React-RCTTest: bae2db58f086a04423fb8b5daf4d4e7b42865aee + React-RCTText: 317d4e9ba6ffab6e8b94ce0e5d8fce844b11984e + React-RCTVibration: 899c059281855ed770caf9eb404f2ecd64100c0c + React-rncore: bb13cf657a4ae8ecc7366d2e316884775ef4a387 + React-runtimeexecutor: 209c058977f0e505f169a103d4882ad8fcc7b4da + ReactCommon: d4073a6b621d41e240656291c6296bfbacc45a6c + ScreenshotManager: 4169f9c9e72feff321c625a774ee3cdb689179ac SocketRocket: fccef3f9c5cedea1353a9ef6ada904fde10d6608 - Yoga: c0d06f5380d34e939f55420669a60fe08b79bd75 + Yoga: 9ee78b5d98e721d8c0e8857003a0a2dfb7b79a71 YogaKit: f782866e155069a2cca2517aafea43200b01fd5a PODFILE CHECKSUM: 064c91fbb8ac895e453a791ebaaae5cfe9c8557d