diff --git a/packages/react-native/Libraries/AppDelegate/RCTAppDelegate.mm b/packages/react-native/Libraries/AppDelegate/RCTAppDelegate.mm index d666fe31c1005d..30dc2384dead0e 100644 --- a/packages/react-native/Libraries/AppDelegate/RCTAppDelegate.mm +++ b/packages/react-native/Libraries/AppDelegate/RCTAppDelegate.mm @@ -12,6 +12,7 @@ #import #import "RCTAppSetupUtils.h" #import "RCTLegacyInteropComponents.h" +#import #if RCT_NEW_ARCH_ENABLED #import @@ -49,6 +50,21 @@ @interface RCTAppDelegate () < #endif + +#if TARGET_OS_VISION +@interface GlassViewController : UIViewController + +@end + +@implementation GlassViewController + +- (UIContainerBackgroundStyle)preferredContainerBackgroundStyle { + return UIContainerBackgroundStyleGlass; +} + +@end +#endif + @interface RCTAppDelegate () { std::shared_ptr _runtimeScheduler; } @@ -121,7 +137,13 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:( NSDictionary *initProps = [self prepareInitialProps]; rootView = [self createRootViewWithBridge:self.bridge moduleName:self.moduleName initProps:initProps]; } + +#if TARGET_OS_VISION + self.window = [[UIWindow alloc] initWithFrame:RCTForegroundWindow().bounds]; +#else self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds]; +#endif + UIViewController *rootViewController = [self createRootViewController]; [self setRootView:rootView toRootViewController:rootViewController]; self.window.rootViewController = rootViewController; @@ -173,7 +195,11 @@ - (UIView *)createRootViewWithBridge:(RCTBridge *)bridge - (UIViewController *)createRootViewController { +#if TARGET_OS_VISION + return [GlassViewController new]; +#else return [UIViewController new]; +#endif } - (void)setRootView:(UIView *)rootView toRootViewController:(UIViewController *)rootViewController diff --git a/packages/react-native/Libraries/NativeAnimation/RCTAnimationUtils.h b/packages/react-native/Libraries/NativeAnimation/RCTAnimationUtils.h index 77152f4a5773de..562913126e9442 100644 --- a/packages/react-native/Libraries/NativeAnimation/RCTAnimationUtils.h +++ b/packages/react-native/Libraries/NativeAnimation/RCTAnimationUtils.h @@ -7,6 +7,7 @@ #import #import +#import #import diff --git a/packages/react-native/Libraries/PushNotificationIOS/RCTPushNotificationManager.h b/packages/react-native/Libraries/PushNotificationIOS/RCTPushNotificationManager.h index 778db415b5875c..64db4431c3e1b3 100644 --- a/packages/react-native/Libraries/PushNotificationIOS/RCTPushNotificationManager.h +++ b/packages/react-native/Libraries/PushNotificationIOS/RCTPushNotificationManager.h @@ -13,7 +13,7 @@ extern NSString *const RCTRemoteNotificationReceived; typedef void (^RCTRemoteNotificationCallback)(UIBackgroundFetchResult result); -#if !TARGET_OS_UIKITFORMAC +#if !TARGET_OS_UIKITFORMAC && !TARGET_OS_VISION + (void)didRegisterUserNotificationSettings:(UIUserNotificationSettings *)notificationSettings; + (void)didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken; + (void)didReceiveRemoteNotification:(NSDictionary *)notification; diff --git a/packages/react-native/Libraries/PushNotificationIOS/RCTPushNotificationManager.mm b/packages/react-native/Libraries/PushNotificationIOS/RCTPushNotificationManager.mm index 0d586d8e65dd99..b184d600aaf3d1 100644 --- a/packages/react-native/Libraries/PushNotificationIOS/RCTPushNotificationManager.mm +++ b/packages/react-native/Libraries/PushNotificationIOS/RCTPushNotificationManager.mm @@ -24,7 +24,7 @@ static NSString *const kErrorUnableToRequestPermissions = @"E_UNABLE_TO_REQUEST_PERMISSIONS"; -#if !TARGET_OS_UIKITFORMAC +#if !TARGET_OS_UIKITFORMAC && !TARGET_OS_VISION @implementation RCTConvert (NSCalendarUnit) RCT_ENUM_CONVERTER( @@ -81,13 +81,13 @@ + (UILocalNotification *)UILocalNotification:(id)json @end #else -@interface RCTPushNotificationManager () +@interface RCTPushNotificationManager () @end #endif // TARGET_OS_UIKITFORMAC @implementation RCTPushNotificationManager -#if !TARGET_OS_UIKITFORMAC +#if !TARGET_OS_UIKITFORMAC && !TARGET_OS_VISION static NSDictionary *RCTFormatLocalNotification(UILocalNotification *notification) { @@ -140,7 +140,7 @@ - (dispatch_queue_t)methodQueue return dispatch_get_main_queue(); } -#if !TARGET_OS_UIKITFORMAC +#if !TARGET_OS_UIKITFORMAC && !TARGET_OS_VISION - (void)startObserving { [[NSNotificationCenter defaultCenter] addObserver:self diff --git a/packages/react-native/Libraries/Text/Text/RCTTextView.mm b/packages/react-native/Libraries/Text/Text/RCTTextView.mm index 3f64e313ab58f1..5e5362bc6e76d9 100644 --- a/packages/react-native/Libraries/Text/Text/RCTTextView.mm +++ b/packages/react-native/Libraries/Text/Text/RCTTextView.mm @@ -225,7 +225,7 @@ - (void)disableContextMenu - (void)handleLongPress:(UILongPressGestureRecognizer *)gesture { // TODO: Adopt showMenuFromRect (necessary for UIKitForMac) -#if !TARGET_OS_UIKITFORMAC +#if !TARGET_OS_UIKITFORMAC && !TARGET_OS_VISION UIMenuController *menuController = [UIMenuController sharedMenuController]; if (menuController.isMenuVisible) { diff --git a/packages/react-native/Libraries/Text/TextInput/RCTBaseTextInputView.mm b/packages/react-native/Libraries/Text/TextInput/RCTBaseTextInputView.mm index b0d71dcd3508bb..c6f15d8679bfc2 100644 --- a/packages/react-native/Libraries/Text/TextInput/RCTBaseTextInputView.mm +++ b/packages/react-native/Libraries/Text/TextInput/RCTBaseTextInputView.mm @@ -642,6 +642,7 @@ - (void)didSetProps:(NSArray *)changedProps - (void)setCustomInputAccessoryViewWithNativeID:(NSString *)nativeID { +#if !TARGET_OS_VISION __weak RCTBaseTextInputView *weakSelf = self; [_bridge.uiManager rootViewForReactTag:self.reactTag withCompletion:^(UIView *rootView) { @@ -656,10 +657,12 @@ - (void)setCustomInputAccessoryViewWithNativeID:(NSString *)nativeID } } }]; +#endif } - (void)setDefaultInputAccessoryView { +#if !TARGET_OS_VISION UIView *textInputView = self.backedTextInputView; UIKeyboardType keyboardType = textInputView.keyboardType; @@ -691,6 +694,7 @@ - (void)setDefaultInputAccessoryView textInputView.inputAccessoryView = nil; } [self reloadInputViewsIfNecessary]; +#endif } - (void)reloadInputViewsIfNecessary diff --git a/packages/react-native/React-Core.podspec b/packages/react-native/React-Core.podspec index cf69ac3c867ae5..e0ba40c3db337c 100644 --- a/packages/react-native/React-Core.podspec +++ b/packages/react-native/React-Core.podspec @@ -18,7 +18,7 @@ end folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -DFOLLY_CFG_NO_COROUTINES=1 -Wno-comma -Wno-shorten-64-to-32' folly_version = '2022.05.16.00' -socket_rocket_version = '0.6.0' +socket_rocket_version = '0.6.0.2' boost_compiler_flags = '-Wno-documentation' use_hermes = ENV['USE_HERMES'] == nil || ENV['USE_HERMES'] == '1' diff --git a/packages/react-native/React/Base/RCTConvert.m b/packages/react-native/React/Base/RCTConvert.m index 3a7d2b4fc35d00..d255a00e198ec8 100644 --- a/packages/react-native/React/Base/RCTConvert.m +++ b/packages/react-native/React/Base/RCTConvert.m @@ -551,8 +551,8 @@ + (UIKeyboardType)UIKeyboardType:(id)json RCT_DYNAMIC (@{ @"default" : @(UIBarStyleDefault), @"black" : @(UIBarStyleBlack), - @"blackOpaque" : @(UIBarStyleBlackOpaque), - @"blackTranslucent" : @(UIBarStyleBlackTranslucent), + @"blackOpaque" : @(UIBarStyleBlack), + @"blackTranslucent" : @(UIBarStyleBlack), }), UIBarStyleDefault, integerValue) diff --git a/packages/react-native/React/Base/RCTKeyCommands.m b/packages/react-native/React/Base/RCTKeyCommands.m index 1ceaf6ec0dceb1..2643e368afc819 100644 --- a/packages/react-native/React/Base/RCTKeyCommands.m +++ b/packages/react-native/React/Base/RCTKeyCommands.m @@ -127,8 +127,11 @@ - (void)handleKeyUIEventSwizzle:(UIEvent *)event if ([event respondsToSelector:@selector(_isKeyDown)]) { isKeyDown = [event _isKeyDown]; } - +#if !TARGET_OS_VISION BOOL interactionEnabled = !RCTSharedApplication().isIgnoringInteractionEvents; +#else + BOOL interactionEnabled = true; +#endif BOOL hasFirstResponder = NO; if (isKeyDown && modifiedInput.length > 0 && interactionEnabled) { UIResponder *firstResponder = nil; diff --git a/packages/react-native/React/Base/RCTUtils.h b/packages/react-native/React/Base/RCTUtils.h index dc218c47f199fc..bc10d438851049 100644 --- a/packages/react-native/React/Base/RCTUtils.h +++ b/packages/react-native/React/Base/RCTUtils.h @@ -91,6 +91,11 @@ RCT_EXTERN UIApplication *__nullable RCTSharedApplication(void); // or view controller RCT_EXTERN UIWindow *__nullable RCTKeyWindow(void); +#if TARGET_OS_VISION +// Returns the current active UIWindow based on UIWindowScene +RCT_EXTERN UIWindow *__nullable RCTForegroundWindow(void); +#endif + // Returns the presented view controller, useful if you need // e.g. to present a modal view controller or alert over it RCT_EXTERN UIViewController *__nullable RCTPresentedViewController(void); diff --git a/packages/react-native/React/Base/RCTUtils.m b/packages/react-native/React/Base/RCTUtils.m index 01bd5cde9fc3df..ff358310333b93 100644 --- a/packages/react-native/React/Base/RCTUtils.m +++ b/packages/react-native/React/Base/RCTUtils.m @@ -301,18 +301,23 @@ static void RCTUnsafeExecuteOnMainQueueOnceSync(dispatch_once_t *onceToken, disp void RCTComputeScreenScale(void) { +#if !TARGET_OS_VISION dispatch_once(&onceTokenScreenScale, ^{ screenScale = [UIScreen mainScreen].scale; }); +#endif } CGFloat RCTScreenScale(void) { +#if !TARGET_OS_VISION RCTUnsafeExecuteOnMainQueueOnceSync(&onceTokenScreenScale, ^{ screenScale = [UIScreen mainScreen].scale; }); - return screenScale; +#endif + + return 1; } CGFloat RCTFontSizeMultiplier(void) @@ -347,9 +352,14 @@ CGSize RCTScreenSize(void) static CGSize size; static dispatch_once_t onceToken; + dispatch_once(&onceToken, ^{ RCTUnsafeExecuteOnMainQueueSync(^{ +#if TARGET_OS_VISION + size = RCTKeyWindow().bounds.size; +#else size = [UIScreen mainScreen].bounds.size; +#endif }); }); @@ -557,6 +567,19 @@ BOOL RCTRunningInAppExtension(void) return nil; } +#if TARGET_OS_VISION +UIWindow *__nullable RCTForegroundWindow(void) +{ + for (UIScene *scene in RCTSharedApplication().connectedScenes) { + if (scene.activationState == UISceneActivationStateForegroundActive && + [scene isKindOfClass:[UIWindowScene class]]) { + return [[UIWindow alloc] initWithWindowScene:(UIWindowScene *)scene]; + } + } + return nil; +} +#endif + UIViewController *__nullable RCTPresentedViewController(void) { if ([RCTUtilsUIOverride hasPresentedViewController]) { diff --git a/packages/react-native/React/CoreModules/RCTAlertController.mm b/packages/react-native/React/CoreModules/RCTAlertController.mm index cd01ef56d72684..2d9d3dcef83a34 100644 --- a/packages/react-native/React/CoreModules/RCTAlertController.mm +++ b/packages/react-native/React/CoreModules/RCTAlertController.mm @@ -21,7 +21,8 @@ - (UIWindow *)alertWindow { if (_alertWindow == nil) { _alertWindow = [self getUIWindowFromScene]; - + +#if !TARGET_OS_VISION if (_alertWindow == nil) { UIWindow *keyWindow = RCTSharedApplication().keyWindow; if (keyWindow) { @@ -31,6 +32,7 @@ - (UIWindow *)alertWindow NSLog(@"Unable to create alert window: keyWindow is nil"); } } +#endif if (_alertWindow) { _alertWindow.rootViewController = [UIViewController new]; diff --git a/packages/react-native/React/CoreModules/RCTDevLoadingView.mm b/packages/react-native/React/CoreModules/RCTDevLoadingView.mm index ab9c945790e358..92edb7ed0d5ce9 100644 --- a/packages/react-native/React/CoreModules/RCTDevLoadingView.mm +++ b/packages/react-native/React/CoreModules/RCTDevLoadingView.mm @@ -114,13 +114,30 @@ - (void)showMessage:(NSString *)message color:(UIColor *)color backgroundColor:( dispatch_async(dispatch_get_main_queue(), ^{ self->_showDate = [NSDate date]; if (!self->_window && !RCTRunningInTestEnvironment()) { + +#if TARGET_OS_VISION + UIWindow *window = RCTKeyWindow(); + CGSize screenSize = window.bounds.size; + + self->_window = + [[UIWindow alloc] initWithFrame:CGRectMake(0, 0, screenSize.width, window.safeAreaInsets.top + 30)]; + self->_label = + [[UILabel alloc] initWithFrame:CGRectMake(0, window.safeAreaInsets.top + 5, screenSize.width, 20)]; +#else CGSize screenSize = [UIScreen mainScreen].bounds.size; - UIWindow *window = RCTSharedApplication().keyWindow; + self->_window = [[UIWindow alloc] initWithFrame:CGRectMake(0, 0, screenSize.width, window.safeAreaInsets.top + 10)]; self->_label = [[UILabel alloc] initWithFrame:CGRectMake(0, window.safeAreaInsets.top - 10, screenSize.width, 20)]; +#endif + + + self->_window = + [[UIWindow alloc] initWithFrame:CGRectMake(0, 0, screenSize.width, window.safeAreaInsets.top + 30)]; + self->_label = + [[UILabel alloc] initWithFrame:CGRectMake(0, window.safeAreaInsets.top + 5, screenSize.width, 20)]; [self->_window addSubview:self->_label]; self->_window.windowLevel = UIWindowLevelStatusBar + 1; @@ -142,6 +159,7 @@ - (void)showMessage:(NSString *)message color:(UIColor *)color backgroundColor:( }); [self hideBannerAfter:15.0]; + } RCT_EXPORT_METHOD(showMessage diff --git a/packages/react-native/React/CoreModules/RCTDeviceInfo.mm b/packages/react-native/React/CoreModules/RCTDeviceInfo.mm index f2d55e334a9a1f..65928bf751196f 100644 --- a/packages/react-native/React/CoreModules/RCTDeviceInfo.mm +++ b/packages/react-native/React/CoreModules/RCTDeviceInfo.mm @@ -51,6 +51,8 @@ - (void)initialize selector:@selector(didReceiveNewContentSizeMultiplier) name:RCTAccessibilityManagerDidUpdateMultiplierNotification object:[_moduleRegistry moduleForName:"AccessibilityManager"]]; + +#if !TARGET_OS_VISION _currentInterfaceOrientation = [RCTSharedApplication() statusBarOrientation]; @@ -58,6 +60,7 @@ - (void)initialize selector:@selector(interfaceOrientationDidChange) name:UIApplicationDidChangeStatusBarOrientationNotification object:nil]; +#endif _currentInterfaceDimensions = [self _exportedDimensions]; @@ -85,15 +88,16 @@ - (void)invalidate static BOOL RCTIsIPhoneNotched() { static BOOL isIPhoneNotched = NO; - static dispatch_once_t onceToken; +#if !TARGET_OS_VISION + static dispatch_once_t onceToken; - dispatch_once(&onceToken, ^{ - RCTAssertMainQueue(); - - // 20pt is the top safeArea value in non-notched devices - isIPhoneNotched = RCTSharedApplication().keyWindow.safeAreaInsets.top > 20; - }); + dispatch_once(&onceToken, ^{ + RCTAssertMainQueue(); + // 20pt is the top safeArea value in non-notched devices + isIPhoneNotched = RCTSharedApplication().keyWindow.safeAreaInsets.top > 20; + }); +#endif return isIPhoneNotched; } @@ -176,6 +180,7 @@ - (void)interfaceOrientationDidChange - (void)_interfaceOrientationDidChange { +#if !TARGET_OS_VISION UIApplication *application = RCTSharedApplication(); UIInterfaceOrientation nextOrientation = [application statusBarOrientation]; @@ -205,6 +210,7 @@ - (void)_interfaceOrientationDidChange _isFullscreen = isRunningInFullScreen; #pragma clang diagnostic pop } +#endif } - (void)interfaceFrameDidChange diff --git a/packages/react-native/React/CoreModules/RCTPerfMonitor.mm b/packages/react-native/React/CoreModules/RCTPerfMonitor.mm index a089054feb6fb0..73fae9722620b7 100644 --- a/packages/react-native/React/CoreModules/RCTPerfMonitor.mm +++ b/packages/react-native/React/CoreModules/RCTPerfMonitor.mm @@ -183,7 +183,7 @@ - (UIPanGestureRecognizer *)gestureRecognizer - (UIView *)container { if (!_container) { - CGSize statusBarSize = RCTSharedApplication().statusBarFrame.size; + CGSize statusBarSize = CGSizeMake(1000, 1000); CGFloat statusBarHeight = statusBarSize.height; _container = [[UIView alloc] initWithFrame:CGRectMake(10, statusBarHeight, 180, RCTPerfMonitorBarHeight)]; _container.layer.borderWidth = 2; diff --git a/packages/react-native/React/CoreModules/RCTRedBox.mm b/packages/react-native/React/CoreModules/RCTRedBox.mm index dc58594a80702c..8bd77dfbbacd0a 100644 --- a/packages/react-native/React/CoreModules/RCTRedBox.mm +++ b/packages/react-native/React/CoreModules/RCTRedBox.mm @@ -594,7 +594,12 @@ - (void)showErrorMessage:(NSString *)message #pragma clang diagnostic pop if (!self->_window) { - self->_window = [[RCTRedBoxWindow alloc] initWithFrame:[UIScreen mainScreen].bounds +#if TARGET_OS_VISION + CGRect frame = RCTForegroundWindow().bounds; +#else + CGRect frame = [UIScreen mainScreen].bounds; +#endif + self->_window = [[RCTRedBoxWindow alloc] initWithFrame:frame customButtonTitles:self->_customButtonTitles customButtonHandlers:self->_customButtonHandlers]; self->_window.actionDelegate = self; diff --git a/packages/react-native/React/CoreModules/RCTStatusBarManager.mm b/packages/react-native/React/CoreModules/RCTStatusBarManager.mm index 5d5318fb4148c7..f0c1892c977f2d 100644 --- a/packages/react-native/React/CoreModules/RCTStatusBarManager.mm +++ b/packages/react-native/React/CoreModules/RCTStatusBarManager.mm @@ -76,6 +76,7 @@ + (BOOL)requiresMainQueueSetup - (void)startObserving { +#if !TARGET_OS_VISION NSNotificationCenter *nc = [NSNotificationCenter defaultCenter]; [nc addObserver:self selector:@selector(applicationDidChangeStatusBarFrame:) @@ -85,6 +86,7 @@ - (void)startObserving selector:@selector(applicationWillChangeStatusBarFrame:) name:UIApplicationWillChangeStatusBarFrameNotification object:nil]; +#endif } - (void)stopObserving @@ -99,6 +101,7 @@ - (dispatch_queue_t)methodQueue - (void)emitEvent:(NSString *)eventName forNotification:(NSNotification *)notification { +#if !TARGET_OS_VISION CGRect frame = [notification.userInfo[UIApplicationStatusBarFrameUserInfoKey] CGRectValue]; NSDictionary *event = @{ @"frame" : @{ @@ -109,6 +112,7 @@ - (void)emitEvent:(NSString *)eventName forNotification:(NSNotification *)notifi }, }; [self sendEventWithName:eventName body:event]; +#endif } - (void)applicationDidChangeStatusBarFrame:(NSNotification *)notification @@ -123,9 +127,15 @@ - (void)applicationWillChangeStatusBarFrame:(NSNotification *)notification RCT_EXPORT_METHOD(getHeight : (RCTResponseSenderBlock)callback) { +#if !TARGET_OS_VISION callback(@[ @{ @"height" : @(RCTSharedApplication().statusBarFrame.size.height), } ]); +#else + callback(@[ @{ + @"height" : @(1000), + } ]); +#endif } RCT_EXPORT_METHOD(setStyle : (NSString *)style animated : (BOOL)animated) @@ -137,7 +147,7 @@ - (void)applicationWillChangeStatusBarFrame:(NSNotification *)notification } else { #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wdeprecated-declarations" - [RCTSharedApplication() setStatusBarStyle:statusBarStyle animated:animated]; +// [RCTSharedApplication() setStatusBarStyle:statusBarStyle animated:animated]; } #pragma clang diagnostic pop } @@ -151,14 +161,14 @@ - (void)applicationWillChangeStatusBarFrame:(NSNotification *)notification } else { #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wdeprecated-declarations" - [RCTSharedApplication() setStatusBarHidden:hidden withAnimation:animation]; +// [RCTSharedApplication() setStatusBarHidden:hidden withAnimation:animation]; #pragma clang diagnostic pop } } RCT_EXPORT_METHOD(setNetworkActivityIndicatorVisible : (BOOL)visible) { - RCTSharedApplication().networkActivityIndicatorVisible = visible; +// RCTSharedApplication().networkActivityIndicatorVisible = visible; } - (facebook::react::ModuleConstants)getConstants @@ -166,7 +176,7 @@ - (void)applicationWillChangeStatusBarFrame:(NSNotification *)notification __block facebook::react::ModuleConstants constants; RCTUnsafeExecuteOnMainQueueSync(^{ constants = facebook::react::typedConstants({ - .HEIGHT = RCTSharedApplication().statusBarFrame.size.height, + .HEIGHT = 1000, .DEFAULT_BACKGROUND_COLOR = std::nullopt, }); }); diff --git a/packages/react-native/React/CoreModules/React-CoreModules.podspec b/packages/react-native/React/CoreModules/React-CoreModules.podspec index 57f71717184be1..1abfddeadde18e 100644 --- a/packages/react-native/React/CoreModules/React-CoreModules.podspec +++ b/packages/react-native/React/CoreModules/React-CoreModules.podspec @@ -18,7 +18,7 @@ end folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -DFOLLY_CFG_NO_COROUTINES=1 -Wno-comma -Wno-shorten-64-to-32' folly_version = '2022.05.16.00' -socket_rocket_version = '0.6.0' +socket_rocket_version = '0.6.0.2' header_search_paths = [ "\"$(PODS_TARGET_SRCROOT)/React/CoreModules\"", diff --git a/packages/react-native/React/Fabric/Mounting/ComponentViews/InputAccessory/RCTInputAccessoryComponentView.mm b/packages/react-native/React/Fabric/Mounting/ComponentViews/InputAccessory/RCTInputAccessoryComponentView.mm index 454c3ff1ac279d..957c610b89bbfd 100644 --- a/packages/react-native/React/Fabric/Mounting/ComponentViews/InputAccessory/RCTInputAccessoryComponentView.mm +++ b/packages/react-native/React/Fabric/Mounting/ComponentViews/InputAccessory/RCTInputAccessoryComponentView.mm @@ -67,7 +67,9 @@ - (void)didMoveToWindow if (self.window && !_textInput) { if (self.nativeId) { _textInput = RCTFindTextInputWithNativeId(self.window, self.nativeId); +#if !TARGET_OS_VISION _textInput.inputAccessoryView = _contentView; +#endif } else { _textInput = RCTFindTextInputWithNativeId(_contentView, nil); } @@ -83,10 +85,12 @@ - (BOOL)canBecomeFirstResponder return true; } +#if !TARGET_OS_VISION - (UIView *)inputAccessoryView { return _contentView; } +#endif #pragma mark - RCTComponentViewProtocol diff --git a/packages/react-native/React/Fabric/Mounting/ComponentViews/Modal/RCTFabricModalHostViewController.mm b/packages/react-native/React/Fabric/Mounting/ComponentViews/Modal/RCTFabricModalHostViewController.mm index db5b92fb8f48e4..f0881fd9541628 100644 --- a/packages/react-native/React/Fabric/Mounting/ComponentViews/Modal/RCTFabricModalHostViewController.mm +++ b/packages/react-native/React/Fabric/Mounting/ComponentViews/Modal/RCTFabricModalHostViewController.mm @@ -44,7 +44,11 @@ - (void)loadView - (UIStatusBarStyle)preferredStatusBarStyle { +#if !TARGET_OS_VISION return [RCTSharedApplication() statusBarStyle]; +#else + return UIStatusBarStyleDefault; +#endif } - (void)viewDidDisappear:(BOOL)animated @@ -55,14 +59,23 @@ - (void)viewDidDisappear:(BOOL)animated - (BOOL)prefersStatusBarHidden { +#if !TARGET_OS_VISION return [RCTSharedApplication() isStatusBarHidden]; +#else + return false; +#endif } #if RCT_DEV - (UIInterfaceOrientationMask)supportedInterfaceOrientations { +#if !TARGET_OS_VISION UIInterfaceOrientationMask appSupportedOrientationsMask = [RCTSharedApplication() supportedInterfaceOrientationsForWindow:[RCTSharedApplication() keyWindow]]; +#else + UIInterfaceOrientationMask appSupportedOrientationsMask = UIInterfaceOrientationMaskPortrait; +#endif + if (!(_supportedInterfaceOrientations & appSupportedOrientationsMask)) { RCTLogError( @"Modal was presented with 0x%x orientations mask but the application only supports 0x%x." diff --git a/packages/react-native/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm b/packages/react-native/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm index 504b0ef147ae0b..3a765dd7c7d02c 100644 --- a/packages/react-native/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm +++ b/packages/react-native/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm @@ -28,6 +28,7 @@ static const CGFloat kClippingLeeway = 44.0; +#if !TARGET_OS_VISION static UIScrollViewKeyboardDismissMode RCTUIKeyboardDismissModeFromProps(const ScrollViewProps &props) { switch (props.keyboardDismissMode) { @@ -39,6 +40,7 @@ static UIScrollViewKeyboardDismissMode RCTUIKeyboardDismissModeFromProps(const S return UIScrollViewKeyboardDismissModeInteractive; } } +#endif static UIScrollViewIndicatorStyle RCTUIScrollViewIndicatorStyleFromProps(const ScrollViewProps &props) { @@ -299,9 +301,11 @@ - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared & MAP_SCROLL_VIEW_PROP(disableIntervalMomentum); MAP_SCROLL_VIEW_PROP(snapToInterval); +#if !TARGET_OS_VISION if (oldScrollViewProps.keyboardDismissMode != newScrollViewProps.keyboardDismissMode) { scrollView.keyboardDismissMode = RCTUIKeyboardDismissModeFromProps(newScrollViewProps); } +#endif [super updateProps:props oldProps:oldProps]; } diff --git a/packages/react-native/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentView.mm b/packages/react-native/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentView.mm index 27f52dd15150dc..b2ae6df61a13d6 100644 --- a/packages/react-native/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentView.mm +++ b/packages/react-native/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentView.mm @@ -223,7 +223,7 @@ - (void)disableContextMenu - (void)handleLongPress:(UILongPressGestureRecognizer *)gesture { // TODO: Adopt showMenuFromRect (necessary for UIKitForMac) -#if !TARGET_OS_UIKITFORMAC +#if !TARGET_OS_UIKITFORMAC && !TARGET_OS_VISION UIMenuController *menuController = [UIMenuController sharedMenuController]; if (menuController.isMenuVisible) { diff --git a/packages/react-native/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.mm b/packages/react-native/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.mm index e7b69bff2f9e68..a1ec3dce785e0d 100644 --- a/packages/react-native/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.mm +++ b/packages/react-native/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.mm @@ -475,6 +475,7 @@ - (void)setTextAndSelection:(NSInteger)eventCount - (void)setDefaultInputAccessoryView { +#if !TARGET_OS_VISION // InputAccessoryView component sets the inputAccessoryView when inputAccessoryViewID exists if (_backedTextInputView.inputAccessoryViewID) { if (_backedTextInputView.isFirstResponder) { @@ -514,6 +515,7 @@ - (void)setDefaultInputAccessoryView if (_backedTextInputView.isFirstResponder) { [_backedTextInputView reloadInputViews]; } +#endif } - (void)handleInputAccessoryDoneButton diff --git a/packages/react-native/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputUtils.mm b/packages/react-native/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputUtils.mm index d4b91c921b1114..3bc3f3a298e47f 100644 --- a/packages/react-native/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputUtils.mm +++ b/packages/react-native/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputUtils.mm @@ -26,7 +26,9 @@ void RCTCopyBackedTextInput( toTextInput.placeholder = fromTextInput.placeholder; toTextInput.placeholderColor = fromTextInput.placeholderColor; toTextInput.textContainerInset = fromTextInput.textContainerInset; +#if !TARGET_OS_VISION toTextInput.inputAccessoryView = fromTextInput.inputAccessoryView; +#endif toTextInput.textInputDelegate = fromTextInput.textInputDelegate; toTextInput.placeholderColor = fromTextInput.placeholderColor; toTextInput.defaultTextAttributes = fromTextInput.defaultTextAttributes; diff --git a/packages/react-native/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm b/packages/react-native/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm index d06b0aa8d1c2bf..887fb2819b8e75 100644 --- a/packages/react-native/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm +++ b/packages/react-native/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm @@ -252,7 +252,7 @@ - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared & // `shouldRasterize` if (oldViewProps.shouldRasterize != newViewProps.shouldRasterize) { self.layer.shouldRasterize = newViewProps.shouldRasterize; - self.layer.rasterizationScale = newViewProps.shouldRasterize ? [UIScreen mainScreen].scale : 1.0; + self.layer.rasterizationScale = 1.0; } // `pointerEvents` diff --git a/packages/react-native/React/Fabric/RCTSurfacePointerHandler.mm b/packages/react-native/React/Fabric/RCTSurfacePointerHandler.mm index 67a89beac124b2..7e419a02c95dba 100644 --- a/packages/react-native/React/Fabric/RCTSurfacePointerHandler.mm +++ b/packages/react-native/React/Fabric/RCTSurfacePointerHandler.mm @@ -280,7 +280,8 @@ static PointerEvent CreatePointerEventFromActivePointer( RCTPointerEventType eventType, UIView *rootComponentView) { - PointerEvent event = {}; + PointerEvent event = {}; +#if !TARGET_OS_VISION event.pointerId = activePointer.identifier; event.pointerType = PointerTypeCStringFromUITouchType(activePointer.touchType); @@ -329,7 +330,7 @@ static PointerEvent CreatePointerEventFromActivePointer( event.tangentialPressure = 0.0; event.twist = 0; event.isPrimary = activePointer.isPrimary; - +#endif return event; } @@ -369,6 +370,7 @@ static void UpdateActivePointerWithUITouch( UIEvent *uiEvent, UIView *rootComponentView) { +#if !TARGET_OS_VISION CGPoint location = [uiTouch locationInView:rootComponentView]; UIView *hitTestedView = [rootComponentView hitTest:location withEvent:nil]; activePointer.componentView = FindClosestFabricManagedTouchableView(hitTestedView); @@ -394,6 +396,7 @@ static void UpdateActivePointerWithUITouch( activePointer.button = ButtonMaskDiffToButton(activePointer.buttonMask, nextButtonMask); activePointer.buttonMask = nextButtonMask; activePointer.modifierFlags = uiEvent.modifierFlags; +#endif } /** @@ -747,6 +750,7 @@ - (void)hovering:(UIHoverGestureRecognizer *)recognizer pointerId:(int)pointerId pointerType:(std::string)pointerType API_AVAILABLE(ios(13.0)) { +#if !TARGET_OS_VISION UIView *listenerView = recognizer.view; CGPoint clientLocation = [recognizer locationInView:listenerView]; CGPoint screenLocation = [listenerView convertPoint:clientLocation @@ -769,6 +773,7 @@ - (void)hovering:(UIHoverGestureRecognizer *)recognizer if (eventEmitter != nil) { eventEmitter->onPointerMove(event); } +#endif } #pragma mark - Shared pointer handlers diff --git a/packages/react-native/React/Fabric/RCTSurfaceTouchHandler.mm b/packages/react-native/React/Fabric/RCTSurfaceTouchHandler.mm index a793251fc622c3..51e4a14e026f59 100644 --- a/packages/react-native/React/Fabric/RCTSurfaceTouchHandler.mm +++ b/packages/react-native/React/Fabric/RCTSurfaceTouchHandler.mm @@ -54,6 +54,7 @@ static void UpdateActiveTouchWithUITouch( UIView *rootComponentView, CGPoint rootViewOriginOffset) { +#if !TARGET_OS_VISION CGPoint offsetPoint = [uiTouch locationInView:activeTouch.componentView]; CGPoint pagePoint = [uiTouch locationInView:rootComponentView]; CGPoint screenPoint = [rootComponentView convertPoint:pagePoint @@ -69,6 +70,7 @@ static void UpdateActiveTouchWithUITouch( if (RCTForceTouchAvailable()) { activeTouch.touch.force = RCTZeroIfNaN(uiTouch.force / uiTouch.maximumPossibleForce); } +#endif } static ActiveTouch CreateTouchWithUITouch(UITouch *uiTouch, UIView *rootComponentView, CGPoint rootViewOriginOffset) diff --git a/packages/react-native/React/Modules/RCTUIManager.m b/packages/react-native/React/Modules/RCTUIManager.m index 7027921fda706b..b38aef0b991ed4 100644 --- a/packages/react-native/React/Modules/RCTUIManager.m +++ b/packages/react-native/React/Modules/RCTUIManager.m @@ -185,10 +185,12 @@ - (void)setBridge:(RCTBridge *)bridge object:[self->_bridge moduleForName:@"AccessibilityManager" lazilyLoadIfNecessary:YES]]; }); +#if !TARGET_OS_VISION [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(namedOrientationDidChange) name:UIDeviceOrientationDidChangeNotification object:nil]; +#endif [RCTLayoutAnimation initializeStatics]; } @@ -256,16 +258,19 @@ - (void)didReceiveNewContentSizeMultiplier - (void)namedOrientationDidChange { +#if !TARGET_OS_VISION NSDictionary *orientationEvent = deviceOrientationEventBody([UIDevice currentDevice].orientation); if (!orientationEvent) { return; } - #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wdeprecated-declarations" [[_moduleRegistry moduleForName:"EventDispatcher"] sendDeviceEventWithName:@"namedOrientationDidChange" body:orientationEvent]; #pragma clang diagnostic pop +#endif + return; + } - (dispatch_queue_t)methodQueue diff --git a/packages/react-native/React/UIUtils/RCTUIUtils.m b/packages/react-native/React/UIUtils/RCTUIUtils.m index 9dce915ae94b58..e133a58ee3057d 100644 --- a/packages/react-native/React/UIUtils/RCTUIUtils.m +++ b/packages/react-native/React/UIUtils/RCTUIUtils.m @@ -11,19 +11,28 @@ RCTDimensions RCTGetDimensions(CGFloat fontScale) { +#if TARGET_OS_VISION + CGSize screenSize = RCTForegroundWindow().bounds.size; +#else UIScreen *mainScreen = UIScreen.mainScreen; CGSize screenSize = mainScreen.bounds.size; - +#endif UIView *mainWindow; mainWindow = RCTKeyWindow(); // We fallback to screen size if a key window is not found. CGSize windowSize = mainWindow ? mainWindow.bounds.size : screenSize; + CGFloat scale; +#if TARGET_OS_VISION + scale = 1; +#else + scale = mainScreen.scale; +#endif RCTDimensions result; typeof(result.screen) dimsScreen = { - .width = screenSize.width, .height = screenSize.height, .scale = mainScreen.scale, .fontScale = fontScale}; + .width = screenSize.width, .height = screenSize.height, .scale = scale, .fontScale = fontScale}; typeof(result.window) dimsWindow = { - .width = windowSize.width, .height = windowSize.height, .scale = mainScreen.scale, .fontScale = fontScale}; + .width = windowSize.width, .height = windowSize.height, .scale = scale, .fontScale = fontScale}; result.screen = dimsScreen; result.window = dimsWindow; diff --git a/packages/react-native/React/Views/RCTModalHostView.m b/packages/react-native/React/Views/RCTModalHostView.m index dfde4ae47ab137..9694d67e8e1d0b 100644 --- a/packages/react-native/React/Views/RCTModalHostView.m +++ b/packages/react-native/React/Views/RCTModalHostView.m @@ -75,8 +75,11 @@ - (void)notifyForOrientationChange if (!_onOrientationChange) { return; } - +#if !TARGET_OS_VISION UIInterfaceOrientation currentOrientation = [RCTSharedApplication() statusBarOrientation]; +#else + UIInterfaceOrientation currentOrientation = UIDeviceOrientationUnknown; +#endif if (currentOrientation == _lastKnownOrientation) { return; } diff --git a/packages/react-native/React/Views/RCTModalHostViewController.m b/packages/react-native/React/Views/RCTModalHostViewController.m index 059b64157f9836..973367c567ed0d 100644 --- a/packages/react-native/React/Views/RCTModalHostViewController.m +++ b/packages/react-native/React/Views/RCTModalHostViewController.m @@ -23,10 +23,11 @@ - (instancetype)init } self.modalInPresentation = YES; - +#if !TARGET_OS_VISION _preferredStatusBarStyle = [RCTSharedApplication() statusBarStyle]; _preferredStatusBarHidden = [RCTSharedApplication() isStatusBarHidden]; - +#endif + return self; } @@ -53,8 +54,12 @@ - (BOOL)prefersStatusBarHidden #if RCT_DEV - (UIInterfaceOrientationMask)supportedInterfaceOrientations { +#if !TARGET_OS_VISION UIInterfaceOrientationMask appSupportedOrientationsMask = [RCTSharedApplication() supportedInterfaceOrientationsForWindow:[RCTSharedApplication() keyWindow]]; +#else + UIInterfaceOrientationMask appSupportedOrientationsMask = UIInterfaceOrientationMaskPortrait; +#endif if (!(_supportedInterfaceOrientations & appSupportedOrientationsMask)) { RCTLogError( @"Modal was presented with 0x%x orientations mask but the application only supports 0x%x." diff --git a/packages/react-native/React/Views/RCTViewManager.h b/packages/react-native/React/Views/RCTViewManager.h index 1676e69f2aca86..ca76e780b720c5 100644 --- a/packages/react-native/React/Views/RCTViewManager.h +++ b/packages/react-native/React/Views/RCTViewManager.h @@ -79,6 +79,25 @@ typedef void (^RCTViewManagerUIBlock)(RCTUIManager *uiManager, NSDictionary #import +#if !TARGET_OS_VISION + @interface RCTConvert (UIScrollView) + (UIScrollViewKeyboardDismissMode)UIScrollViewKeyboardDismissMode:(id)json; @end +#endif + @interface RCTScrollViewManager : RCTViewManager @end + + diff --git a/packages/react-native/React/Views/ScrollView/RCTScrollViewManager.m b/packages/react-native/React/Views/ScrollView/RCTScrollViewManager.m index 03355504e0a1dc..8805a8a8cb9001 100644 --- a/packages/react-native/React/Views/ScrollView/RCTScrollViewManager.m +++ b/packages/react-native/React/Views/ScrollView/RCTScrollViewManager.m @@ -12,6 +12,8 @@ #import "RCTShadowView.h" #import "RCTUIManager.h" +#if !TARGET_OS_VISION + @implementation RCTConvert (UIScrollView) RCT_ENUM_CONVERTER( @@ -49,6 +51,8 @@ @implementation RCTConvert (UIScrollView) @end +#endif + @implementation RCTScrollViewManager RCT_EXPORT_MODULE() @@ -70,7 +74,7 @@ - (UIView *)view RCT_EXPORT_VIEW_PROPERTY(decelerationRate, CGFloat) RCT_EXPORT_VIEW_PROPERTY(directionalLockEnabled, BOOL) RCT_EXPORT_VIEW_PROPERTY(indicatorStyle, UIScrollViewIndicatorStyle) -RCT_EXPORT_VIEW_PROPERTY(keyboardDismissMode, UIScrollViewKeyboardDismissMode) +RCT_EXPORT_NOT_VISIONOS_VIEW_PROPERTY(keyboardDismissMode, UIScrollViewKeyboardDismissMode) RCT_EXPORT_VIEW_PROPERTY(maximumZoomScale, CGFloat) RCT_EXPORT_VIEW_PROPERTY(minimumZoomScale, CGFloat) RCT_EXPORT_VIEW_PROPERTY(scrollEnabled, BOOL) diff --git a/packages/react-native/ReactCommon/react/nativemodule/samples/platform/ios/ReactCommon/RCTSampleTurboModule.mm b/packages/react-native/ReactCommon/react/nativemodule/samples/platform/ios/ReactCommon/RCTSampleTurboModule.mm index 8a286dcfd33665..593f677ec2f3f1 100644 --- a/packages/react-native/ReactCommon/react/nativemodule/samples/platform/ios/ReactCommon/RCTSampleTurboModule.mm +++ b/packages/react-native/ReactCommon/react/nativemodule/samples/platform/ios/ReactCommon/RCTSampleTurboModule.mm @@ -46,12 +46,15 @@ - (NSDictionary *)getConstants { __block NSDictionary *constants; RCTUnsafeExecuteOnMainQueueSync(^{ - UIScreen *mainScreen = UIScreen.mainScreen; - CGSize screenSize = mainScreen.bounds.size; - +#if TARGET_OS_VISION + CGSize screenSize = CGSizeMake(100, 100); +#else + UIScreen *mainScreen = UIScreen.mainScreen; + CGSize screenSize = mainScreen.bounds.size; +#endif constants = @{ @"const1" : @YES, - @"const2" : @(screenSize.width), + @"const2" : @(screenSize), @"const3" : @"something", }; }); diff --git a/packages/react-native/scripts/cocoapods/jsengine.rb b/packages/react-native/scripts/cocoapods/jsengine.rb index 12f8cd65674943..14c1ae8806e48a 100644 --- a/packages/react-native/scripts/cocoapods/jsengine.rb +++ b/packages/react-native/scripts/cocoapods/jsengine.rb @@ -30,5 +30,5 @@ def setup_hermes!(react_native_path: "../node_modules/react-native") hermestag = File.exist?(hermestag_file) ? File.read(hermestag_file).strip : '' pod 'hermes-engine', :podspec => "#{react_native_path}/sdks/hermes-engine/hermes-engine.podspec", :tag => hermestag pod 'React-hermes', :path => "#{react_native_path}/ReactCommon/hermes" - pod 'libevent', '~> 2.1.12' + pod 'libevent', :podspec => "#{react_native_path}/third-party-podspecs/libevent.podspec", :modular_headers => true end diff --git a/packages/react-native/scripts/react_native_pods.rb b/packages/react-native/scripts/react_native_pods.rb index 1682b5e95d5c99..67786d02169bb4 100644 --- a/packages/react-native/scripts/react_native_pods.rb +++ b/packages/react-native/scripts/react_native_pods.rb @@ -41,11 +41,15 @@ def min_ios_version_supported return Helpers::Constants.min_ios_version_supported end +def min_visionos_version_supported + return '1.0' +end + # This function returns the min supported OS versions supported by React Native # By using this function, you won't have to manually change your Podfile # when we change the minimum version supported by the framework. def min_supported_versions - return { :ios => min_ios_version_supported } + return { :ios => min_ios_version_supported, :visionos => min_visionos_version_supported } end # This function prepares the project for React Native, before processing @@ -156,6 +160,10 @@ def use_react_native! ( pod 'glog', :podspec => "#{prefix}/third-party-podspecs/glog.podspec" pod 'boost', :podspec => "#{prefix}/third-party-podspecs/boost.podspec" pod 'RCT-Folly', :podspec => "#{prefix}/third-party-podspecs/RCT-Folly.podspec", :modular_headers => true + pod 'fmt', :podspec => "#{prefix}/third-party-podspecs/fmt.podspec", :modular_headers => true + pod 'SocketRocket', :podspec => "#{prefix}/third-party-podspecs/SocketRocket.podspec", :modular_headers => true + pod 'YogaKit', :podspec => "#{prefix}/third-party-podspecs/YogaKit.podspec", :modular_headers => true + run_codegen!( app_path, diff --git a/packages/react-native/sdks/hermes-engine/hermes-engine.podspec b/packages/react-native/sdks/hermes-engine/hermes-engine.podspec index 8fd33af931a9d7..139eeedadaf0c6 100644 --- a/packages/react-native/sdks/hermes-engine/hermes-engine.podspec +++ b/packages/react-native/sdks/hermes-engine/hermes-engine.podspec @@ -24,7 +24,7 @@ Pod::Spec.new do |spec| spec.license = package['license'] spec.author = "Facebook" spec.source = source - spec.platforms = { :osx => "10.13", :ios => "13.4" } + spec.platforms = { :osx => "10.13", :ios => "13.4", :visionos => "1.0" } spec.preserve_paths = '**/*.*' spec.source_files = '' @@ -35,6 +35,7 @@ Pod::Spec.new do |spec| } spec.ios.vendored_frameworks = "destroot/Library/Frameworks/ios/hermes.framework" + spec.visionos.vendored_frameworks = "destroot/Library/Frameworks/visionos/hermes.framework" spec.osx.vendored_frameworks = "destroot/Library/Frameworks/macosx/hermes.framework" if HermesEngineSourceType::isPrebuilt(source_type) then diff --git a/packages/react-native/third-party-podspecs/SocketRocket.podspec b/packages/react-native/third-party-podspecs/SocketRocket.podspec new file mode 100644 index 00000000000000..2fc7aee3da377c --- /dev/null +++ b/packages/react-native/third-party-podspecs/SocketRocket.podspec @@ -0,0 +1,24 @@ +Pod::Spec.new do |s| + s.name = 'SocketRocket' + s.version = '0.6.0.2' + s.summary = 'A conforming WebSocket (RFC 6455) client library for iOS, macOS and tvOS.' + s.homepage = 'https://github.com/facebook/SocketRocket' + s.authors = { 'Nikita Lutsenko' => 'nlutsenko@me.com', 'Dan Federman' => 'federman@squareup.com', 'Mike Lewis' => 'mikelikespie@gmail.com' } + s.license = 'BSD' + s.source = { :git => 'https://github.com/facebook/SocketRocket.git', :tag => '0.6.0' } + s.requires_arc = true + + s.source_files = 'SocketRocket/**/*.{h,m}' + s.public_header_files = 'SocketRocket/*.h' + + s.ios.deployment_target = '9.0' + s.osx.deployment_target = '10.9' + s.tvos.deployment_target = '9.0' + s.visionos.deployment_target = '1.0' + + s.ios.frameworks = 'CFNetwork', 'Security' + s.osx.frameworks = 'CoreServices', 'Security' + s.tvos.frameworks = 'CFNetwork', 'Security' + s.visionos.frameworks = 'CFNetwork', 'Security' + s.libraries = 'icucore' + end \ No newline at end of file diff --git a/packages/react-native/third-party-podspecs/YogaKit.podspec b/packages/react-native/third-party-podspecs/YogaKit.podspec new file mode 100644 index 00000000000000..ec2c5654a351b4 --- /dev/null +++ b/packages/react-native/third-party-podspecs/YogaKit.podspec @@ -0,0 +1,39 @@ +# Copyright (c) Facebook, Inc. and its affiliates. +# +# This source code is licensed under the MIT license found in the +# LICENSE file in the root directory of this source tree. + +podspec = Pod::Spec.new do |spec| + spec.name = 'YogaKit' + spec.version = '1.18.1' + spec.license = { :type => 'MIT', :file => "LICENSE" } + spec.homepage = 'https://facebook.github.io/yoga/' + spec.documentation_url = 'https://facebook.github.io/yoga/docs/' + + spec.summary = 'Yoga is a cross-platform layout engine which implements Flexbox.' + spec.description = 'Yoga is a cross-platform layout engine enabling maximum collaboration within your team by implementing an API many designers are familiar with, and opening it up to developers across different platforms.' + + spec.authors = 'Facebook' + spec.source = { + :git => 'https://github.com/facebook/yoga.git', + :tag => "1.18.0", + } + + spec.platforms = { :ios => "9.0", :visionos => "1.0" } + spec.ios.deployment_target = '8.0' + spec.ios.frameworks = 'UIKit' + spec.module_name = 'YogaKit' + spec.dependency 'Yoga' + # Fixes the bug related the xcode 11 not able to find swift related frameworks. + # https://github.com/Carthage/Carthage/issues/2825 + # https://twitter.com/krzyzanowskim/status/1151549874653081601?s=21 + spec.pod_target_xcconfig = {"LD_VERIFY_BITCODE": "NO"} + spec.source_files = 'YogaKit/Source/*.{h,m,swift}' + spec.public_header_files = 'YogaKit/Source/{YGLayout,UIView+Yoga}.h' + spec.private_header_files = 'YogaKit/Source/YGLayout+Private.h' + spec.swift_version = '5.1' + end + + # See https://github.com/facebook/yoga/pull/366 + podspec.attributes_hash["readme"] = "YogaKit/README.md" + podspec \ No newline at end of file diff --git a/packages/react-native/third-party-podspecs/fmt.podspec b/packages/react-native/third-party-podspecs/fmt.podspec new file mode 100644 index 00000000000000..2288fba0f7c95d --- /dev/null +++ b/packages/react-native/third-party-podspecs/fmt.podspec @@ -0,0 +1,24 @@ +Pod::Spec.new do |spec| + spec.name = 'fmt' + spec.version = '6.2.1' + spec.license = { :type => 'MIT' } + spec.homepage = 'http://github.com/fmtlib/fmt' + spec.summary = '{fmt} is an open-source formatting library for C++. It can be used as a safe and fast alternative to (s)printf and iostreams.' + spec.authors = { "The fmt contributors": "https://github.com/fmtlib/fmt/issues" } + spec.source = { :git => 'https://github.com/fmtlib/fmt.git', :tag => '7.1.3' } + + # Pinning to the same version as React.podspec. + spec.platforms = { :ios => '11.0', :osx => '10.14', :visionos => '1.0' } + spec.libraries = 'c++' + spec.public_header_files = 'include/fmt/*.{hpp,h}' + spec.header_mappings_dir = 'include' + spec.source_files = 'src/*.cc', + 'include/fmt/*.{hpp,h}' + spec.exclude_files = 'src/os.cc' + spec.pod_target_xcconfig = { + "HEADER_SEARCH_PATHS" => "${PODS_TARGET_SRCROOT}/include", + "CLANG_CXX_LANGUAGE_STANDARD" => "c++14", + "USE_HEADERMAP" => "NO", + "ALWAYS_SEARCH_USER_PATHS" => "NO" + } +end \ No newline at end of file diff --git a/packages/react-native/third-party-podspecs/libevent.podspec b/packages/react-native/third-party-podspecs/libevent.podspec new file mode 100644 index 00000000000000..7051785f86552a --- /dev/null +++ b/packages/react-native/third-party-podspecs/libevent.podspec @@ -0,0 +1,560 @@ +# 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. + +# Generated with: +# +# $ mkdir build && cd build +# $ cmake -G Ninja .. \ +# -DEVENT__DISABLE_OPENSSL:BOOL=ON \ +# -DEVENT__DISABLE_BENCHMARK:BOOL=ON \ +# -DEVENT__DISABLE_TESTS:BOOL=ON \ +# -DEVENT__DISABLE_REGRESS:BOOL=ON \ +# -DEVENT__DISABLE_SAMPLES:BOOL=ON +# $ cat include/event2/event-config.h +# +CONFIG_WITHOUT_OPENSSL = <<-END_OF_CONFIG +/* event-config.h + * + * This file was generated by cmake when the makefiles were generated. + * + * DO NOT EDIT THIS FILE. + * + * Do not rely on macros in this file existing in later versions. + */ +#ifndef EVENT2_EVENT_CONFIG_H_INCLUDED_ +#define EVENT2_EVENT_CONFIG_H_INCLUDED_ + +/* Numeric representation of the version */ +#define EVENT__NUMERIC_VERSION 0x02020001 +#define EVENT__PACKAGE_VERSION "2.2.0" + +#define EVENT__VERSION_MAJOR 2 +#define EVENT__VERSION_MINOR 2 +#define EVENT__VERSION_PATCH 0 + +/* Version number of package */ +#define EVENT__VERSION "2.2.0-alpha-dev" + +/* Name of package */ +#define EVENT__PACKAGE "libevent" + +/* Define to the address where bug reports for this package should be sent. */ +#define EVENT__PACKAGE_BUGREPORT "" + +/* Define to the full name of this package. */ +#define EVENT__PACKAGE_NAME "" + +/* Define to the full name and version of this package. */ +#define EVENT__PACKAGE_STRING "" + +/* Define to the one symbol short name of this package. */ +#define EVENT__PACKAGE_TARNAME "" + +/* Define if libevent should build without support for a debug mode */ +/* #undef EVENT__DISABLE_DEBUG_MODE */ + +/* Define if libevent should not allow replacing the mm functions */ +/* #undef EVENT__DISABLE_MM_REPLACEMENT */ + +/* Define if libevent should not be compiled with thread support */ +/* #undef EVENT__DISABLE_THREAD_SUPPORT */ + +/* Define to 1 if you have the `accept4' function. */ +/* #undef EVENT__HAVE_ACCEPT4 */ + +/* Define to 1 if you have the `arc4random' function. */ +#define EVENT__HAVE_ARC4RANDOM 1 + +/* Define to 1 if you have the `arc4random_buf' function. */ +#define EVENT__HAVE_ARC4RANDOM_BUF 1 + +/* Define to 1 if you have the `arc4random_addrandom' function. */ +#define EVENT__HAVE_ARC4RANDOM_ADDRANDOM 1 + +/* Define if clock_gettime is available in libc */ +#define EVENT__DNS_USE_CPU_CLOCK_FOR_ID 1 + +/* Define is no secure id variant is available */ +/* #undef EVENT__DNS_USE_GETTIMEOFDAY_FOR_ID */ +/* #undef EVENT__DNS_USE_FTIME_FOR_ID */ + +/* Define to 1 if you have the header file. */ +#define EVENT__HAVE_ARPA_INET_H 1 + +/* Define to 1 if you have the `clock_gettime' function. */ +#define EVENT__HAVE_CLOCK_GETTIME 1 + +/* Define to 1 if you have the declaration of `CTL_KERN'. */ +#define EVENT__HAVE_DECL_CTL_KERN 1 + +/* Define to 1 if you have the declaration of `KERN_ARND'. */ +#define EVENT__HAVE_DECL_KERN_ARND 0 + +/* Define to 1 if you have `getrandom' function. */ +/* #undef EVENT__HAVE_GETRANDOM */ + +/* Define if /dev/poll is available */ +/* #undef EVENT__HAVE_DEVPOLL */ + +/* Define to 1 if you have the header file. */ +#define EVENT__HAVE_NETDB_H 1 + +/* Define to 1 if fd_mask type is defined */ +#define EVENT__HAVE_FD_MASK 1 + +/* Define to 1 if the header file defines TAILQ_FOREACH. */ +#define EVENT__HAVE_TAILQFOREACH 1 + +/* Define to 1 if you have the header file. */ +#define EVENT__HAVE_DLFCN_H 1 + +/* Define if your system supports the epoll system calls */ +/* #undef EVENT__HAVE_EPOLL */ + +/* Define to 1 if you have the `epoll_create1' function. */ +/* #undef EVENT__HAVE_EPOLL_CREATE1 */ + +/* Define to 1 if you have the `epoll_ctl' function. */ +/* #undef EVENT__HAVE_EPOLL_CTL */ + +/* Define if your system supports the wepoll module */ +/* #undef EVENT__HAVE_WEPOLL */ + +/* Define to 1 if you have the `eventfd' function. */ +/* #undef EVENT__HAVE_EVENTFD */ + +/* Define if your system supports event ports */ +/* #undef EVENT__HAVE_EVENT_PORTS */ + +/* Define to 1 if you have the `fcntl' function. */ +#define EVENT__HAVE_FCNTL 1 + +/* Define to 1 if you have the header file. */ +#define EVENT__HAVE_FCNTL_H 1 + +/* Define to 1 if you have the `getaddrinfo' function. */ +#define EVENT__HAVE_GETADDRINFO 1 + +/* Define to 1 if you have the `getegid' function. */ +#define EVENT__HAVE_GETEGID 1 + +/* Define to 1 if you have the `geteuid' function. */ +#define EVENT__HAVE_GETEUID 1 + +/* TODO: Check for different gethostname argument counts. CheckPrototypeDefinition.cmake can be used. */ +/* Define this if you have any gethostbyname_r() */ +/* #undef EVENT__HAVE_GETHOSTBYNAME_R */ + +/* Define this if gethostbyname_r takes 3 arguments */ +/* #undef EVENT__HAVE_GETHOSTBYNAME_R_3_ARG */ + +/* Define this if gethostbyname_r takes 5 arguments */ +/* #undef EVENT__HAVE_GETHOSTBYNAME_R_5_ARG */ + +/* Define this if gethostbyname_r takes 6 arguments */ +/* #undef EVENT__HAVE_GETHOSTBYNAME_R_6_ARG */ + +/* Define to 1 if you have the `getifaddrs' function. */ +#define EVENT__HAVE_GETIFADDRS 1 + +/* Define to 1 if you have the `getnameinfo' function. */ +#define EVENT__HAVE_GETNAMEINFO 1 + +/* Define to 1 if you have the `getprotobynumber' function. */ +#define EVENT__HAVE_GETPROTOBYNUMBER 1 + +/* Define to 1 if you have the `getservbyname' function. */ +#define EVENT__HAVE_GETSERVBYNAME 1 + +/* Define to 1 if you have the `gettimeofday' function. */ +#define EVENT__HAVE_GETTIMEOFDAY 1 + +/* Define to 1 if you have the header file. */ +#define EVENT__HAVE_IFADDRS_H 1 + +/* Define to 1 if you have the `inet_ntop' function. */ +#define EVENT__HAVE_INET_NTOP 1 + +/* Define to 1 if you have the `inet_pton' function. */ +#define EVENT__HAVE_INET_PTON 1 + +/* Define to 1 if you have the header file. */ +#define EVENT__HAVE_INTTYPES_H 1 + +/* Define to 1 if you have the `issetugid' function. */ +#define EVENT__HAVE_ISSETUGID 1 + +/* Define to 1 if you have the `kqueue' function. */ +#define EVENT__HAVE_KQUEUE 1 + +/* Define if the system has zlib */ +/* #undef EVENT__HAVE_LIBZ */ + +/* Define to 1 if you have the `mach_absolute_time' function. */ +#define EVENT__HAVE_MACH_ABSOLUTE_TIME 1 + +/* Define to 1 if you have the header file. */ +#define EVENT__HAVE_MACH_MACH_TIME_H 1 + +/* Define to 1 if you have the header file. */ +#define EVENT__HAVE_MACH_MACH_H 1 + +/* Define to 1 if you have the header file. */ +#define EVENT__HAVE_MEMORY_H 1 + +/* Define to 1 if you have the `mmap' function. */ +#define EVENT__HAVE_MMAP 1 + +/* Define to 1 if you have the `nanosleep' function. */ +#define EVENT__HAVE_NANOSLEEP 1 + +/* Define to 1 if you have the `usleep' function. */ +#define EVENT__HAVE_USLEEP 1 + +/* Define to 1 if you have the header file. */ +/* #undef EVENT__HAVE_NETINET_IN6_H */ + +/* Define to 1 if you have the header file. */ +#define EVENT__HAVE_NETINET_IN_H 1 + +/* Define to 1 if you have the header file. */ +#define EVENT__HAVE_NETINET_TCP_H 1 + +/* Define to 1 if you have the header file. */ +#define EVENT__HAVE_SYS_UN_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef EVENT__HAVE_AFUNIX_H */ + +/* Define if the system has openssl */ +/* #undef EVENT__HAVE_OPENSSL */ + +/* Define to 1 if you have the `pipe' function. */ +#define EVENT__HAVE_PIPE 1 + +/* Define to 1 if you have the `pipe2' function. */ +/* #undef EVENT__HAVE_PIPE2 */ + +/* Define to 1 if you have the `poll' function. */ +#define EVENT__HAVE_POLL 1 + +/* Define to 1 if you have the header file. */ +#define EVENT__HAVE_POLL_H 1 + +/* Define to 1 if you have the `port_create' function. */ +/* #undef EVENT__HAVE_PORT_CREATE */ + +/* Define to 1 if you have the header file. */ +/* #undef EVENT__HAVE_PORT_H */ + +/* Define if we have pthreads on this system */ +#define EVENT__HAVE_PTHREADS 1 + +/* Define to 1 if you have the `putenv' function. */ +#define EVENT__HAVE_PUTENV 1 + +/* Define to 1 if the system has the type `sa_family_t'. */ +#define EVENT__HAVE_SA_FAMILY_T 1 + +/* Define to 1 if you have the `select' function. */ +#define EVENT__HAVE_SELECT 1 + +/* Define to 1 if you have the `setenv' function. */ +#define EVENT__HAVE_SETENV 1 + +/* Define if F_SETFD is defined in */ +#define EVENT__HAVE_SETFD 1 + +/* Define to 1 if you have the `setrlimit' function. */ +#define EVENT__HAVE_SETRLIMIT 1 + +/* Define to 1 if you have the `sendfile' function. */ +#define EVENT__HAVE_SENDFILE 1 + +/* Define to 1 if you have the `sigaction' function. */ +#define EVENT__HAVE_SIGACTION 1 + +/* Define to 1 if you have the `signal' function. */ +#define EVENT__HAVE_SIGNAL 1 + +/* Define to 1 if you have the `strsignal' function. */ +#define EVENT__HAVE_STRSIGNAL 1 + +/* Define to 1 if you have the `splice' function. */ +/* #undef EVENT__HAVE_SPLICE */ + +/* Define to 1 if you have the header file. */ +#define EVENT__HAVE_STDARG_H 1 + +/* Define to 1 if you have the header file. */ +#define EVENT__HAVE_STDDEF_H 1 + +/* Define to 1 if you have the header file. */ +#define EVENT__HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +#define EVENT__HAVE_STDLIB_H 1 + +/* Define to 1 if you have the header file. */ +#define EVENT__HAVE_STRING_H 1 + +/* Define to 1 if you have the `strlcpy' function. */ +#define EVENT__HAVE_STRLCPY 1 + +/* Define to 1 if you have the `strsep' function. */ +#define EVENT__HAVE_STRSEP 1 + +/* Define to 1 if you have the `strtok_r' function. */ +#define EVENT__HAVE_STRTOK_R 1 + +/* Define to 1 if you have the `strtoll' function. */ +#define EVENT__HAVE_STRTOLL 1 + +/* Define to 1 if you have the `_gmtime64_s' function. */ +/* #undef EVENT__HAVE__GMTIME64_S */ + +/* Define to 1 if you have the `_gmtime64' function. */ +/* #undef EVENT__HAVE__GMTIME64 */ + +/* Define to 1 if the system has the type `struct addrinfo'. */ +#define EVENT__HAVE_STRUCT_ADDRINFO 1 + +/* Define to 1 if the system has the type `struct in6_addr'. */ +#define EVENT__HAVE_STRUCT_IN6_ADDR 1 + +/* Define to 1 if `s6_addr16' is member of `struct in6_addr'. */ +/* #undef EVENT__HAVE_STRUCT_IN6_ADDR_S6_ADDR16 */ + +/* Define to 1 if `s6_addr32' is member of `struct in6_addr'. */ +/* #undef EVENT__HAVE_STRUCT_IN6_ADDR_S6_ADDR32 */ + +/* Define to 1 if the system has the type `struct sockaddr_in6'. */ +#define EVENT__HAVE_STRUCT_SOCKADDR_IN6 1 + +/* Define to 1 if `sin6_len' is member of `struct sockaddr_in6'. */ +#define EVENT__HAVE_STRUCT_SOCKADDR_IN6_SIN6_LEN 1 + +/* Define to 1 if `sin_len' is member of `struct sockaddr_in'. */ +/* #undef EVENT__HAVE_STRUCT_SOCKADDR_IN_SIN_LEN */ + +/* Define to 1 if the system has the type `struct sockaddr_un'. */ +#define EVENT__HAVE_STRUCT_SOCKADDR_UN 1 + +/* Define to 1 if the system has the type `struct sockaddr_storage'. */ +#define EVENT__HAVE_STRUCT_SOCKADDR_STORAGE 1 + +/* Define to 1 if `ss_family' is a member of `struct sockaddr_storage'. */ +#define EVENT__HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY 1 + +/* Define to 1 if `__ss_family' is a member of `struct sockaddr_storage'. */ +/* #undef EVENT__HAVE_STRUCT_SOCKADDR_STORAGE___SS_FAMILY */ + +/* Define to 1 if the system has the type `struct linger'. */ +#define EVENT__HAVE_STRUCT_LINGER 1 + +/* Define to 1 if you have the `sysctl' function. */ +#define EVENT__HAVE_SYSCTL 1 + +/* Define to 1 if you have the header file. */ +/* #undef EVENT__HAVE_SYS_EPOLL_H */ + +/* Define to 1 if you have the header file. */ +/* #undef EVENT__HAVE_SYS_EVENTFD_H */ + +/* Define to 1 if you have the header file. */ +#define EVENT__HAVE_SYS_EVENT_H 1 + +/* Define to 1 if you have the header file. */ +#define EVENT__HAVE_SYS_IOCTL_H 1 + +/* Define to 1 if you have the header file. */ +#define EVENT__HAVE_SYS_MMAN_H 1 + +/* Define to 1 if you have the header file. */ +#define EVENT__HAVE_SYS_PARAM_H 1 + +/* Define to 1 if you have the header file. */ +#define EVENT__HAVE_SYS_QUEUE_H 1 + +/* Define to 1 if you have the header file. */ +#define EVENT__HAVE_SYS_RESOURCE_H 1 + +/* Define to 1 if you have the header file. */ +#define EVENT__HAVE_SYS_SELECT_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef EVENT__HAVE_SYS_SENDFILE_H */ + +/* Define to 1 if you have the header file. */ +#define EVENT__HAVE_SYS_SOCKET_H 1 + +/* Define to 1 if you have the header file. */ +#define EVENT__HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define EVENT__HAVE_SYS_RANDOM_H 1 + +/* Define to 1 if you have the header file. */ +#define EVENT__HAVE_SYS_SYSCTL_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef EVENT__HAVE_SYS_TIMERFD_H */ + +/* Define to 1 if you have the header file. */ +#define EVENT__HAVE_SYS_TIME_H 1 + +/* Define to 1 if you have the header file. */ +#define EVENT__HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have the header file. */ +#define EVENT__HAVE_SYS_UIO_H 1 + +/* Define to 1 if you have the header file. */ +#define EVENT__HAVE_SYS_WAIT_H 1 + +/* Define to 1 if you have the header file. */ +#define EVENT__HAVE_ERRNO_H 1 + +/* Define if TAILQ_FOREACH is defined in */ +#define EVENT__HAVE_TAILQFOREACH 1 + +/* Define if timeradd is defined in */ +#define EVENT__HAVE_TIMERADD 1 + +/* Define if timerclear is defined in */ +#define EVENT__HAVE_TIMERCLEAR 1 + +/* Define if timercmp is defined in */ +#define EVENT__HAVE_TIMERCMP 1 + + +/* Define to 1 if you have the `timerfd_create' function. */ +/* #undef EVENT__HAVE_TIMERFD_CREATE */ + +/* Define if timerisset is defined in */ +#define EVENT__HAVE_TIMERISSET 1 + +/* Define to 1 if the system has the type `uint8_t'. */ +#define EVENT__HAVE_UINT8_T 1 + +/* Define to 1 if the system has the type `uint16_t'. */ +#define EVENT__HAVE_UINT16_T 1 + +/* Define to 1 if the system has the type `uint32_t'. */ +#define EVENT__HAVE_UINT32_T 1 + +/* Define to 1 if the system has the type `uint64_t'. */ +#define EVENT__HAVE_UINT64_T 1 + +/* Define to 1 if the system has the type `uintptr_t'. */ +#define EVENT__HAVE_UINTPTR_T 1 + +/* Define to 1 if you have the `umask' function. */ +#define EVENT__HAVE_UMASK 1 + +/* Define to 1 if you have the header file. */ +#define EVENT__HAVE_UNISTD_H 1 + +/* Define to 1 if you have the `unsetenv' function. */ +#define EVENT__HAVE_UNSETENV 1 + +/* Define to 1 if you have the `vasprintf' function. */ +#define EVENT__HAVE_VASPRINTF 1 + +/* Define if kqueue works correctly with pipes */ +#define EVENT__HAVE_WORKING_KQUEUE 1 + +#ifdef __USE_UNUSED_DEFINITIONS__ +/* Define to necessary symbol if this constant uses a non-standard name on your system. */ +/* XXX: Hello, this isn't even used, nor is it defined anywhere... - Ellzey */ +#define EVENT__PTHREAD_CREATE_JOINABLE +#endif + +/* The size of `pthread_t', as computed by sizeof. */ +#define EVENT__SIZEOF_PTHREAD_T 8 + +/* The size of a `int', as computed by sizeof. */ +#define EVENT__SIZEOF_INT 4 + +/* The size of a `long', as computed by sizeof. */ +#define EVENT__SIZEOF_LONG 8 + +/* The size of a `long long', as computed by sizeof. */ +#define EVENT__SIZEOF_LONG_LONG 8 + +/* The size of `off_t', as computed by sizeof. */ +#define EVENT__SIZEOF_OFF_T 8 + +#define EVENT__SIZEOF_SSIZE_T 8 + + +/* The size of a `short', as computed by sizeof. */ +#define EVENT__SIZEOF_SHORT 2 + +/* The size of `size_t', as computed by sizeof. */ +#define EVENT__SIZEOF_SIZE_T 8 + +/* Define to 1 if you can safely include both and . */ +/* #undef EVENT__TIME_WITH_SYS_TIME */ + +/* The size of `socklen_t', as computed by sizeof. */ +#define EVENT__SIZEOF_SOCKLEN_T 4 + +/* The size of 'void *', as computer by sizeof */ +#define EVENT__SIZEOF_VOID_P 8 + +/* Define to `__inline__' or `__inline' if that's what the C compiler + calls it, or to nothing if 'inline' is not supported under any name. */ +#ifndef __cplusplus +/* why not c++? + * + * and are we really expected to use EVENT__inline everywhere, + * shouldn't we just do: + * ifdef EVENT__inline + * define inline EVENT__inline + * + * - Ellzey + */ + +#define EVENT__inline inline +#endif + +#define EVENT__HAVE___func__ 1 +#define EVENT__HAVE___FUNCTION__ 1 + +/* Define to `unsigned' if does not define. */ +#define EVENT__size_t size_t + +/* Define to unsigned int if you dont have it */ +#define EVENT__socklen_t socklen_t + +/* Define to `int' if does not define. */ +#define EVENT__ssize_t ssize_t + +#endif /* \EVENT2_EVENT_CONFIG_H_INCLUDED_ */ +END_OF_CONFIG + +Pod::Spec.new do |spec| + spec.name = "libevent" + spec.version = "2.1.12.1" + spec.summary = "Event notification library" + spec.description = "The libevent API provides a mechanism to execute a callback function when a specific event occurs on a file descriptor or after a timeout has been reached. Furthermore, libevent also support callbacks due to signals or regular timeouts." + spec.homepage = "https://libevent.org" + spec.license = { :type => "BSD 3-Clause", :file => "LICENSE" } + spec.author = "Niels Provos and Nick Mathewson" + spec.platforms = { :osx => "10.13", :ios => "10.0", :tvos => "10.0", :visionos => "1.0" } + spec.source = { :git => "https://github.com/libevent/libevent.git", :tag => "release-2.1.12-stable" } + spec.prepare_command = "echo 'executing libevent prepare command'; touch evconfig-private.h; echo -e #{Shellwords.escape(CONFIG_WITHOUT_OPENSSL)} > include/event2/event-config.h; ls include/event2/" + spec.source_files = + "include/*.h", "*-{internal,private}.h", + "buffer.c", "bufferevent.c", "bufferevent_filter.c", "bufferevent_pair.c", "bufferevent_ratelim.c", "bufferevent_sock.c", + "event.c", "evmap.c", "evthread.c", "evutil.c", "evutil_rand.c", "evutil_time.c", + "kqueue.c", "listener.c", "log.c", "poll.c", "select.c", "signal.c", "strlcpy.c", "watch.c", + "evdns.c", "event_tagging.c", "evrpc.c", "http.c" + spec.private_header_files = "*-{internal,private}.h" + spec.public_header_files = "include/*.h" + spec.preserve_paths = "include/event2/*.h" + spec.xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/include/\"" } +end \ No newline at end of file diff --git a/packages/rn-tester/Gemfile b/packages/rn-tester/Gemfile index a66fd6c04cbc12..5ee3d64e7ef17e 100644 --- a/packages/rn-tester/Gemfile +++ b/packages/rn-tester/Gemfile @@ -1,5 +1,6 @@ # Gemfile source 'https://rubygems.org' -gem 'cocoapods', '~> 1.12' +gem 'cocoapods', '~> 1.13' + gem 'rexml' diff --git a/packages/rn-tester/Podfile b/packages/rn-tester/Podfile index 36f670df0d5e8d..fbca071fbd2e4e 100644 --- a/packages/rn-tester/Podfile +++ b/packages/rn-tester/Podfile @@ -1,7 +1,7 @@ require_relative '../react-native/scripts/react_native_pods' source 'https://cdn.cocoapods.org/' -platform :ios, min_ios_version_supported +platform :visionos, '1.0' cmake_path = `command -v cmake` @@ -32,7 +32,7 @@ if USE_FRAMEWORKS use_frameworks! :linkage => linkage.to_sym end -$shouldUseFlipper = ENV['USE_FLIPPER'] ? ENV['USE_FLIPPER'] == '1' : !IN_CI && !USE_FRAMEWORKS +$shouldUseFlipper = false def pods(target_name, options = {}, use_flipper: $shouldUseFlipper) project 'RNTesterPods.xcodeproj' @@ -41,7 +41,8 @@ def pods(target_name, options = {}, use_flipper: $shouldUseFlipper) # Hermes is now enabled by default. # The following line will only disable Hermes if the USE_HERMES envvar is SET to a value other than 1 (e.g. USE_HERMES=0). - hermes_enabled = !ENV.has_key?('USE_HERMES') || ENV['USE_HERMES'] == '1' + # TODO: Make hermes work + hermes_enabled = false puts "Configuring #{target_name} with Fabric #{fabric_enabled ? "enabled" : "disabled"}.#{hermes_enabled ? " Using Hermes engine." : ""}" use_react_native!( @@ -57,7 +58,7 @@ def pods(target_name, options = {}, use_flipper: $shouldUseFlipper) pod 'ReactCommon-Samples', :path => "#{@prefix_path}/ReactCommon/react/nativemodule/samples" # Additional Pods which aren't included in the default Podfile - pod 'React-RCTPushNotification', :path => "#{@prefix_path}/Libraries/PushNotificationIOS" + # pod 'React-RCTPushNotification', :path => "#{@prefix_path}/Libraries/PushNotificationIOS" pod 'Yoga', :path => "#{@prefix_path}/ReactCommon/yoga", :modular_headers => true # Additional Pods which are classed as unstable @@ -77,7 +78,8 @@ end target 'RNTesterUnitTests' do pods('RNTesterUnitTests') pod 'React-RCTTest', :path => "./RCTTest" - pod 'OCMock', '~> 3.9.1' + # TODO: Uncomment this once OCMock is released https://cocoapods.org/pods/OCMock + # pod 'OCMock', '~> 3.9.2' end target 'RNTesterIntegrationTests' do diff --git a/packages/rn-tester/Podfile.lock b/packages/rn-tester/Podfile.lock index 5a18cf126afcc3..7eeea5c4bad817 100644 --- a/packages/rn-tester/Podfile.lock +++ b/packages/rn-tester/Podfile.lock @@ -1,6 +1,5 @@ PODS: - boost (1.83.0) - - CocoaAsyncSocket (7.6.5) - DoubleConversion (1.1.6) - FBLazyVector (1000.0.0) - FBReactNativeSpec (1000.0.0): @@ -10,76 +9,8 @@ PODS: - React-Core (= 1000.0.0) - React-jsi (= 1000.0.0) - ReactCommon/turbomodule/core (= 1000.0.0) - - Flipper (0.201.0): - - Flipper-Folly (~> 2.6) - - Flipper-Boost-iOSX (1.76.0.1.11) - - Flipper-DoubleConversion (3.2.0.1) - - Flipper-Fmt (7.1.7) - - Flipper-Folly (2.6.10): - - Flipper-Boost-iOSX - - Flipper-DoubleConversion - - Flipper-Fmt (= 7.1.7) - - Flipper-Glog - - libevent (~> 2.1.12) - - OpenSSL-Universal (= 1.1.1100) - - Flipper-Glog (0.5.0.5) - - Flipper-PeerTalk (0.0.4) - - FlipperKit (0.201.0): - - FlipperKit/Core (= 0.201.0) - - FlipperKit/Core (0.201.0): - - Flipper (~> 0.201.0) - - FlipperKit/CppBridge - - FlipperKit/FBCxxFollyDynamicConvert - - FlipperKit/FBDefines - - FlipperKit/FKPortForwarding - - SocketRocket (~> 0.6.0) - - FlipperKit/CppBridge (0.201.0): - - Flipper (~> 0.201.0) - - FlipperKit/FBCxxFollyDynamicConvert (0.201.0): - - Flipper-Folly (~> 2.6) - - FlipperKit/FBDefines (0.201.0) - - FlipperKit/FKPortForwarding (0.201.0): - - CocoaAsyncSocket (~> 7.6) - - Flipper-PeerTalk (~> 0.0.4) - - FlipperKit/FlipperKitHighlightOverlay (0.201.0) - - FlipperKit/FlipperKitLayoutHelpers (0.201.0): - - FlipperKit/Core - - FlipperKit/FlipperKitHighlightOverlay - - FlipperKit/FlipperKitLayoutTextSearchable - - FlipperKit/FlipperKitLayoutIOSDescriptors (0.201.0): - - FlipperKit/Core - - FlipperKit/FlipperKitHighlightOverlay - - FlipperKit/FlipperKitLayoutHelpers - - FlipperKit/FlipperKitLayoutPlugin (0.201.0): - - FlipperKit/Core - - FlipperKit/FlipperKitHighlightOverlay - - FlipperKit/FlipperKitLayoutHelpers - - FlipperKit/FlipperKitLayoutIOSDescriptors - - FlipperKit/FlipperKitLayoutTextSearchable - - FlipperKit/FlipperKitLayoutTextSearchable (0.201.0) - - FlipperKit/FlipperKitNetworkPlugin (0.201.0): - - FlipperKit/Core - - FlipperKit/FlipperKitReactPlugin (0.201.0): - - FlipperKit/Core - - FlipperKit/FlipperKitUserDefaultsPlugin (0.201.0): - - FlipperKit/Core - - FlipperKit/SKIOSNetworkPlugin (0.201.0): - - FlipperKit/Core - - FlipperKit/FlipperKitNetworkPlugin - fmt (6.2.1) - glog (0.3.5) - - hermes-engine (1000.0.0): - - hermes-engine/Hermes (= 1000.0.0) - - hermes-engine/inspector (= 1000.0.0) - - hermes-engine/inspector_chrome (= 1000.0.0) - - hermes-engine/Public (= 1000.0.0) - - hermes-engine/Hermes (1000.0.0) - - hermes-engine/inspector (1000.0.0) - - hermes-engine/inspector_chrome (1000.0.0) - - hermes-engine/Public (1000.0.0) - - libevent (2.1.12) - - OCMock (3.9.1) - - OpenSSL-Universal (1.1.1100) - RCT-Folly (2022.05.16.00): - boost - DoubleConversion @@ -96,12 +27,6 @@ PODS: - DoubleConversion - fmt (~> 6.2.1) - glog - - RCT-Folly/Futures (2022.05.16.00): - - boost - - DoubleConversion - - fmt (~> 6.2.1) - - glog - - libevent - RCTRequired (1000.0.0) - RCTTypeSafety (1000.0.0): - FBLazyVector (= 1000.0.0) @@ -125,7 +50,6 @@ PODS: - DoubleConversion - FBReactNativeSpec - glog - - hermes-engine - RCT-Folly - RCTRequired - RCTTypeSafety @@ -133,6 +57,7 @@ PODS: - React-debug - React-Fabric - React-graphics + - React-jsc - React-jsi - React-jsiexecutor - React-NativeModulesApple @@ -143,214 +68,186 @@ PODS: - ReactCommon/turbomodule/core - React-Core (1000.0.0): - glog - - hermes-engine - RCT-Folly (= 2022.05.16.00) - React-Core/Default (= 1000.0.0) - React-cxxreact - - React-hermes + - React-jsc - React-jsi - React-jsiexecutor - React-perflogger - React-runtimescheduler - React-utils - - SocketRocket (= 0.6.0) + - SocketRocket (= 0.6.0.2) - Yoga - React-Core/CoreModulesHeaders (1000.0.0): - glog - - hermes-engine - RCT-Folly (= 2022.05.16.00) - React-Core/Default - React-cxxreact - - React-hermes + - React-jsc - React-jsi - React-jsiexecutor - React-perflogger - React-runtimescheduler - React-utils - - SocketRocket (= 0.6.0) + - SocketRocket (= 0.6.0.2) - Yoga - React-Core/Default (1000.0.0): - glog - - hermes-engine - RCT-Folly (= 2022.05.16.00) - React-cxxreact - - React-hermes + - React-jsc - React-jsi - React-jsiexecutor - React-perflogger - React-runtimescheduler - React-utils - - SocketRocket (= 0.6.0) + - SocketRocket (= 0.6.0.2) - Yoga - React-Core/DevSupport (1000.0.0): - glog - - hermes-engine - RCT-Folly (= 2022.05.16.00) - React-Core/Default (= 1000.0.0) - React-Core/RCTWebSocket (= 1000.0.0) - React-cxxreact - - React-hermes + - React-jsc - React-jsi - React-jsiexecutor - React-jsinspector (= 1000.0.0) - React-perflogger - React-runtimescheduler - React-utils - - SocketRocket (= 0.6.0) + - SocketRocket (= 0.6.0.2) - Yoga - React-Core/RCTActionSheetHeaders (1000.0.0): - glog - - hermes-engine - RCT-Folly (= 2022.05.16.00) - React-Core/Default - React-cxxreact - - React-hermes + - React-jsc - React-jsi - React-jsiexecutor - React-perflogger - React-runtimescheduler - React-utils - - SocketRocket (= 0.6.0) + - SocketRocket (= 0.6.0.2) - Yoga - React-Core/RCTAnimationHeaders (1000.0.0): - glog - - hermes-engine - RCT-Folly (= 2022.05.16.00) - React-Core/Default - React-cxxreact - - React-hermes + - React-jsc - React-jsi - React-jsiexecutor - React-perflogger - React-runtimescheduler - React-utils - - SocketRocket (= 0.6.0) + - SocketRocket (= 0.6.0.2) - Yoga - React-Core/RCTBlobHeaders (1000.0.0): - glog - - hermes-engine - RCT-Folly (= 2022.05.16.00) - React-Core/Default - React-cxxreact - - React-hermes + - React-jsc - React-jsi - React-jsiexecutor - React-perflogger - React-runtimescheduler - React-utils - - SocketRocket (= 0.6.0) + - SocketRocket (= 0.6.0.2) - Yoga - React-Core/RCTImageHeaders (1000.0.0): - glog - - hermes-engine - RCT-Folly (= 2022.05.16.00) - React-Core/Default - React-cxxreact - - React-hermes + - React-jsc - React-jsi - React-jsiexecutor - React-perflogger - React-runtimescheduler - React-utils - - SocketRocket (= 0.6.0) + - SocketRocket (= 0.6.0.2) - Yoga - React-Core/RCTLinkingHeaders (1000.0.0): - glog - - hermes-engine - RCT-Folly (= 2022.05.16.00) - React-Core/Default - React-cxxreact - - React-hermes + - React-jsc - React-jsi - React-jsiexecutor - React-perflogger - React-runtimescheduler - React-utils - - SocketRocket (= 0.6.0) + - SocketRocket (= 0.6.0.2) - Yoga - React-Core/RCTNetworkHeaders (1000.0.0): - glog - - hermes-engine - - RCT-Folly (= 2022.05.16.00) - - React-Core/Default - - React-cxxreact - - React-hermes - - React-jsi - - React-jsiexecutor - - React-perflogger - - React-runtimescheduler - - React-utils - - SocketRocket (= 0.6.0) - - Yoga - - React-Core/RCTPushNotificationHeaders (1000.0.0): - - glog - - hermes-engine - RCT-Folly (= 2022.05.16.00) - React-Core/Default - React-cxxreact - - React-hermes + - React-jsc - React-jsi - React-jsiexecutor - React-perflogger - React-runtimescheduler - React-utils - - SocketRocket (= 0.6.0) + - SocketRocket (= 0.6.0.2) - Yoga - React-Core/RCTSettingsHeaders (1000.0.0): - glog - - hermes-engine - RCT-Folly (= 2022.05.16.00) - React-Core/Default - React-cxxreact - - React-hermes + - React-jsc - React-jsi - React-jsiexecutor - React-perflogger - React-runtimescheduler - React-utils - - SocketRocket (= 0.6.0) + - SocketRocket (= 0.6.0.2) - Yoga - React-Core/RCTTextHeaders (1000.0.0): - glog - - hermes-engine - RCT-Folly (= 2022.05.16.00) - React-Core/Default - React-cxxreact - - React-hermes + - React-jsc - React-jsi - React-jsiexecutor - React-perflogger - React-runtimescheduler - React-utils - - SocketRocket (= 0.6.0) + - SocketRocket (= 0.6.0.2) - Yoga - React-Core/RCTVibrationHeaders (1000.0.0): - glog - - hermes-engine - RCT-Folly (= 2022.05.16.00) - React-Core/Default - React-cxxreact - - React-hermes + - React-jsc - React-jsi - React-jsiexecutor - React-perflogger - React-runtimescheduler - React-utils - - SocketRocket (= 0.6.0) + - SocketRocket (= 0.6.0.2) - Yoga - React-Core/RCTWebSocket (1000.0.0): - glog - - hermes-engine - RCT-Folly (= 2022.05.16.00) - React-Core/Default (= 1000.0.0) - React-cxxreact - - React-hermes + - React-jsc - React-jsi - React-jsiexecutor - React-perflogger - React-runtimescheduler - React-utils - - SocketRocket (= 0.6.0) + - SocketRocket (= 0.6.0.2) - Yoga - React-CoreModules (1000.0.0): - RCT-Folly (= 2022.05.16.00) @@ -361,13 +258,12 @@ PODS: - React-RCTBlob - React-RCTImage (= 1000.0.0) - ReactCommon/turbomodule/core (= 1000.0.0) - - SocketRocket (= 0.6.0) + - SocketRocket (= 0.6.0.2) - React-cxxreact (1000.0.0): - boost (= 1.83.0) - DoubleConversion - fmt (~> 6.2.1) - glog - - hermes-engine - RCT-Folly (= 2022.05.16.00) - React-callinvoker (= 1000.0.0) - React-debug (= 1000.0.0) @@ -381,7 +277,6 @@ PODS: - DoubleConversion - fmt (~> 6.2.1) - glog - - hermes-engine - RCT-Folly/Fabric (= 2022.05.16.00) - RCTRequired (= 1000.0.0) - RCTTypeSafety (= 1000.0.0) @@ -390,7 +285,6 @@ PODS: - React-debug - React-Fabric/animations (= 1000.0.0) - React-Fabric/attributedstring (= 1000.0.0) - - React-Fabric/butter (= 1000.0.0) - React-Fabric/componentregistry (= 1000.0.0) - React-Fabric/componentregistrynative (= 1000.0.0) - React-Fabric/components (= 1000.0.0) @@ -404,7 +298,7 @@ PODS: - React-Fabric/textlayoutmanager (= 1000.0.0) - React-Fabric/uimanager (= 1000.0.0) - React-graphics (= 1000.0.0) - - React-jsi (= 1000.0.0) + - React-jsi - React-jsiexecutor (= 1000.0.0) - React-logger - React-rendererdebug @@ -415,7 +309,6 @@ PODS: - DoubleConversion - fmt (~> 6.2.1) - glog - - hermes-engine - RCT-Folly/Fabric (= 2022.05.16.00) - RCTRequired (= 1000.0.0) - RCTTypeSafety (= 1000.0.0) @@ -423,7 +316,7 @@ PODS: - React-cxxreact - React-debug - React-graphics (= 1000.0.0) - - React-jsi (= 1000.0.0) + - React-jsi - React-jsiexecutor (= 1000.0.0) - React-logger - React-rendererdebug @@ -434,7 +327,6 @@ PODS: - DoubleConversion - fmt (~> 6.2.1) - glog - - hermes-engine - RCT-Folly/Fabric (= 2022.05.16.00) - RCTRequired (= 1000.0.0) - RCTTypeSafety (= 1000.0.0) @@ -442,26 +334,7 @@ PODS: - React-cxxreact - React-debug - React-graphics (= 1000.0.0) - - React-jsi (= 1000.0.0) - - React-jsiexecutor (= 1000.0.0) - - React-logger - - React-rendererdebug - - React-runtimescheduler - - React-utils - - ReactCommon/turbomodule/core (= 1000.0.0) - - React-Fabric/butter (1000.0.0): - - DoubleConversion - - fmt (~> 6.2.1) - - glog - - hermes-engine - - RCT-Folly/Fabric (= 2022.05.16.00) - - RCTRequired (= 1000.0.0) - - RCTTypeSafety (= 1000.0.0) - - React-Core - - React-cxxreact - - React-debug - - React-graphics (= 1000.0.0) - - React-jsi (= 1000.0.0) + - React-jsi - React-jsiexecutor (= 1000.0.0) - React-logger - React-rendererdebug @@ -472,7 +345,6 @@ PODS: - DoubleConversion - fmt (~> 6.2.1) - glog - - hermes-engine - RCT-Folly/Fabric (= 2022.05.16.00) - RCTRequired (= 1000.0.0) - RCTTypeSafety (= 1000.0.0) @@ -480,7 +352,7 @@ PODS: - React-cxxreact - React-debug - React-graphics (= 1000.0.0) - - React-jsi (= 1000.0.0) + - React-jsi - React-jsiexecutor (= 1000.0.0) - React-logger - React-rendererdebug @@ -491,7 +363,6 @@ PODS: - DoubleConversion - fmt (~> 6.2.1) - glog - - hermes-engine - RCT-Folly/Fabric (= 2022.05.16.00) - RCTRequired (= 1000.0.0) - RCTTypeSafety (= 1000.0.0) @@ -499,7 +370,7 @@ PODS: - React-cxxreact - React-debug - React-graphics (= 1000.0.0) - - React-jsi (= 1000.0.0) + - React-jsi - React-jsiexecutor (= 1000.0.0) - React-logger - React-rendererdebug @@ -510,7 +381,6 @@ PODS: - DoubleConversion - fmt (~> 6.2.1) - glog - - hermes-engine - RCT-Folly/Fabric (= 2022.05.16.00) - RCTRequired (= 1000.0.0) - RCTTypeSafety (= 1000.0.0) @@ -529,7 +399,7 @@ PODS: - React-Fabric/components/unimplementedview (= 1000.0.0) - React-Fabric/components/view (= 1000.0.0) - React-graphics (= 1000.0.0) - - React-jsi (= 1000.0.0) + - React-jsi - React-jsiexecutor (= 1000.0.0) - React-logger - React-rendererdebug @@ -540,7 +410,6 @@ PODS: - DoubleConversion - fmt (~> 6.2.1) - glog - - hermes-engine - RCT-Folly/Fabric (= 2022.05.16.00) - RCTRequired (= 1000.0.0) - RCTTypeSafety (= 1000.0.0) @@ -548,7 +417,7 @@ PODS: - React-cxxreact - React-debug - React-graphics (= 1000.0.0) - - React-jsi (= 1000.0.0) + - React-jsi - React-jsiexecutor (= 1000.0.0) - React-logger - React-rendererdebug @@ -559,7 +428,6 @@ PODS: - DoubleConversion - fmt (~> 6.2.1) - glog - - hermes-engine - RCT-Folly/Fabric (= 2022.05.16.00) - RCTRequired (= 1000.0.0) - RCTTypeSafety (= 1000.0.0) @@ -567,7 +435,7 @@ PODS: - React-cxxreact - React-debug - React-graphics (= 1000.0.0) - - React-jsi (= 1000.0.0) + - React-jsi - React-jsiexecutor (= 1000.0.0) - React-logger - React-rendererdebug @@ -578,7 +446,6 @@ PODS: - DoubleConversion - fmt (~> 6.2.1) - glog - - hermes-engine - RCT-Folly/Fabric (= 2022.05.16.00) - RCTRequired (= 1000.0.0) - RCTTypeSafety (= 1000.0.0) @@ -586,7 +453,7 @@ PODS: - React-cxxreact - React-debug - React-graphics (= 1000.0.0) - - React-jsi (= 1000.0.0) + - React-jsi - React-jsiexecutor (= 1000.0.0) - React-logger - React-rendererdebug @@ -597,7 +464,6 @@ PODS: - DoubleConversion - fmt (~> 6.2.1) - glog - - hermes-engine - RCT-Folly/Fabric (= 2022.05.16.00) - RCTRequired (= 1000.0.0) - RCTTypeSafety (= 1000.0.0) @@ -605,7 +471,7 @@ PODS: - React-cxxreact - React-debug - React-graphics (= 1000.0.0) - - React-jsi (= 1000.0.0) + - React-jsi - React-jsiexecutor (= 1000.0.0) - React-logger - React-rendererdebug @@ -616,7 +482,6 @@ PODS: - DoubleConversion - fmt (~> 6.2.1) - glog - - hermes-engine - RCT-Folly/Fabric (= 2022.05.16.00) - RCTRequired (= 1000.0.0) - RCTTypeSafety (= 1000.0.0) @@ -624,7 +489,7 @@ PODS: - React-cxxreact - React-debug - React-graphics (= 1000.0.0) - - React-jsi (= 1000.0.0) + - React-jsi - React-jsiexecutor (= 1000.0.0) - React-logger - React-rendererdebug @@ -635,7 +500,6 @@ PODS: - DoubleConversion - fmt (~> 6.2.1) - glog - - hermes-engine - RCT-Folly/Fabric (= 2022.05.16.00) - RCTRequired (= 1000.0.0) - RCTTypeSafety (= 1000.0.0) @@ -643,7 +507,7 @@ PODS: - React-cxxreact - React-debug - React-graphics (= 1000.0.0) - - React-jsi (= 1000.0.0) + - React-jsi - React-jsiexecutor (= 1000.0.0) - React-logger - React-rendererdebug @@ -654,7 +518,6 @@ PODS: - DoubleConversion - fmt (~> 6.2.1) - glog - - hermes-engine - RCT-Folly/Fabric (= 2022.05.16.00) - RCTRequired (= 1000.0.0) - RCTTypeSafety (= 1000.0.0) @@ -662,7 +525,7 @@ PODS: - React-cxxreact - React-debug - React-graphics (= 1000.0.0) - - React-jsi (= 1000.0.0) + - React-jsi - React-jsiexecutor (= 1000.0.0) - React-logger - React-rendererdebug @@ -673,7 +536,6 @@ PODS: - DoubleConversion - fmt (~> 6.2.1) - glog - - hermes-engine - RCT-Folly/Fabric (= 2022.05.16.00) - RCTRequired (= 1000.0.0) - RCTTypeSafety (= 1000.0.0) @@ -681,7 +543,7 @@ PODS: - React-cxxreact - React-debug - React-graphics (= 1000.0.0) - - React-jsi (= 1000.0.0) + - React-jsi - React-jsiexecutor (= 1000.0.0) - React-logger - React-rendererdebug @@ -692,7 +554,6 @@ PODS: - DoubleConversion - fmt (~> 6.2.1) - glog - - hermes-engine - RCT-Folly/Fabric (= 2022.05.16.00) - RCTRequired (= 1000.0.0) - RCTTypeSafety (= 1000.0.0) @@ -700,7 +561,7 @@ PODS: - React-cxxreact - React-debug - React-graphics (= 1000.0.0) - - React-jsi (= 1000.0.0) + - React-jsi - React-jsiexecutor (= 1000.0.0) - React-logger - React-rendererdebug @@ -711,7 +572,6 @@ PODS: - DoubleConversion - fmt (~> 6.2.1) - glog - - hermes-engine - RCT-Folly/Fabric (= 2022.05.16.00) - RCTRequired (= 1000.0.0) - RCTTypeSafety (= 1000.0.0) @@ -719,7 +579,7 @@ PODS: - React-cxxreact - React-debug - React-graphics (= 1000.0.0) - - React-jsi (= 1000.0.0) + - React-jsi - React-jsiexecutor (= 1000.0.0) - React-logger - React-rendererdebug @@ -730,7 +590,6 @@ PODS: - DoubleConversion - fmt (~> 6.2.1) - glog - - hermes-engine - RCT-Folly/Fabric (= 2022.05.16.00) - RCTRequired (= 1000.0.0) - RCTTypeSafety (= 1000.0.0) @@ -738,7 +597,7 @@ PODS: - React-cxxreact - React-debug - React-graphics (= 1000.0.0) - - React-jsi (= 1000.0.0) + - React-jsi - React-jsiexecutor (= 1000.0.0) - React-logger - React-rendererdebug @@ -750,7 +609,6 @@ PODS: - DoubleConversion - fmt (~> 6.2.1) - glog - - hermes-engine - RCT-Folly/Fabric (= 2022.05.16.00) - RCTRequired (= 1000.0.0) - RCTTypeSafety (= 1000.0.0) @@ -758,7 +616,7 @@ PODS: - React-cxxreact - React-debug - React-graphics (= 1000.0.0) - - React-jsi (= 1000.0.0) + - React-jsi - React-jsiexecutor (= 1000.0.0) - React-logger - React-rendererdebug @@ -769,7 +627,6 @@ PODS: - DoubleConversion - fmt (~> 6.2.1) - glog - - hermes-engine - RCT-Folly/Fabric (= 2022.05.16.00) - RCTRequired (= 1000.0.0) - RCTTypeSafety (= 1000.0.0) @@ -777,7 +634,7 @@ PODS: - React-cxxreact - React-debug - React-graphics (= 1000.0.0) - - React-jsi (= 1000.0.0) + - React-jsi - React-jsiexecutor (= 1000.0.0) - React-logger - React-rendererdebug @@ -788,7 +645,6 @@ PODS: - DoubleConversion - fmt (~> 6.2.1) - glog - - hermes-engine - RCT-Folly/Fabric (= 2022.05.16.00) - RCTRequired (= 1000.0.0) - RCTTypeSafety (= 1000.0.0) @@ -796,7 +652,7 @@ PODS: - React-cxxreact - React-debug - React-graphics (= 1000.0.0) - - React-jsi (= 1000.0.0) + - React-jsi - React-jsiexecutor (= 1000.0.0) - React-logger - React-rendererdebug @@ -807,7 +663,6 @@ PODS: - DoubleConversion - fmt (~> 6.2.1) - glog - - hermes-engine - RCT-Folly/Fabric (= 2022.05.16.00) - RCTRequired (= 1000.0.0) - RCTTypeSafety (= 1000.0.0) @@ -815,7 +670,7 @@ PODS: - React-cxxreact - React-debug - React-graphics (= 1000.0.0) - - React-jsi (= 1000.0.0) + - React-jsi - React-jsiexecutor (= 1000.0.0) - React-logger - React-rendererdebug @@ -826,7 +681,6 @@ PODS: - DoubleConversion - fmt (~> 6.2.1) - glog - - hermes-engine - RCT-Folly/Fabric (= 2022.05.16.00) - RCTRequired (= 1000.0.0) - RCTTypeSafety (= 1000.0.0) @@ -834,7 +688,7 @@ PODS: - React-cxxreact - React-debug - React-graphics (= 1000.0.0) - - React-jsi (= 1000.0.0) + - React-jsi - React-jsiexecutor (= 1000.0.0) - React-logger - React-rendererdebug @@ -845,7 +699,6 @@ PODS: - DoubleConversion - fmt (~> 6.2.1) - glog - - hermes-engine - RCT-Folly/Fabric (= 2022.05.16.00) - RCTRequired (= 1000.0.0) - RCTTypeSafety (= 1000.0.0) @@ -853,7 +706,7 @@ PODS: - React-cxxreact - React-debug - React-graphics (= 1000.0.0) - - React-jsi (= 1000.0.0) + - React-jsi - React-jsiexecutor (= 1000.0.0) - React-logger - React-rendererdebug @@ -864,7 +717,6 @@ PODS: - DoubleConversion - fmt (~> 6.2.1) - glog - - hermes-engine - RCT-Folly/Fabric (= 2022.05.16.00) - RCTRequired (= 1000.0.0) - RCTTypeSafety (= 1000.0.0) @@ -872,7 +724,7 @@ PODS: - React-cxxreact - React-debug - React-graphics (= 1000.0.0) - - React-jsi (= 1000.0.0) + - React-jsi - React-jsiexecutor (= 1000.0.0) - React-logger - React-rendererdebug @@ -883,7 +735,6 @@ PODS: - DoubleConversion - fmt (~> 6.2.1) - glog - - hermes-engine - RCT-Folly/Fabric (= 2022.05.16.00) - RCTRequired (= 1000.0.0) - RCTTypeSafety (= 1000.0.0) @@ -892,7 +743,7 @@ PODS: - React-debug - React-Fabric/uimanager - React-graphics (= 1000.0.0) - - React-jsi (= 1000.0.0) + - React-jsi - React-jsiexecutor (= 1000.0.0) - React-logger - React-rendererdebug @@ -903,7 +754,6 @@ PODS: - DoubleConversion - fmt (~> 6.2.1) - glog - - hermes-engine - RCT-Folly/Fabric (= 2022.05.16.00) - RCTRequired (= 1000.0.0) - RCTTypeSafety (= 1000.0.0) @@ -911,7 +761,7 @@ PODS: - React-cxxreact - React-debug - React-graphics (= 1000.0.0) - - React-jsi (= 1000.0.0) + - React-jsi - React-jsiexecutor (= 1000.0.0) - React-logger - React-rendererdebug @@ -922,14 +772,13 @@ PODS: - DoubleConversion - fmt (~> 6.2.1) - glog - - hermes-engine - RCT-Folly/Fabric (= 2022.05.16.00) - RCTRequired (= 1000.0.0) - RCTTypeSafety (= 1000.0.0) - React-Fabric - React-graphics (= 1000.0.0) - React-ImageManager - - React-jsi (= 1000.0.0) + - React-jsi - React-jsiexecutor (= 1000.0.0) - React-logger - React-rendererdebug @@ -940,18 +789,7 @@ PODS: - glog - RCT-Folly/Fabric (= 2022.05.16.00) - React-Core/Default (= 1000.0.0) - - React-hermes (1000.0.0): - - DoubleConversion - - fmt (~> 6.2.1) - - glog - - hermes-engine - - RCT-Folly (= 2022.05.16.00) - - RCT-Folly/Futures (= 2022.05.16.00) - - React-cxxreact (= 1000.0.0) - - React-jsi - - React-jsiexecutor (= 1000.0.0) - - React-jsinspector (= 1000.0.0) - - React-perflogger (= 1000.0.0) + - React-utils - React-ImageManager (1000.0.0): - glog - RCT-Folly/Fabric @@ -961,6 +799,11 @@ PODS: - React-RCTImage - React-rendererdebug - React-utils + - React-jsc (1000.0.0): + - React-jsc/Fabric (= 1000.0.0) + - React-jsi (= 1000.0.0) + - React-jsc/Fabric (1000.0.0): + - React-jsi (= 1000.0.0) - React-jserrorhandler (1000.0.0): - RCT-Folly/Fabric (= 2022.05.16.00) - React-jsi (= 1000.0.0) @@ -975,7 +818,6 @@ PODS: - DoubleConversion - fmt (~> 6.2.1) - glog - - hermes-engine - RCT-Folly (= 2022.05.16.00) - React-cxxreact (= 1000.0.0) - React-jsi (= 1000.0.0) @@ -989,7 +831,6 @@ PODS: - React-nativeconfig (1000.0.0) - React-NativeModulesApple (1000.0.0): - glog - - hermes-engine - React-callinvoker - React-Core - React-cxxreact @@ -1013,7 +854,7 @@ PODS: - RCTTypeSafety - React-Core - React-CoreModules - - React-hermes + - React-jsc - React-nativeconfig - React-NativeModulesApple - React-RCTFabric @@ -1022,7 +863,6 @@ PODS: - React-runtimescheduler - ReactCommon/turbomodule/core - React-RCTBlob (1000.0.0): - - hermes-engine - RCT-Folly (= 2022.05.16.00) - React-Codegen (= 1000.0.0) - React-Core/RCTBlobHeaders (= 1000.0.0) @@ -1032,7 +872,6 @@ PODS: - ReactCommon/turbomodule/core (= 1000.0.0) - React-RCTFabric (1000.0.0): - glog - - hermes-engine - RCT-Folly/Fabric (= 2022.05.16.00) - React-Core (= 1000.0.0) - React-debug @@ -1040,6 +879,7 @@ PODS: - React-FabricImage - React-graphics - React-ImageManager + - React-jsi - React-nativeconfig - React-RCTImage (= 1000.0.0) - React-RCTText @@ -1067,12 +907,6 @@ PODS: - React-Core/RCTNetworkHeaders (= 1000.0.0) - React-jsi (= 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) - - ReactCommon/turbomodule/core (= 1000.0.0) - React-RCTSettings (1000.0.0): - RCT-Folly (= 2022.05.16.00) - RCTTypeSafety (= 1000.0.0) @@ -1080,12 +914,6 @@ PODS: - React-Core/RCTSettingsHeaders (= 1000.0.0) - React-jsi (= 1000.0.0) - ReactCommon/turbomodule/core (= 1000.0.0) - - React-RCTTest (1000.0.0): - - RCT-Folly (= 2022.05.16.00) - - React-Core (= 1000.0.0) - - React-CoreModules (= 1000.0.0) - - React-jsi (= 1000.0.0) - - ReactCommon/turbomodule/core (= 1000.0.0) - React-RCTText (1000.0.0): - React-Core/RCTTextHeaders (= 1000.0.0) - Yoga @@ -1105,11 +933,11 @@ PODS: - React-jsi (= 1000.0.0) - React-runtimescheduler (1000.0.0): - glog - - hermes-engine - RCT-Folly (= 2022.05.16.00) - React-callinvoker - React-debug - React-jsi + - React-rendererdebug - React-runtimeexecutor - React-utils - React-utils (1000.0.0): @@ -1119,18 +947,17 @@ PODS: - ReactCommon-Samples (1000.0.0): - DoubleConversion - fmt (~> 6.2.1) - - hermes-engine - RCT-Folly - React-Codegen - React-Core - React-cxxreact + - React-jsi - React-NativeModulesApple - ReactCommon/turbomodule/core - ReactCommon/turbomodule/bridging (1000.0.0): - DoubleConversion - fmt (~> 6.2.1) - glog - - hermes-engine - RCT-Folly (= 2022.05.16.00) - React-callinvoker (= 1000.0.0) - React-cxxreact (= 1000.0.0) @@ -1141,7 +968,6 @@ PODS: - DoubleConversion - fmt (~> 6.2.1) - glog - - hermes-engine - RCT-Folly (= 2022.05.16.00) - React-callinvoker (= 1000.0.0) - React-cxxreact (= 1000.0.0) @@ -1152,7 +978,7 @@ PODS: - glog - RCT-Folly (= 2022.05.16.00) - React-Core - - SocketRocket (0.6.0) + - SocketRocket (0.6.0.2) - Yoga (1.14.0) DEPENDENCIES: @@ -1160,31 +986,8 @@ DEPENDENCIES: - DoubleConversion (from `../react-native/third-party-podspecs/DoubleConversion.podspec`) - FBLazyVector (from `../react-native/Libraries/FBLazyVector`) - FBReactNativeSpec (from `../react-native/React/FBReactNativeSpec`) - - Flipper (= 0.201.0) - - Flipper-Boost-iOSX (= 1.76.0.1.11) - - Flipper-DoubleConversion (= 3.2.0.1) - - Flipper-Fmt (= 7.1.7) - - Flipper-Folly (= 2.6.10) - - Flipper-Glog (= 0.5.0.5) - - Flipper-PeerTalk (= 0.0.4) - - FlipperKit (= 0.201.0) - - FlipperKit/Core (= 0.201.0) - - FlipperKit/CppBridge (= 0.201.0) - - FlipperKit/FBCxxFollyDynamicConvert (= 0.201.0) - - FlipperKit/FBDefines (= 0.201.0) - - FlipperKit/FKPortForwarding (= 0.201.0) - - FlipperKit/FlipperKitHighlightOverlay (= 0.201.0) - - FlipperKit/FlipperKitLayoutPlugin (= 0.201.0) - - FlipperKit/FlipperKitLayoutTextSearchable (= 0.201.0) - - FlipperKit/FlipperKitNetworkPlugin (= 0.201.0) - - FlipperKit/FlipperKitReactPlugin (= 0.201.0) - - FlipperKit/FlipperKitUserDefaultsPlugin (= 0.201.0) - - FlipperKit/SKIOSNetworkPlugin (= 0.201.0) + - fmt (from `../react-native/third-party-podspecs/fmt.podspec`) - glog (from `../react-native/third-party-podspecs/glog.podspec`) - - hermes-engine (from `../react-native/sdks/hermes-engine/hermes-engine.podspec`) - - libevent (~> 2.1.12) - - OCMock (~> 3.9.1) - - OpenSSL-Universal (= 1.1.1100) - RCT-Folly (from `../react-native/third-party-podspecs/RCT-Folly.podspec`) - RCT-Folly/Fabric (from `../react-native/third-party-podspecs/RCT-Folly.podspec`) - RCTRequired (from `../react-native/Libraries/RCTRequired`) @@ -1193,7 +996,6 @@ DEPENDENCIES: - React-callinvoker (from `../react-native/ReactCommon/callinvoker`) - React-Codegen (from `build/generated/ios`) - React-Core (from `../react-native/`) - - React-Core/DevSupport (from `../react-native/`) - React-Core/RCTWebSocket (from `../react-native/`) - React-CoreModules (from `../react-native/React/CoreModules`) - React-cxxreact (from `../react-native/ReactCommon/cxxreact`) @@ -1201,8 +1003,9 @@ DEPENDENCIES: - React-Fabric (from `../react-native/ReactCommon`) - React-FabricImage (from `../react-native/ReactCommon`) - React-graphics (from `../react-native/ReactCommon/react/renderer/graphics`) - - React-hermes (from `../react-native/ReactCommon/hermes`) - React-ImageManager (from `../react-native/ReactCommon/react/renderer/imagemanager/platform/ios`) + - React-jsc (from `../react-native/ReactCommon/jsc`) + - React-jsc/Fabric (from `../react-native/ReactCommon/jsc`) - React-jserrorhandler (from `../react-native/ReactCommon/jserrorhandler`) - React-jsi (from `../react-native/ReactCommon/jsi`) - React-jsiexecutor (from `../react-native/ReactCommon/jsiexecutor`) @@ -1220,9 +1023,7 @@ DEPENDENCIES: - React-RCTImage (from `../react-native/Libraries/Image`) - React-RCTLinking (from `../react-native/Libraries/LinkingIOS`) - React-RCTNetwork (from `../react-native/Libraries/Network`) - - React-RCTPushNotification (from `../react-native/Libraries/PushNotificationIOS`) - React-RCTSettings (from `../react-native/Libraries/Settings`) - - React-RCTTest (from `./RCTTest`) - React-RCTText (from `../react-native/Libraries/Text`) - React-RCTVibration (from `../react-native/Libraries/Vibration`) - React-rendererdebug (from `../react-native/ReactCommon/react/renderer/debug`) @@ -1233,25 +1034,9 @@ DEPENDENCIES: - ReactCommon-Samples (from `../react-native/ReactCommon/react/nativemodule/samples`) - ReactCommon/turbomodule/core (from `../react-native/ReactCommon`) - ScreenshotManager (from `NativeModuleExample`) + - SocketRocket (from `../react-native/third-party-podspecs/SocketRocket.podspec`) - Yoga (from `../react-native/ReactCommon/yoga`) -SPEC REPOS: - trunk: - - CocoaAsyncSocket - - Flipper - - Flipper-Boost-iOSX - - Flipper-DoubleConversion - - Flipper-Fmt - - Flipper-Folly - - Flipper-Glog - - Flipper-PeerTalk - - FlipperKit - - fmt - - libevent - - OCMock - - OpenSSL-Universal - - SocketRocket - EXTERNAL SOURCES: boost: :podspec: "../react-native/third-party-podspecs/boost.podspec" @@ -1261,11 +1046,10 @@ EXTERNAL SOURCES: :path: "../react-native/Libraries/FBLazyVector" FBReactNativeSpec: :path: "../react-native/React/FBReactNativeSpec" + fmt: + :podspec: "../react-native/third-party-podspecs/fmt.podspec" glog: :podspec: "../react-native/third-party-podspecs/glog.podspec" - hermes-engine: - :podspec: "../react-native/sdks/hermes-engine/hermes-engine.podspec" - :tag: '' RCT-Folly: :podspec: "../react-native/third-party-podspecs/RCT-Folly.podspec" RCTRequired: @@ -1292,10 +1076,10 @@ EXTERNAL SOURCES: :path: "../react-native/ReactCommon" React-graphics: :path: "../react-native/ReactCommon/react/renderer/graphics" - React-hermes: - :path: "../react-native/ReactCommon/hermes" React-ImageManager: :path: "../react-native/ReactCommon/react/renderer/imagemanager/platform/ios" + React-jsc: + :path: "../react-native/ReactCommon/jsc" React-jserrorhandler: :path: "../react-native/ReactCommon/jserrorhandler" React-jsi: @@ -1330,12 +1114,8 @@ EXTERNAL SOURCES: :path: "../react-native/Libraries/LinkingIOS" React-RCTNetwork: :path: "../react-native/Libraries/Network" - React-RCTPushNotification: - :path: "../react-native/Libraries/PushNotificationIOS" React-RCTSettings: :path: "../react-native/Libraries/Settings" - React-RCTTest: - :path: "./RCTTest" React-RCTText: :path: "../react-native/Libraries/Text" React-RCTVibration: @@ -1356,77 +1136,64 @@ EXTERNAL SOURCES: :path: "../react-native/ReactCommon/react/nativemodule/samples" ScreenshotManager: :path: NativeModuleExample + SocketRocket: + :podspec: "../react-native/third-party-podspecs/SocketRocket.podspec" Yoga: :path: "../react-native/ReactCommon/yoga" SPEC CHECKSUMS: - boost: 26fad476bfa736552bbfa698a06cc530475c1505 - CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99 - DoubleConversion: fea03f2699887d960129cc54bba7e52542b6f953 - FBLazyVector: b233b98f08056318bc56f4deccea817b00edeac5 - FBReactNativeSpec: 9c14dc03023715c92c7d01a9c78e8475fe012718 - Flipper: c7a0093234c4bdd456e363f2f19b2e4b27652d44 - Flipper-Boost-iOSX: fd1e2b8cbef7e662a122412d7ac5f5bea715403c - Flipper-DoubleConversion: 2dc99b02f658daf147069aad9dbd29d8feb06d30 - Flipper-Fmt: 60cbdd92fc254826e61d669a5d87ef7015396a9b - Flipper-Folly: 584845625005ff068a6ebf41f857f468decd26b3 - Flipper-Glog: 70c50ce58ddaf67dc35180db05f191692570f446 - Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9 - FlipperKit: 37525a5d056ef9b93d1578e04bc3ea1de940094f - fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9 - glog: c5d68082e772fa1c511173d6b30a9de2c05a69a2 - hermes-engine: 2f192f79eb5fd8674ca08d663cfdb1a7f4ca2afc - libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 - OCMock: 9491e4bec59e0b267d52a9184ff5605995e74be8 - OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c - RCT-Folly: 870a45f398f8ee9ca60cd021b23ab144d56fd3ad - RCTRequired: 5091117ce5c99db5af024aa1ec15c6a4c4ad7f1c - RCTTypeSafety: 95672f6742bf7b5d16bd8700a65e7bffb63cd9f8 - React: 2806c7b904a5f8e1279bb1fcf829b6a43bc71e15 - React-callinvoker: 2d96a4479c0b440a4b24f7eb0ae73a95c0a7e5d9 - React-Codegen: 5ad0601f4a0960e6ad81412fdfb270aafba6e4e1 - React-Core: 2e70e151812a6ad68a95b676d05e13ee38466d96 - React-CoreModules: 69643fe30d8e8f214584cb5336e47307e458d9d9 - React-cxxreact: 420ec1c09edf4291fa3cfee30371572572ccb2e5 - React-debug: 42965d54926dad1d171d60bdb89e000efb4eb9b4 - React-Fabric: d3aecfadeb3077c2396cbd305895b025eed4123d - React-FabricImage: de13a9ca5eb2819ac729564e98a40a9af54452f5 - React-graphics: cfcaab89e7d1aa59bb97d99c25ef5f28d9ced5f1 - React-hermes: 11fcf1dd7dff109b40160e75eb4447af3ceae85d - React-ImageManager: ec2b27c090514ca96f78753767a3fb4682be78f3 - React-jserrorhandler: 87d904b84cedbf897a4ed59aceca5724f03cf9af - React-jsi: 990673de5500c55224e52e7235863b1511ad6375 - React-jsiexecutor: ae9ed28dbcf5273f4916fbabf4958ec891f47c0e - React-jsinspector: e845240c20daa428639125e0e5623a3237203ff7 - React-logger: 5bb7c5f3a5ef404c197941167c8cc7628e928f97 - React-Mapbuffer: e741b31b558f7679bc6b8a848fb3605f8d357998 - React-nativeconfig: 7b4ebf6e90de842fd0e6f5df6d9ad1f624955bde - React-NativeModulesApple: 6306a1e80f8f09e8689a43e9072e9be25dbcfcc6 - React-perflogger: 24428a1beeb9754b41ecec09f62cbd8ff15ddb46 - React-RCTActionSheet: fb44d26d484d53f7e5debf2346f9871336e5ac70 - React-RCTAnimation: b54290477ef258b6981a6822f5b52673cc08399a - React-RCTAppDelegate: 122a35fd62d94993c7370d25cc85c7e65315711e - React-RCTBlob: bff18b190ffe3a48b2d78dbb027c24067b6314c1 - React-RCTFabric: 42070e4bfab8370c081def852e5e31e047eae192 - React-RCTImage: 0329f6197bb95cf9f4e37f9270b278e4037abdc0 - React-RCTLinking: 79e3f58ad1b65dba4cb2c53c2b09eec75d858c20 - React-RCTNetwork: b603998f6a23cf652395ffe84d5dea67cd4c49de - React-RCTPushNotification: 317b76a7c6c576898580472a1394a3844328c95e - React-RCTSettings: 866e76786094fc7f5037719b767e9adffd8dda87 - React-RCTTest: bad53a62901f602dd919cb3c47d91a0c76ec7f38 - React-RCTText: 6b8c71ab09e7480ffaa5fd353f5b8646019a1cf3 - React-RCTVibration: cf14ac74b9f1d676d56111216d1a6e1b0df06d51 - React-rendererdebug: bcfb7fa48f8a0f62f87522a8f47e72787761884c - React-rncore: 28bd4658bf02ba5302822b8c6ddc0052f7566277 - React-runtimeexecutor: 963711d915734cd2a24fae6edec7f0572d19ecce - React-runtimescheduler: 6e7519d2003b5ab8aa8a79b60478fd13cd5f6681 - React-utils: b842f2d7fe9d81138a486512f44fe1565e2bb987 - ReactCommon: 9ab719868580941d77be0f90e4d310580868753d - ReactCommon-Samples: 9bdd25d3e637c98e314fa9f507292b4c4ddb3edd - ScreenshotManager: 338d56378199c1e9fb50d896a7ce4400cd250b5e - SocketRocket: fccef3f9c5cedea1353a9ef6ada904fde10d6608 - Yoga: 5c39c7ead1a63357070b8bef4a9a57b9a1cd1ccb + boost: 3f76a4d6d9d0f232d25b7782f83fcf988f47d517 + DoubleConversion: 71bf0761505a44e4dfddc0aa04afa049fdfb63b5 + FBLazyVector: 86b31b919da5628a7438952fdae24a5fc326d7d5 + FBReactNativeSpec: 2e9f10936f15c8d7a5c4fc34bb1e9cb7e0545ec9 + fmt: a0f8f687393e36a6cbde773af429902107de9759 + glog: 4f05d17aa39a829fee878689fc9a41af587fabba + RCT-Folly: 7e539f94cc2081b31229ab267b0c2faf8d1b9116 + RCTRequired: f2a8af97a0aca452a614f66ec530a53b8d48c4e4 + RCTTypeSafety: 13b2471410d2fe3d225f007e80df702ebbc3f4df + React: c0054d12d2ce2d6f04cb80d766bcc6d9d985e8e1 + React-callinvoker: 6b4c95a0b68bca152ca026acee3a4e5cb402ae91 + React-Codegen: cbb7b65567e83e744f5dce94363ce8566e743866 + React-Core: 0e8bb774d0e6c1003cf1d1e645e1a945b1084a59 + React-CoreModules: c6992ee30a620665d835bcf84e56adbe6f2fa639 + React-cxxreact: 7aa976dd2acf423d7340e8c60fcb176bdf90e6cd + React-debug: 3276dbf50b28be949de7139c94ef53ad0ca0616b + React-Fabric: 126d6a24460e77caf0a9cf2a52629536745488d2 + React-FabricImage: 196f456b56ccffa40718a01aa77cec23d0bd1acd + React-graphics: 9f444d7fabe43dd54c18c1d89ae7b4cf163e005d + React-ImageManager: 82c91fe994ce01ca295a3247205c18ba580540bf + React-jsc: 286cb2e0f7f6eb466b84d978589773fcc46eb608 + React-jserrorhandler: 19256652357c74c0429cf5acc1e540ceddb9aea7 + React-jsi: 927800a708da1e9e366d6278d7f3a297d2770294 + React-jsiexecutor: 044da87c7b2b21a5d62d9e9cf32d3bc29da0e6ec + React-jsinspector: 67c06b7d88e907a053e36b3f29559882ffbd05be + React-logger: 0e806a18deea47fd15d0103c7730f9b196c86e83 + React-Mapbuffer: 68936c3d6c2652994774965172ae6bacb1700f19 + React-nativeconfig: 843e8cf2e906318d1a6647b62dda71cfe2dceb36 + React-NativeModulesApple: 931b09d7568eb613960908c53e849746fc40d638 + React-perflogger: f6ef27c3d7c861d5ec371748a29dbd135080408a + React-RCTActionSheet: 91decf15bf305e28f5a635ccaec619d232c0f45e + React-RCTAnimation: 2dcd2876b489c78179e99daa3087d0c82baa107a + React-RCTAppDelegate: 8f98ed8b28f3e618d60faa761721269082736e23 + React-RCTBlob: 455a346ca6e9cd986034e5bd34d6fb913b60108f + React-RCTFabric: b15172c14f20bdca35e38448ec8343cd9116eebf + React-RCTImage: 3cab134f85051d2589df03884e37be3e31186c39 + React-RCTLinking: 02ee1b138b5fde54143050844b5ac1c64075b5f1 + React-RCTNetwork: 62906c9e4b44726e491e1bb7a0fedc7145be880e + React-RCTSettings: 05b2d1eb173cb740630a7ba0c5022bd02442203f + React-RCTText: 69c9c19d542992a476fbce7f50bbf18ba1d06ed1 + React-RCTVibration: 03de73d0ea30de9488961c47e9e8d30abe51780a + React-rendererdebug: 8734786f44c77a9a31d940383dbc12f1285c8a07 + React-rncore: 8f4165d7fe827db9297aa33a8230439bba2fca84 + React-runtimeexecutor: 1d5edfd87215e5ac8f7f0a3fd158a276b51a11a5 + React-runtimescheduler: ec19c91c41005c1abd645ff1d792dd6a2fd25d0a + React-utils: b2b78ba130998e9fe9f77468a30e8531c76de024 + ReactCommon: 66477bf6b78e1bc35b24b9be82e86a7443756aaa + ReactCommon-Samples: 8fde060a11c5e847349fe10c827836f9f3b40060 + ScreenshotManager: 1e988ce4742844603b8a18aedea8c81d3d182e82 + SocketRocket: cf50640c1957b6d6ec89bd02ec74a639efcae47e + Yoga: 44a470988a4a403cf54307e3327810d5f09ae11f -PODFILE CHECKSUM: ae1f2365c7aaade1c3f51a182c545de8df389f81 +PODFILE CHECKSUM: f5bdb2ce5d086eb25bb987b68d2cacd14f07c249 -COCOAPODS: 1.12.1 +COCOAPODS: 1.13.0 diff --git a/packages/rn-tester/RNTester/AppDelegate.mm b/packages/rn-tester/RNTester/AppDelegate.mm index 35274d73bc24ad..5b49646b4276ba 100644 --- a/packages/rn-tester/RNTester/AppDelegate.mm +++ b/packages/rn-tester/RNTester/AppDelegate.mm @@ -12,7 +12,7 @@ #import #import -#if !TARGET_OS_TV && !TARGET_OS_UIKITFORMAC +#if !TARGET_OS_TV && !TARGET_OS_UIKITFORMAC && !TARGET_OS_VISION #import #endif @@ -78,7 +78,7 @@ - (void)loadSourceForBridge:(RCTBridge *)bridge return nullptr; } -#if !TARGET_OS_TV && !TARGET_OS_UIKITFORMAC +#if !TARGET_OS_TV && !TARGET_OS_UIKITFORMAC && !TARGET_OS_VISION // Required to register for notifications - (void)application:(__unused UIApplication *)application diff --git a/packages/rn-tester/RNTester/SwiftTest.swift b/packages/rn-tester/RNTester/SwiftTest.swift index fc64f0d701fa60..28c3ca6bee4ad8 100644 --- a/packages/rn-tester/RNTester/SwiftTest.swift +++ b/packages/rn-tester/RNTester/SwiftTest.swift @@ -6,6 +6,7 @@ */ // The SwiftTest here in rn-tester acts as a guard to make sure that we can build React-Core clang module and import from Swift. + import React func getReactNativeVersion() -> String { diff --git a/packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj b/packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj index ec0082dd9e3d61..339c15761c238d 100644 --- a/packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj +++ b/packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj @@ -13,10 +13,10 @@ 383889DA23A7398900D06C3E /* RCTConvert_UIColorTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 383889D923A7398900D06C3E /* RCTConvert_UIColorTests.m */; }; 3D2AFAF51D646CF80089D1A3 /* legacy_image@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3D2AFAF41D646CF80089D1A3 /* legacy_image@2x.png */; }; 5C60EB1C226440DB0018C04F /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5C60EB1B226440DB0018C04F /* AppDelegate.mm */; }; + 70519E9C72DD9686A7312875 /* libPods-RNTesterUnitTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00ACC24C9F5DE409F79F5076 /* libPods-RNTesterUnitTests.a */; }; 8145AE06241172D900A3F8DA /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8145AE05241172D900A3F8DA /* LaunchScreen.storyboard */; }; 832F45BB2A8A6E1F0097B4E6 /* SwiftTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 832F45BA2A8A6E1F0097B4E6 /* SwiftTest.swift */; }; - 953D44E0A849F5064163EA24 /* libPods-RNTesterIntegrationTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4F4A7C4C85AB0198A25D51E4 /* libPods-RNTesterIntegrationTests.a */; }; - BE3BEE3556275C62F33864C8 /* libPods-RNTesterUnitTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6144DEEE56C6C17B301A90E4 /* libPods-RNTesterUnitTests.a */; }; + A0536204922D9D7266E4A473 /* libPods-RNTesterIntegrationTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 721F6D6CDDF1D5BFE39D6B31 /* libPods-RNTesterIntegrationTests.a */; }; CD10C7A5290BD4EB0033E1ED /* RCTEventEmitterTests.m in Sources */ = {isa = PBXBuildFile; fileRef = CD10C7A4290BD4EB0033E1ED /* RCTEventEmitterTests.m */; }; E62F11832A5C6580000BF1C8 /* FlexibleSizeExampleView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 27F441E81BEBE5030039B79C /* FlexibleSizeExampleView.mm */; }; E62F11842A5C6584000BF1C8 /* UpdatePropertiesExampleView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 272E6B3C1BEA849E001FCF37 /* UpdatePropertiesExampleView.mm */; }; @@ -77,6 +77,7 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ + 00ACC24C9F5DE409F79F5076 /* libPods-RNTesterUnitTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-RNTesterUnitTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 0CC3BE1A25DDB68A0033CAEB /* RNTester.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; name = RNTester.entitlements; path = RNTester/RNTester.entitlements; sourceTree = ""; }; 13B07F961A680F5B00A75B9A /* RNTester.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = RNTester.app; sourceTree = BUILT_PRODUCTS_DIR; }; 13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = RNTester/AppDelegate.h; sourceTree = ""; }; @@ -88,21 +89,19 @@ 27F441EA1BEBE5030039B79C /* FlexibleSizeExampleView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FlexibleSizeExampleView.h; path = RNTester/NativeExampleViews/FlexibleSizeExampleView.h; sourceTree = ""; }; 2DDEF00F1F84BF7B00DBDF73 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = RNTester/Images.xcassets; sourceTree = ""; }; 2F98312BF816A7F2688C036D /* libPods-RNTester.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-RNTester.a"; sourceTree = BUILT_PRODUCTS_DIR; }; - 3485A25B916F57284634B78A /* Pods-RNTesterIntegrationTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RNTesterIntegrationTests.debug.xcconfig"; path = "Target Support Files/Pods-RNTesterIntegrationTests/Pods-RNTesterIntegrationTests.debug.xcconfig"; sourceTree = ""; }; 383889D923A7398900D06C3E /* RCTConvert_UIColorTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTConvert_UIColorTests.m; sourceTree = ""; }; 3CC2F16A3AEB8D7102722AD5 /* Pods-RNTester.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RNTester.debug.xcconfig"; path = "Target Support Files/Pods-RNTester/Pods-RNTester.debug.xcconfig"; sourceTree = ""; }; 3D2AFAF41D646CF80089D1A3 /* legacy_image@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "legacy_image@2x.png"; path = "RNTester/legacy_image@2x.png"; sourceTree = ""; }; - 4F4A7C4C85AB0198A25D51E4 /* libPods-RNTesterIntegrationTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-RNTesterIntegrationTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 5C60EB1B226440DB0018C04F /* AppDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = AppDelegate.mm; path = RNTester/AppDelegate.mm; sourceTree = ""; }; - 6144DEEE56C6C17B301A90E4 /* libPods-RNTesterUnitTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-RNTesterUnitTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 721F6D6CDDF1D5BFE39D6B31 /* libPods-RNTesterIntegrationTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-RNTesterIntegrationTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 7BE36688335095B16916B436 /* Pods-RNTesterUnitTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RNTesterUnitTests.release.xcconfig"; path = "Target Support Files/Pods-RNTesterUnitTests/Pods-RNTesterUnitTests.release.xcconfig"; sourceTree = ""; }; 7FC437025B5EE3899315628B /* Pods-RNTester.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RNTester.release.xcconfig"; path = "Target Support Files/Pods-RNTester/Pods-RNTester.release.xcconfig"; sourceTree = ""; }; 8145AE05241172D900A3F8DA /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = RNTester/LaunchScreen.storyboard; sourceTree = ""; }; 832F45BA2A8A6E1F0097B4E6 /* SwiftTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = SwiftTest.swift; path = RNTester/SwiftTest.swift; sourceTree = ""; }; AC474BFB29BBD4A1002BDAED /* RNTester.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; name = RNTester.xctestplan; path = RNTester/RNTester.xctestplan; sourceTree = ""; }; - B8219B8DAB1CDD38543E30A4 /* Pods-RNTesterUnitTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RNTesterUnitTests.release.xcconfig"; path = "Target Support Files/Pods-RNTesterUnitTests/Pods-RNTesterUnitTests.release.xcconfig"; sourceTree = ""; }; - BD6F35F6C79ACF7496CBC337 /* Pods-RNTesterIntegrationTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RNTesterIntegrationTests.release.xcconfig"; path = "Target Support Files/Pods-RNTesterIntegrationTests/Pods-RNTesterIntegrationTests.release.xcconfig"; sourceTree = ""; }; - C4CEC47A71A2AEE236833CDF /* Pods-RNTesterUnitTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RNTesterUnitTests.debug.xcconfig"; path = "Target Support Files/Pods-RNTesterUnitTests/Pods-RNTesterUnitTests.debug.xcconfig"; sourceTree = ""; }; + B318F9F5046DB35BB33BE43D /* Pods-RNTesterIntegrationTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RNTesterIntegrationTests.release.xcconfig"; path = "Target Support Files/Pods-RNTesterIntegrationTests/Pods-RNTesterIntegrationTests.release.xcconfig"; sourceTree = ""; }; CD10C7A4290BD4EB0033E1ED /* RCTEventEmitterTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTEventEmitterTests.m; sourceTree = ""; }; + E428CAB39DC86CBFF0440A00 /* Pods-RNTesterIntegrationTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RNTesterIntegrationTests.debug.xcconfig"; path = "Target Support Files/Pods-RNTesterIntegrationTests/Pods-RNTesterIntegrationTests.debug.xcconfig"; sourceTree = ""; }; E771AEEA22B44E3100EA1189 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = RNTester/Info.plist; sourceTree = ""; }; E7C1241922BEC44B00DA25C0 /* RNTesterIntegrationTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNTesterIntegrationTests.m; sourceTree = ""; }; E7DB209F22B2BA84005AC45F /* RNTesterUnitTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RNTesterUnitTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -165,6 +164,7 @@ E7DB215F22B2F3EC005AC45F /* RCTUIManagerScenarioTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTUIManagerScenarioTests.m; sourceTree = ""; }; E7DB216022B2F3EC005AC45F /* RNTesterSnapshotTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNTesterSnapshotTests.m; sourceTree = ""; }; E7DB218B22B41FCD005AC45F /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = XCTest.framework; sourceTree = DEVELOPER_DIR; }; + EFA252CD309EE7BA385B69C9 /* Pods-RNTesterUnitTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RNTesterUnitTests.debug.xcconfig"; path = "Target Support Files/Pods-RNTesterUnitTests/Pods-RNTesterUnitTests.debug.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -181,7 +181,7 @@ buildActionMask = 2147483647; files = ( E7DB213122B2C649005AC45F /* JavaScriptCore.framework in Frameworks */, - BE3BEE3556275C62F33864C8 /* libPods-RNTesterUnitTests.a in Frameworks */, + 70519E9C72DD9686A7312875 /* libPods-RNTesterUnitTests.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -191,7 +191,7 @@ files = ( E7DB218C22B41FCD005AC45F /* XCTest.framework in Frameworks */, E7DB216722B2F69F005AC45F /* JavaScriptCore.framework in Frameworks */, - 953D44E0A849F5064163EA24 /* libPods-RNTesterIntegrationTests.a in Frameworks */, + A0536204922D9D7266E4A473 /* libPods-RNTesterIntegrationTests.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -263,8 +263,8 @@ E7DB211A22B2BD53005AC45F /* libReact-RCTVibration.a */, E7DB212222B2BD53005AC45F /* libyoga.a */, 2F98312BF816A7F2688C036D /* libPods-RNTester.a */, - 4F4A7C4C85AB0198A25D51E4 /* libPods-RNTesterIntegrationTests.a */, - 6144DEEE56C6C17B301A90E4 /* libPods-RNTesterUnitTests.a */, + 721F6D6CDDF1D5BFE39D6B31 /* libPods-RNTesterIntegrationTests.a */, + 00ACC24C9F5DE409F79F5076 /* libPods-RNTesterUnitTests.a */, ); name = Frameworks; sourceTree = ""; @@ -306,10 +306,10 @@ children = ( 3CC2F16A3AEB8D7102722AD5 /* Pods-RNTester.debug.xcconfig */, 7FC437025B5EE3899315628B /* Pods-RNTester.release.xcconfig */, - 3485A25B916F57284634B78A /* Pods-RNTesterIntegrationTests.debug.xcconfig */, - BD6F35F6C79ACF7496CBC337 /* Pods-RNTesterIntegrationTests.release.xcconfig */, - C4CEC47A71A2AEE236833CDF /* Pods-RNTesterUnitTests.debug.xcconfig */, - B8219B8DAB1CDD38543E30A4 /* Pods-RNTesterUnitTests.release.xcconfig */, + E428CAB39DC86CBFF0440A00 /* Pods-RNTesterIntegrationTests.debug.xcconfig */, + B318F9F5046DB35BB33BE43D /* Pods-RNTesterIntegrationTests.release.xcconfig */, + EFA252CD309EE7BA385B69C9 /* Pods-RNTesterUnitTests.debug.xcconfig */, + 7BE36688335095B16916B436 /* Pods-RNTesterUnitTests.release.xcconfig */, ); path = Pods; sourceTree = ""; @@ -380,7 +380,6 @@ 13B07F8E1A680F5B00A75B9A /* Resources */, 68CD48B71D2BCB2C007E06A9 /* Build JS Bundle */, 79E8BE2B119D4C5CCD2F04B3 /* [RN] Copy Hermes Framework */, - 4E5A5A192F46F13B14A915AF /* [CP] Embed Pods Frameworks */, 4E2AB2EE08A8E6F86E659152 /* [CP] Copy Pods Resources */, ); buildRules = ( @@ -396,12 +395,11 @@ isa = PBXNativeTarget; buildConfigurationList = E7DB20A622B2BA84005AC45F /* Build configuration list for PBXNativeTarget "RNTesterUnitTests" */; buildPhases = ( - E13BEB5F9ED322B7AA8D6E0B /* [CP] Check Pods Manifest.lock */, + EC004E08B5B60A4A68A566EC /* [CP] Check Pods Manifest.lock */, E7DB209B22B2BA84005AC45F /* Sources */, E7DB209C22B2BA84005AC45F /* Frameworks */, E7DB209D22B2BA84005AC45F /* Resources */, - B0C098EC04B51698381E2BD5 /* [CP] Embed Pods Frameworks */, - 69760E095072DBD949449A0E /* [CP] Copy Pods Resources */, + E286229817FD55A0F7757C9B /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -417,12 +415,11 @@ isa = PBXNativeTarget; buildConfigurationList = E7DB215A22B2F332005AC45F /* Build configuration list for PBXNativeTarget "RNTesterIntegrationTests" */; buildPhases = ( - 2C3F1E01BF35036D970B313C /* [CP] Check Pods Manifest.lock */, + 42C67CA790EE3BED39E666AD /* [CP] Check Pods Manifest.lock */, E7DB214F22B2F332005AC45F /* Sources */, E7DB215022B2F332005AC45F /* Frameworks */, E7DB215122B2F332005AC45F /* Resources */, - 4FB5AB9168FB67DD59C380D8 /* [CP] Embed Pods Frameworks */, - 98FEA13D7CC9F0B84C9AFCC2 /* [CP] Copy Pods Resources */, + B1DB0DCD7041453F2E63B748 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -504,7 +501,7 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 2C3F1E01BF35036D970B313C /* [CP] Check Pods Manifest.lock */ = { + 3B2555DA1E9C50DBD7DEDDC7 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -519,14 +516,14 @@ outputFileListPaths = ( ); outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-RNTesterIntegrationTests-checkManifestLockResult.txt", + "$(DERIVED_FILE_DIR)/Pods-RNTester-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - 3B2555DA1E9C50DBD7DEDDC7 /* [CP] Check Pods Manifest.lock */ = { + 42C67CA790EE3BED39E666AD /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -541,7 +538,7 @@ outputFileListPaths = ( ); outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-RNTester-checkManifestLockResult.txt", + "$(DERIVED_FILE_DIR)/Pods-RNTesterIntegrationTests-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; @@ -565,40 +562,6 @@ shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-RNTester/Pods-RNTester-resources.sh\"\n"; showEnvVarsInLog = 0; }; - 4E5A5A192F46F13B14A915AF /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-RNTester/Pods-RNTester-frameworks-${CONFIGURATION}-input-files.xcfilelist", - ); - name = "[CP] Embed Pods Frameworks"; - outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-RNTester/Pods-RNTester-frameworks-${CONFIGURATION}-output-files.xcfilelist", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-RNTester/Pods-RNTester-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; - 4FB5AB9168FB67DD59C380D8 /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-RNTesterIntegrationTests/Pods-RNTesterIntegrationTests-frameworks-${CONFIGURATION}-input-files.xcfilelist", - ); - name = "[CP] Embed Pods Frameworks"; - outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-RNTesterIntegrationTests/Pods-RNTesterIntegrationTests-frameworks-${CONFIGURATION}-output-files.xcfilelist", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-RNTesterIntegrationTests/Pods-RNTesterIntegrationTests-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; 68CD48B71D2BCB2C007E06A9 /* Build JS Bundle */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -615,23 +578,6 @@ shellPath = /bin/sh; shellScript = "set -e\n\nexport PROJECT_ROOT=\"$SRCROOT\"\nexport ENTRY_FILE=\"$SRCROOT/js/RNTesterApp.ios.js\"\nexport SOURCEMAP_FILE=../sourcemap.ios.map\n# export FORCE_BUNDLING=true \n\nWITH_ENVIRONMENT=\"../react-native/scripts/xcode/with-environment.sh\"\nREACT_NATIVE_XCODE=\"../react-native/scripts/react-native-xcode.sh\"\n\n/bin/sh -c \"$WITH_ENVIRONMENT $REACT_NATIVE_XCODE\"\n"; }; - 69760E095072DBD949449A0E /* [CP] Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-RNTesterUnitTests/Pods-RNTesterUnitTests-resources-${CONFIGURATION}-input-files.xcfilelist", - ); - name = "[CP] Copy Pods Resources"; - outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-RNTesterUnitTests/Pods-RNTesterUnitTests-resources-${CONFIGURATION}-output-files.xcfilelist", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-RNTesterUnitTests/Pods-RNTesterUnitTests-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; 79E8BE2B119D4C5CCD2F04B3 /* [RN] Copy Hermes Framework */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -650,7 +596,7 @@ shellPath = /bin/sh; shellScript = ". ../react-native/sdks/hermes-engine/utils/copy-hermes-xcode.sh\n"; }; - 98FEA13D7CC9F0B84C9AFCC2 /* [CP] Copy Pods Resources */ = { + B1DB0DCD7041453F2E63B748 /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -667,24 +613,24 @@ shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-RNTesterIntegrationTests/Pods-RNTesterIntegrationTests-resources.sh\"\n"; showEnvVarsInLog = 0; }; - B0C098EC04B51698381E2BD5 /* [CP] Embed Pods Frameworks */ = { + E286229817FD55A0F7757C9B /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-RNTesterUnitTests/Pods-RNTesterUnitTests-frameworks-${CONFIGURATION}-input-files.xcfilelist", + "${PODS_ROOT}/Target Support Files/Pods-RNTesterUnitTests/Pods-RNTesterUnitTests-resources-${CONFIGURATION}-input-files.xcfilelist", ); - name = "[CP] Embed Pods Frameworks"; + name = "[CP] Copy Pods Resources"; outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-RNTesterUnitTests/Pods-RNTesterUnitTests-frameworks-${CONFIGURATION}-output-files.xcfilelist", + "${PODS_ROOT}/Target Support Files/Pods-RNTesterUnitTests/Pods-RNTesterUnitTests-resources-${CONFIGURATION}-output-files.xcfilelist", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-RNTesterUnitTests/Pods-RNTesterUnitTests-frameworks.sh\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-RNTesterUnitTests/Pods-RNTesterUnitTests-resources.sh\"\n"; showEnvVarsInLog = 0; }; - E13BEB5F9ED322B7AA8D6E0B /* [CP] Check Pods Manifest.lock */ = { + EC004E08B5B60A4A68A566EC /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -819,9 +765,12 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.meta.RNTester.localDevelopment; PRODUCT_NAME = RNTester; + SUPPORTED_PLATFORMS = "iphoneos iphonesimulator xros xrsimulator"; + SUPPORTS_MACCATALYST = NO; + SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; + TARGETED_DEVICE_FAMILY = "1,2,7"; }; name = Debug; }; @@ -858,8 +807,11 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.meta.RNTester.localDevelopment; PRODUCT_NAME = RNTester; + SUPPORTED_PLATFORMS = "iphoneos iphonesimulator xros xrsimulator"; + SUPPORTS_MACCATALYST = NO; + SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO; SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; + TARGETED_DEVICE_FAMILY = "1,2,7"; }; name = Release; }; @@ -1042,7 +994,7 @@ }; E7DB20A722B2BA84005AC45F /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = C4CEC47A71A2AEE236833CDF /* Pods-RNTesterUnitTests.debug.xcconfig */; + baseConfigurationReference = EFA252CD309EE7BA385B69C9 /* Pods-RNTesterUnitTests.debug.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; CLANG_ANALYZER_NONNULL = YES; @@ -1084,7 +1036,7 @@ }; E7DB20A822B2BA84005AC45F /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = B8219B8DAB1CDD38543E30A4 /* Pods-RNTesterUnitTests.release.xcconfig */; + baseConfigurationReference = 7BE36688335095B16916B436 /* Pods-RNTesterUnitTests.release.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; CLANG_ANALYZER_NONNULL = YES; @@ -1126,7 +1078,7 @@ }; E7DB215B22B2F332005AC45F /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 3485A25B916F57284634B78A /* Pods-RNTesterIntegrationTests.debug.xcconfig */; + baseConfigurationReference = E428CAB39DC86CBFF0440A00 /* Pods-RNTesterIntegrationTests.debug.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; BUNDLE_LOADER = "$(TEST_HOST)"; @@ -1169,7 +1121,7 @@ }; E7DB215C22B2F332005AC45F /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = BD6F35F6C79ACF7496CBC337 /* Pods-RNTesterIntegrationTests.release.xcconfig */; + baseConfigurationReference = B318F9F5046DB35BB33BE43D /* Pods-RNTesterIntegrationTests.release.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; BUNDLE_LOADER = "$(TEST_HOST)";