diff --git a/packages/react-native/Libraries/AppDelegate/RCTArchConfiguratorProtocol.h b/packages/react-native/Libraries/AppDelegate/RCTArchConfiguratorProtocol.h deleted file mode 100644 index ae3edcc7c14..00000000000 --- a/packages/react-native/Libraries/AppDelegate/RCTArchConfiguratorProtocol.h +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (c) Meta Platforms, Inc. and affiliates. - * - * This source code is licensed under the MIT license found in the - * LICENSE file in the root directory of this source tree. - */ - -#import -#import - -NS_ASSUME_NONNULL_BEGIN - -__attribute__((deprecated( - "RCTArchConfiguratorProtocol is deprecated and will be removed when we remove the legacy architecture."))); -@protocol RCTArchConfiguratorProtocol -/// This method controls whether the `turboModules` feature of the New Architecture is turned on or off. -/// -/// @note: This is required to be rendering on Fabric (i.e. on the New Architecture). -/// @return: `true` if the Turbo Native Module are enabled. Otherwise, it returns `false`. -- (BOOL)turboModuleEnabled __attribute__((deprecated("This will be removed in a future version of React Native"))); - -/// This method controls whether the App will use the Fabric renderer of the New Architecture or not. -/// -/// @return: `true` if the Fabric Renderer is enabled. Otherwise, it returns `false`. -- (BOOL)fabricEnabled __attribute__((deprecated("This will be removed in a future version of React Native"))); - -/// This method controls whether React Native's new initialization layer is enabled. -/// -/// @return: `true` if the new initialization layer is enabled. Otherwise returns `false`. -- (BOOL)bridgelessEnabled __attribute__((deprecated("This will be removed in a future version of React Native"))); - -/// This method controls whether React Native uses new Architecture. -/// -/// @return: `true` if the new architecture is enabled. Otherwise returns `false`. -- (BOOL)newArchEnabled __attribute__((deprecated("This will be removed in a future version of React Native"))); -@end - -NS_ASSUME_NONNULL_END diff --git a/packages/react-native/Libraries/AppDelegate/RCTReactNativeFactory.h b/packages/react-native/Libraries/AppDelegate/RCTReactNativeFactory.h index 07afa92fd50..be7bbe5efda 100644 --- a/packages/react-native/Libraries/AppDelegate/RCTReactNativeFactory.h +++ b/packages/react-native/Libraries/AppDelegate/RCTReactNativeFactory.h @@ -8,7 +8,6 @@ #import #import #import -#import "RCTArchConfiguratorProtocol.h" #import "RCTDependencyProvider.h" #import "RCTJSRuntimeConfiguratorProtocol.h" #import "RCTRootViewFactory.h" @@ -39,8 +38,7 @@ typedef NS_ENUM(NSInteger, RCTReleaseLevel) { Canary, Experimental, Stable }; RCTTurboModuleManagerDelegate, RCTComponentViewFactoryComponentProvider, #endif - RCTJSRuntimeConfiguratorProtocol, - RCTArchConfiguratorProtocol> + RCTJSRuntimeConfiguratorProtocol> /// Return the bundle URL for the main bundle. - (NSURL *__nullable)bundleURL; diff --git a/packages/react-native/Libraries/AppDelegate/RCTReactNativeFactory.mm b/packages/react-native/Libraries/AppDelegate/RCTReactNativeFactory.mm index a537ca15fd3..5ceb3a72fad 100644 --- a/packages/react-native/Libraries/AppDelegate/RCTReactNativeFactory.mm +++ b/packages/react-native/Libraries/AppDelegate/RCTReactNativeFactory.mm @@ -132,28 +132,6 @@ - (JSRuntimeFactoryRef)createJSRuntimeFactory return [_delegate createJSRuntimeFactory]; } -#pragma mark - RCTArchConfiguratorProtocol - -- (BOOL)newArchEnabled -{ - return YES; -} - -- (BOOL)fabricEnabled -{ - return YES; -} - -- (BOOL)turboModuleEnabled -{ - return YES; -} - -- (BOOL)bridgelessEnabled -{ - return YES; -} - #pragma mark - RCTTurboModuleManagerDelegate - (Class)getModuleClassFromName:(const char *)name diff --git a/packages/react-native/scripts/ios-prebuild/templates/React_RCTAppDelegate-umbrella.h b/packages/react-native/scripts/ios-prebuild/templates/React_RCTAppDelegate-umbrella.h index 1451e483dcb..78627a9e256 100644 --- a/packages/react-native/scripts/ios-prebuild/templates/React_RCTAppDelegate-umbrella.h +++ b/packages/react-native/scripts/ios-prebuild/templates/React_RCTAppDelegate-umbrella.h @@ -19,7 +19,6 @@ #import "RCTAppDelegate.h" #import "RCTAppSetupUtils.h" -#import "RCTArchConfiguratorProtocol.h" #import "RCTDefaultReactNativeFactoryDelegate.h" #import "RCTDependencyProvider.h" #import "RCTJSRuntimeConfiguratorProtocol.h" diff --git a/packages/rn-tester/RNTester/AppDelegate.mm b/packages/rn-tester/RNTester/AppDelegate.mm index 22166bba864..3f1ea7209ba 100644 --- a/packages/rn-tester/RNTester/AppDelegate.mm +++ b/packages/rn-tester/RNTester/AppDelegate.mm @@ -159,13 +159,6 @@ - (void)userNotificationCenter:(UNUserNotificationCenter *)center } #endif -#pragma mark - New Arch Enabled settings - -- (BOOL)bridgelessEnabled -{ - return YES; -} - #pragma mark - RCTComponentViewFactoryComponentProvider #ifndef RN_DISABLE_OSS_PLUGIN_HEADER diff --git a/scripts/cxx-api/api-snapshots/ReactAppleDebugCxx.api b/scripts/cxx-api/api-snapshots/ReactAppleDebugCxx.api index b687cb8ed55..132a46cfa2c 100644 --- a/scripts/cxx-api/api-snapshots/ReactAppleDebugCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactAppleDebugCxx.api @@ -2608,13 +2608,6 @@ protocol RCTAnimationDriver : public NSObject { public virtual void stopAnimation(); } -protocol RCTArchConfiguratorProtocol { - public virtual BOOL bridgelessEnabled(); - public virtual BOOL fabricEnabled(); - public virtual BOOL newArchEnabled(); - public virtual BOOL turboModuleEnabled(); -} - protocol RCTAutoInsetsProtocol { public @property (assign) BOOL automaticallyAdjustContentInsets; public @property (assign) UIEdgeInsets contentInset; @@ -2985,7 +2978,7 @@ protocol RCTPullToRefreshViewViewProtocol : public NSObject { public virtual void setNativeRefreshing:(BOOL refreshing); } -protocol RCTReactNativeFactoryDelegate : public RCTBridgeDelegate, public RCTUIConfiguratorProtocol, public RCTHostDelegate, public RCTTurboModuleManagerDelegate, public RCTComponentViewFactoryComponentProvider, public RCTJSRuntimeConfiguratorProtocol, public RCTArchConfiguratorProtocol { +protocol RCTReactNativeFactoryDelegate : public RCTBridgeDelegate, public RCTUIConfiguratorProtocol, public RCTHostDelegate, public RCTTurboModuleManagerDelegate, public RCTComponentViewFactoryComponentProvider, public RCTJSRuntimeConfiguratorProtocol { public @property (strong) id dependencyProvider; public virtual NSDictionary>* thirdPartyFabricComponents(); public virtual NSURL* _Nullable bundleURL(); diff --git a/scripts/cxx-api/api-snapshots/ReactAppleNewarchCxx.api b/scripts/cxx-api/api-snapshots/ReactAppleNewarchCxx.api index c0dd7c1584c..a4d4f090136 100644 --- a/scripts/cxx-api/api-snapshots/ReactAppleNewarchCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactAppleNewarchCxx.api @@ -2596,13 +2596,6 @@ protocol RCTAnimationDriver : public NSObject { public virtual void stopAnimation(); } -protocol RCTArchConfiguratorProtocol { - public virtual BOOL bridgelessEnabled(); - public virtual BOOL fabricEnabled(); - public virtual BOOL newArchEnabled(); - public virtual BOOL turboModuleEnabled(); -} - protocol RCTAutoInsetsProtocol { public @property (assign) BOOL automaticallyAdjustContentInsets; public @property (assign) UIEdgeInsets contentInset; @@ -2972,7 +2965,7 @@ protocol RCTPullToRefreshViewViewProtocol : public NSObject { public virtual void setNativeRefreshing:(BOOL refreshing); } -protocol RCTReactNativeFactoryDelegate : public RCTBridgeDelegate, public RCTUIConfiguratorProtocol, public RCTHostDelegate, public RCTTurboModuleManagerDelegate, public RCTComponentViewFactoryComponentProvider, public RCTJSRuntimeConfiguratorProtocol, public RCTArchConfiguratorProtocol { +protocol RCTReactNativeFactoryDelegate : public RCTBridgeDelegate, public RCTUIConfiguratorProtocol, public RCTHostDelegate, public RCTTurboModuleManagerDelegate, public RCTComponentViewFactoryComponentProvider, public RCTJSRuntimeConfiguratorProtocol { public @property (strong) id dependencyProvider; public virtual NSDictionary>* thirdPartyFabricComponents(); public virtual NSURL* _Nullable bundleURL(); diff --git a/scripts/cxx-api/api-snapshots/ReactAppleReleaseCxx.api b/scripts/cxx-api/api-snapshots/ReactAppleReleaseCxx.api index 1a2f6c30e46..dcedfbd1ee2 100644 --- a/scripts/cxx-api/api-snapshots/ReactAppleReleaseCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactAppleReleaseCxx.api @@ -2608,13 +2608,6 @@ protocol RCTAnimationDriver : public NSObject { public virtual void stopAnimation(); } -protocol RCTArchConfiguratorProtocol { - public virtual BOOL bridgelessEnabled(); - public virtual BOOL fabricEnabled(); - public virtual BOOL newArchEnabled(); - public virtual BOOL turboModuleEnabled(); -} - protocol RCTAutoInsetsProtocol { public @property (assign) BOOL automaticallyAdjustContentInsets; public @property (assign) UIEdgeInsets contentInset; @@ -2985,7 +2978,7 @@ protocol RCTPullToRefreshViewViewProtocol : public NSObject { public virtual void setNativeRefreshing:(BOOL refreshing); } -protocol RCTReactNativeFactoryDelegate : public RCTBridgeDelegate, public RCTUIConfiguratorProtocol, public RCTHostDelegate, public RCTTurboModuleManagerDelegate, public RCTComponentViewFactoryComponentProvider, public RCTJSRuntimeConfiguratorProtocol, public RCTArchConfiguratorProtocol { +protocol RCTReactNativeFactoryDelegate : public RCTBridgeDelegate, public RCTUIConfiguratorProtocol, public RCTHostDelegate, public RCTTurboModuleManagerDelegate, public RCTComponentViewFactoryComponentProvider, public RCTJSRuntimeConfiguratorProtocol { public @property (strong) id dependencyProvider; public virtual NSDictionary>* thirdPartyFabricComponents(); public virtual NSURL* _Nullable bundleURL();