Move .m to .mm to make obj-c and C++ headers compatible (#38135)

Summary: Pull Request resolved: #38135 Changelog: [iOS][Changed] - Move .m to .mm to make obj-c and C++ headers compatible Reviewed By: RSNara Differential Revision: D47140743 fbshipit-source-id: 1f1fb24571f5154b17992d6a71587803407b9dd1
facebook · Jul 24, 2023 · 42d6745 · 42d6745
1 parent b06c2d7
commit 42d6745
Show file tree

Hide file tree

Showing 79 changed files with 187 additions and 72 deletions.
diff --git a/packages/react-native/Libraries/AppDelegate/RCTAppDelegate.h b/packages/react-native/Libraries/AppDelegate/RCTAppDelegate.h
@@ -5,10 +5,10 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#import <React/RCTBridge.h>
-#import <React/RCTBridgeDelegate.h>
 #import <UIKit/UIKit.h>
 
+@class RCTBridge;
+@protocol RCTBridgeDelegate;
 @protocol RCTComponentViewProtocol;
 @class RCTSurfacePresenterBridgeAdapter;
 

diff --git a/packages/react-native/Libraries/AppDelegate/React-RCTAppDelegate.podspec b/packages/react-native/Libraries/AppDelegate/React-RCTAppDelegate.podspec
@@ -88,7 +88,9 @@ Pod::Spec.new do |s|
 
   if is_new_arch_enabled
     s.dependency "React-BridgelessCore"
-    s.dependency "React-BridgelessHermes"
+    if ENV['USE_HERMES'] == nil || ENV['USE_HERMES'] == "1"
+      s.dependency "React-BridgelessHermes"
+    end
     s.dependency "React-BridgelessApple"
   end
 

diff --git a/...native/Libraries/Image/RCTAnimatedImage.m → ...ative/Libraries/Image/RCTAnimatedImage.mm b/...native/Libraries/Image/RCTAnimatedImage.m → ...ative/Libraries/Image/RCTAnimatedImage.mm
diff --git a/...braries/Image/RCTDisplayWeakRefreshable.m → ...raries/Image/RCTDisplayWeakRefreshable.mm b/...braries/Image/RCTDisplayWeakRefreshable.m → ...raries/Image/RCTDisplayWeakRefreshable.mm
diff --git a/...ative/Libraries/Image/RCTImageBlurUtils.m → ...tive/Libraries/Image/RCTImageBlurUtils.mm b/...ative/Libraries/Image/RCTImageBlurUtils.m → ...tive/Libraries/Image/RCTImageBlurUtils.mm
diff --git a/...ct-native/Libraries/Image/RCTImageCache.m → ...t-native/Libraries/Image/RCTImageCache.mm b/...ct-native/Libraries/Image/RCTImageCache.m → ...t-native/Libraries/Image/RCTImageCache.mm
diff --git a/...tive/Libraries/Image/RCTImageShadowView.m → ...ive/Libraries/Image/RCTImageShadowView.mm b/...tive/Libraries/Image/RCTImageShadowView.m → ...ive/Libraries/Image/RCTImageShadowView.mm
diff --git a/...ct-native/Libraries/Image/RCTImageUtils.m → ...t-native/Libraries/Image/RCTImageUtils.mm b/...ct-native/Libraries/Image/RCTImageUtils.m → ...t-native/Libraries/Image/RCTImageUtils.mm
@@ -212,7 +212,7 @@ BOOL RCTUpscalingRequired(
 
   // Calculate aspect ratios if needed (don't bother if resizeMode == stretch)
   CGFloat aspect = 0.0, targetAspect = 0.0;
-  if (resizeMode != UIViewContentModeScaleToFill) {
+  if (resizeMode != RCTResizeModeStretch) {
     aspect = sourceSize.width / sourceSize.height;
     targetAspect = destSize.width / destSize.height;
     if (aspect == targetAspect) {
@@ -267,8 +267,8 @@ BOOL RCTUpscalingRequired(
     CFRelease(sourceRef);
     return nil;
   }
-  NSNumber *width = CFDictionaryGetValue(imageProperties, kCGImagePropertyPixelWidth);
-  NSNumber *height = CFDictionaryGetValue(imageProperties, kCGImagePropertyPixelHeight);
+  NSNumber *width = (NSNumber *)CFDictionaryGetValue(imageProperties, kCGImagePropertyPixelWidth);
+  NSNumber *height = (NSNumber *)CFDictionaryGetValue(imageProperties, kCGImagePropertyPixelHeight);
   CGSize sourceSize = {width.doubleValue, height.doubleValue};
   CFRelease(imageProperties);
 
@@ -281,7 +281,7 @@ BOOL RCTUpscalingRequired(
     destScale = RCTScreenScale();
   }
 
-  if (resizeMode == UIViewContentModeScaleToFill) {
+  if (resizeMode == RCTResizeModeStretch) {
     // Decoder cannot change aspect ratio, so RCTResizeModeStretch is equivalent
     // to RCTResizeModeCover for our purposes
     resizeMode = RCTResizeModeCover;

diff --git a/...ct-native/Libraries/Image/RCTResizeMode.m → ...t-native/Libraries/Image/RCTResizeMode.mm b/...ct-native/Libraries/Image/RCTResizeMode.m → ...t-native/Libraries/Image/RCTResizeMode.mm
diff --git a/.../Libraries/Image/RCTUIImageViewAnimated.m → ...Libraries/Image/RCTUIImageViewAnimated.mm b/.../Libraries/Image/RCTUIImageViewAnimated.m → ...Libraries/Image/RCTUIImageViewAnimated.mm
diff --git a/packages/react-native/Libraries/Image/React-RCTImage.podspec b/packages/react-native/Libraries/Image/React-RCTImage.podspec
@@ -51,6 +51,7 @@ Pod::Spec.new do |s|
                                "CLANG_CXX_LANGUAGE_STANDARD" => "c++17",
                                "HEADER_SEARCH_PATHS" => header_search_paths.join(' ')
                              }
+  s.framework              = ["Accelerate", "UIKit"]
 
   s.dependency "RCT-Folly", folly_version
   s.dependency "React-Codegen", version

diff --git a/...tiveAnimation/Drivers/RCTDecayAnimation.m → ...iveAnimation/Drivers/RCTDecayAnimation.mm b/...tiveAnimation/Drivers/RCTDecayAnimation.m → ...iveAnimation/Drivers/RCTDecayAnimation.mm
diff --git a/...tiveAnimation/Drivers/RCTEventAnimation.m → ...iveAnimation/Drivers/RCTEventAnimation.mm b/...tiveAnimation/Drivers/RCTEventAnimation.m → ...iveAnimation/Drivers/RCTEventAnimation.mm
diff --git a/...tiveAnimation/Drivers/RCTFrameAnimation.m → ...iveAnimation/Drivers/RCTFrameAnimation.mm b/...tiveAnimation/Drivers/RCTFrameAnimation.m → ...iveAnimation/Drivers/RCTFrameAnimation.mm
diff --git a/...iveAnimation/Drivers/RCTSpringAnimation.m → ...veAnimation/Drivers/RCTSpringAnimation.mm b/...iveAnimation/Drivers/RCTSpringAnimation.m → ...veAnimation/Drivers/RCTSpringAnimation.mm
diff --git a/...Animation/Nodes/RCTAdditionAnimatedNode.m → ...nimation/Nodes/RCTAdditionAnimatedNode.mm b/...Animation/Nodes/RCTAdditionAnimatedNode.m → ...nimation/Nodes/RCTAdditionAnimatedNode.mm
diff --git a/...s/NativeAnimation/Nodes/RCTAnimatedNode.m → .../NativeAnimation/Nodes/RCTAnimatedNode.mm b/...s/NativeAnimation/Nodes/RCTAnimatedNode.m → .../NativeAnimation/Nodes/RCTAnimatedNode.mm
diff --git a/...iveAnimation/Nodes/RCTColorAnimatedNode.m → ...veAnimation/Nodes/RCTColorAnimatedNode.mm b/...iveAnimation/Nodes/RCTColorAnimatedNode.m → ...veAnimation/Nodes/RCTColorAnimatedNode.mm
diff --git a/...nimation/Nodes/RCTDiffClampAnimatedNode.m → ...imation/Nodes/RCTDiffClampAnimatedNode.mm b/...nimation/Nodes/RCTDiffClampAnimatedNode.m → ...imation/Nodes/RCTDiffClampAnimatedNode.mm
diff --git a/...Animation/Nodes/RCTDivisionAnimatedNode.m → ...nimation/Nodes/RCTDivisionAnimatedNode.mm b/...Animation/Nodes/RCTDivisionAnimatedNode.m → ...nimation/Nodes/RCTDivisionAnimatedNode.mm
diff --git a/packages/react-native/Libraries/NativeAnimation/Nodes/RCTInterpolationAnimatedNode.h b/packages/react-native/Libraries/NativeAnimation/Nodes/RCTInterpolationAnimatedNode.h
@@ -14,7 +14,7 @@ NS_ASSUME_NONNULL_BEGIN
 RCT_EXTERN NSString *RCTInterpolateString(
     NSString *pattern,
     CGFloat inputValue,
-    NSArray *inputRange,
+    NSArray<NSNumber *> *inputRange,
     NSArray<NSArray<NSNumber *> *> *outputRange,
     NSString *extrapolateLeft,
     NSString *extrapolateRight);

diff --git a/...tion/Nodes/RCTInterpolationAnimatedNode.m → ...ion/Nodes/RCTInterpolationAnimatedNode.mm b/...tion/Nodes/RCTInterpolationAnimatedNode.m → ...ion/Nodes/RCTInterpolationAnimatedNode.mm
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#import <React/RCTInterpolationAnimatedNode.h>
+#import "RCTInterpolationAnimatedNode.h"
 
 #import <React/RCTAnimationUtils.h>
 #import <React/RCTConvert.h>

diff --git a/...veAnimation/Nodes/RCTModuloAnimatedNode.m → ...eAnimation/Nodes/RCTModuloAnimatedNode.mm b/...veAnimation/Nodes/RCTModuloAnimatedNode.m → ...eAnimation/Nodes/RCTModuloAnimatedNode.mm
diff --git a/...ion/Nodes/RCTMultiplicationAnimatedNode.m → ...on/Nodes/RCTMultiplicationAnimatedNode.mm b/...ion/Nodes/RCTMultiplicationAnimatedNode.m → ...on/Nodes/RCTMultiplicationAnimatedNode.mm
diff --git a/...veAnimation/Nodes/RCTObjectAnimatedNode.m → ...eAnimation/Nodes/RCTObjectAnimatedNode.mm b/...veAnimation/Nodes/RCTObjectAnimatedNode.m → ...eAnimation/Nodes/RCTObjectAnimatedNode.mm
diff --git a/...iveAnimation/Nodes/RCTPropsAnimatedNode.m → ...veAnimation/Nodes/RCTPropsAnimatedNode.mm b/...iveAnimation/Nodes/RCTPropsAnimatedNode.m → ...veAnimation/Nodes/RCTPropsAnimatedNode.mm
diff --git a/...iveAnimation/Nodes/RCTStyleAnimatedNode.m → ...veAnimation/Nodes/RCTStyleAnimatedNode.mm b/...iveAnimation/Nodes/RCTStyleAnimatedNode.m → ...veAnimation/Nodes/RCTStyleAnimatedNode.mm
diff --git a/...mation/Nodes/RCTSubtractionAnimatedNode.m → ...ation/Nodes/RCTSubtractionAnimatedNode.mm b/...mation/Nodes/RCTSubtractionAnimatedNode.m → ...ation/Nodes/RCTSubtractionAnimatedNode.mm
diff --git a/...Animation/Nodes/RCTTrackingAnimatedNode.m → ...nimation/Nodes/RCTTrackingAnimatedNode.mm b/...Animation/Nodes/RCTTrackingAnimatedNode.m → ...nimation/Nodes/RCTTrackingAnimatedNode.mm
diff --git a/...nimation/Nodes/RCTTransformAnimatedNode.m → ...imation/Nodes/RCTTransformAnimatedNode.mm b/...nimation/Nodes/RCTTransformAnimatedNode.m → ...imation/Nodes/RCTTransformAnimatedNode.mm
diff --git a/...iveAnimation/Nodes/RCTValueAnimatedNode.m → ...veAnimation/Nodes/RCTValueAnimatedNode.mm b/...iveAnimation/Nodes/RCTValueAnimatedNode.m → ...veAnimation/Nodes/RCTValueAnimatedNode.mm
diff --git a/...aries/NativeAnimation/RCTAnimationUtils.m → ...ries/NativeAnimation/RCTAnimationUtils.mm b/...aries/NativeAnimation/RCTAnimationUtils.m → ...ries/NativeAnimation/RCTAnimationUtils.mm
@@ -110,7 +110,7 @@ uint32_t RCTColorFromComponents(CGFloat red, CGFloat green, CGFloat blue, CGFloa
 
 #if TARGET_IPHONE_SIMULATOR
 // Based on https://stackoverflow.com/a/13307674
-float UIAnimationDragCoefficient(void);
+UIKIT_EXTERN float UIAnimationDragCoefficient(void);
 #endif
 
 CGFloat RCTAnimationDragCoefficient(void)

diff --git a/...Animation/RCTNativeAnimatedNodesManager.m → ...nimation/RCTNativeAnimatedNodesManager.mm b/...Animation/RCTNativeAnimatedNodesManager.m → ...nimation/RCTNativeAnimatedNodesManager.mm
diff --git a/...ies/Text/BaseText/RCTBaseTextShadowView.m → ...es/Text/BaseText/RCTBaseTextShadowView.mm b/...ies/Text/BaseText/RCTBaseTextShadowView.m → ...es/Text/BaseText/RCTBaseTextShadowView.mm
diff --git a/...es/Text/BaseText/RCTBaseTextViewManager.m → ...s/Text/BaseText/RCTBaseTextViewManager.mm b/...es/Text/BaseText/RCTBaseTextViewManager.m → ...s/Text/BaseText/RCTBaseTextViewManager.mm
diff --git a/...t-native/Libraries/Text/RCTConvert+Text.m → ...-native/Libraries/Text/RCTConvert+Text.mm b/...t-native/Libraries/Text/RCTConvert+Text.m → ...-native/Libraries/Text/RCTConvert+Text.mm
diff --git a/...native/Libraries/Text/RCTTextAttributes.m → ...ative/Libraries/Text/RCTTextAttributes.mm b/...native/Libraries/Text/RCTTextAttributes.m → ...ative/Libraries/Text/RCTTextAttributes.mm
diff --git a/...aries/Text/RawText/RCTRawTextShadowView.m → ...ries/Text/RawText/RCTRawTextShadowView.mm b/...aries/Text/RawText/RCTRawTextShadowView.m → ...ries/Text/RawText/RCTRawTextShadowView.mm
diff --git a/...ries/Text/RawText/RCTRawTextViewManager.m → ...ies/Text/RawText/RCTRawTextViewManager.mm b/...ries/Text/RawText/RCTRawTextViewManager.m → ...ies/Text/RawText/RCTRawTextViewManager.mm
diff --git a/packages/react-native/Libraries/Text/React-RCTText.podspec b/packages/react-native/Libraries/Text/React-RCTText.podspec
@@ -26,9 +26,11 @@ Pod::Spec.new do |s|
   s.author                 = "Meta Platforms, Inc. and its affiliates"
   s.platforms              = { :ios => min_ios_version_supported }
   s.source                 = source
-  s.source_files           = "**/*.{h,m}"
+  s.source_files           = "**/*.{h,m,mm}"
   s.preserve_paths         = "package.json", "LICENSE", "LICENSE-docs"
   s.header_dir             = "RCTText"
+  s.framework              = ["MobileCoreServices"]
 
+  s.dependency "Yoga"
   s.dependency "React-Core/RCTTextHeaders", version
 end
diff --git a/.../Libraries/Text/Text/RCTDynamicTypeRamp.m → ...Libraries/Text/Text/RCTDynamicTypeRamp.mm b/.../Libraries/Text/Text/RCTDynamicTypeRamp.m → ...Libraries/Text/Text/RCTDynamicTypeRamp.mm
diff --git a/...e/Libraries/Text/Text/RCTTextShadowView.m → .../Libraries/Text/Text/RCTTextShadowView.mm b/...e/Libraries/Text/Text/RCTTextShadowView.m → .../Libraries/Text/Text/RCTTextShadowView.mm
diff --git a/...-native/Libraries/Text/Text/RCTTextView.m → ...native/Libraries/Text/Text/RCTTextView.mm b/...-native/Libraries/Text/Text/RCTTextView.m → ...native/Libraries/Text/Text/RCTTextView.mm
diff --git a/.../Libraries/Text/Text/RCTTextViewManager.m → ...Libraries/Text/Text/RCTTextViewManager.mm b/.../Libraries/Text/Text/RCTTextViewManager.m → ...Libraries/Text/Text/RCTTextViewManager.mm
diff --git a/...put/Multiline/RCTMultilineTextInputView.m → ...ut/Multiline/RCTMultilineTextInputView.mm b/...put/Multiline/RCTMultilineTextInputView.m → ...ut/Multiline/RCTMultilineTextInputView.mm
diff --git a/...tiline/RCTMultilineTextInputViewManager.m → ...iline/RCTMultilineTextInputViewManager.mm b/...tiline/RCTMultilineTextInputViewManager.m → ...iline/RCTMultilineTextInputViewManager.mm
diff --git a/.../Text/TextInput/Multiline/RCTUITextView.m → ...Text/TextInput/Multiline/RCTUITextView.mm b/.../Text/TextInput/Multiline/RCTUITextView.m → ...Text/TextInput/Multiline/RCTUITextView.mm
diff --git a/...Input/RCTBackedTextInputDelegateAdapter.m → ...nput/RCTBackedTextInputDelegateAdapter.mm b/...Input/RCTBackedTextInputDelegateAdapter.m → ...nput/RCTBackedTextInputDelegateAdapter.mm
diff --git a/...xt/TextInput/RCTBaseTextInputShadowView.m → ...t/TextInput/RCTBaseTextInputShadowView.mm b/...xt/TextInput/RCTBaseTextInputShadowView.m → ...t/TextInput/RCTBaseTextInputShadowView.mm
diff --git a/...ies/Text/TextInput/RCTBaseTextInputView.m → ...es/Text/TextInput/RCTBaseTextInputView.mm b/...ies/Text/TextInput/RCTBaseTextInputView.m → ...es/Text/TextInput/RCTBaseTextInputView.mm
diff --git a/...t/TextInput/RCTBaseTextInputViewManager.m → .../TextInput/RCTBaseTextInputViewManager.mm b/...t/TextInput/RCTBaseTextInputViewManager.m → .../TextInput/RCTBaseTextInputViewManager.mm
diff --git a/...t/TextInput/RCTInputAccessoryShadowView.m → .../TextInput/RCTInputAccessoryShadowView.mm b/...t/TextInput/RCTInputAccessoryShadowView.m → .../TextInput/RCTInputAccessoryShadowView.mm
@@ -14,7 +14,7 @@ @implementation RCTInputAccessoryShadowView
 - (void)insertReactSubview:(RCTShadowView *)subview atIndex:(NSInteger)atIndex
 {
   [super insertReactSubview:subview atIndex:atIndex];
-  subview.width = (YGValue){RCTScreenSize().width, YGUnitPoint};
+  subview.width = (YGValue){static_cast<float>(RCTScreenSize().width), YGUnitPoint};
 }
 
 @end
diff --git a/...es/Text/TextInput/RCTInputAccessoryView.m → ...s/Text/TextInput/RCTInputAccessoryView.mm b/...es/Text/TextInput/RCTInputAccessoryView.m → ...s/Text/TextInput/RCTInputAccessoryView.mm
diff --git a/.../TextInput/RCTInputAccessoryViewContent.m → ...TextInput/RCTInputAccessoryViewContent.mm b/.../TextInput/RCTInputAccessoryViewContent.m → ...TextInput/RCTInputAccessoryViewContent.mm
diff --git a/.../TextInput/RCTInputAccessoryViewManager.m → ...TextInput/RCTInputAccessoryViewManager.mm b/.../TextInput/RCTInputAccessoryViewManager.m → ...TextInput/RCTInputAccessoryViewManager.mm
diff --git a/...braries/Text/TextInput/RCTTextSelection.m → ...raries/Text/TextInput/RCTTextSelection.mm b/...braries/Text/TextInput/RCTTextSelection.m → ...raries/Text/TextInput/RCTTextSelection.mm
diff --git a/...t/Singleline/RCTSinglelineTextInputView.m → .../Singleline/RCTSinglelineTextInputView.mm b/...t/Singleline/RCTSinglelineTextInputView.m → .../Singleline/RCTSinglelineTextInputView.mm
diff --git a/...eline/RCTSinglelineTextInputViewManager.m → ...line/RCTSinglelineTextInputViewManager.mm b/...eline/RCTSinglelineTextInputViewManager.m → ...line/RCTSinglelineTextInputViewManager.mm
diff --git a/...ext/TextInput/Singleline/RCTUITextField.m → ...xt/TextInput/Singleline/RCTUITextField.mm b/...ext/TextInput/Singleline/RCTUITextField.m → ...xt/TextInput/Singleline/RCTUITextField.mm
diff --git a/...xt/VirtualText/RCTVirtualTextShadowView.m → ...t/VirtualText/RCTVirtualTextShadowView.mm b/...xt/VirtualText/RCTVirtualTextShadowView.m → ...t/VirtualText/RCTVirtualTextShadowView.mm
diff --git a/...ies/Text/VirtualText/RCTVirtualTextView.m → ...es/Text/VirtualText/RCTVirtualTextView.mm b/...ies/Text/VirtualText/RCTVirtualTextView.m → ...es/Text/VirtualText/RCTVirtualTextView.mm
diff --git a/...t/VirtualText/RCTVirtualTextViewManager.m → .../VirtualText/RCTVirtualTextViewManager.mm b/...t/VirtualText/RCTVirtualTextViewManager.m → .../VirtualText/RCTVirtualTextViewManager.mm
diff --git a/packages/react-native/React-Core.podspec b/packages/react-native/React-Core.podspec
@@ -91,15 +91,15 @@ Pod::Spec.new do |s|
       "React/Fabric/**/*",
       "React/FBReactNativeSpec/**/*",
       "React/Tests/**/*",
-      "React/Inspector/**/*"
+      "React/Inspector/**/*",
     ]
     # If we are using Hermes (the default is use hermes, so USE_HERMES can be nil), we don't have jsc installed
     # So we have to exclude the JSCExecutorFactory
     if ENV['USE_HERMES'] == nil || ENV['USE_HERMES'] == "1"
       exclude_files = exclude_files.append("React/CxxBridge/JSCExecutorFactory.{h,mm}")
     end
     ss.exclude_files = exclude_files
-    ss.private_header_files   = "React/Cxx*/*.h"
+    ss.private_header_files   = "React/CxxLogUtils/*.h"
   end
 
   s.subspec "DevSupport" do |ss|

diff --git a/packages/react-native/React/Base/RCTBridge.m → ...ages/react-native/React/Base/RCTBridge.mm b/packages/react-native/React/Base/RCTBridge.m → ...ages/react-native/React/Base/RCTBridge.mm
diff --git a/...ve/React/CoreModules/RCTAlertController.m → ...e/React/CoreModules/RCTAlertController.mm b/...ve/React/CoreModules/RCTAlertController.m → ...e/React/CoreModules/RCTAlertController.mm
@@ -43,8 +43,9 @@ - (UIWindow *)alertWindow
 
 - (void)show:(BOOL)animated completion:(void (^)(void))completion
 {
-  UIUserInterfaceStyle style =
-      RCTSharedApplication().delegate.window.overrideUserInterfaceStyle ?: UIUserInterfaceStyleUnspecified;
+  UIUserInterfaceStyle style = RCTSharedApplication().delegate.window.overrideUserInterfaceStyle
+      ? RCTSharedApplication().delegate.window.overrideUserInterfaceStyle
+      : UIUserInterfaceStyleUnspecified;
   self.overrideUserInterfaceStyle = style;
 
   [self.alertWindow makeKeyAndVisible];

diff --git a/...ct-native/React/CoreModules/RCTFPSGraph.m → ...t-native/React/CoreModules/RCTFPSGraph.mm b/...ct-native/React/CoreModules/RCTFPSGraph.m → ...t-native/React/CoreModules/RCTFPSGraph.mm
@@ -45,7 +45,7 @@ - (instancetype)initWithFrame:(CGRect)frame color:(UIColor *)color
     _length = (NSUInteger)floor(frame.size.width);
     _height = (NSUInteger)floor(frame.size.height);
     _scale = 60.0 / (CGFloat)_height;
-    _frames = calloc(sizeof(CGFloat), _length);
+    _frames = (CGFloat *)calloc(sizeof(CGFloat), _length);
     _color = color;
 
     [self.layer addSublayer:self.graph];

diff --git a/packages/react-native/React/CoreModules/React-CoreModules.podspec b/packages/react-native/React/CoreModules/React-CoreModules.podspec
@@ -49,7 +49,7 @@ Pod::Spec.new do |s|
                                "CLANG_CXX_LANGUAGE_STANDARD" => "c++17",
                                "HEADER_SEARCH_PATHS" => header_search_paths.join(" ")
                              }
-
+  s.framework = "UIKit"
   s.dependency "React-Codegen", version
   s.dependency "RCT-Folly", folly_version
   s.dependency "RCTTypeSafety", version

diff --git a/packages/react-native/ReactCommon/react/bridgeless/React-BridgelessApple.podspec b/packages/react-native/ReactCommon/react/bridgeless/React-BridgelessApple.podspec
@@ -55,13 +55,14 @@ Pod::Spec.new do |s|
   s.dependency "React-NativeModulesApple"
   s.dependency "React-RCTFabric"
   s.dependency "React-BridgelessCore"
-  s.dependency "React-BridgelessHermes"
   s.dependency "React-Mapbuffer"
   s.dependency "React-jserrorhandler"
 
   if ENV["USE_HERMES"] == nil || ENV["USE_HERMES"] == "1"
     s.dependency "hermes-engine"
+    s.dependency "React-BridgelessHermes"
   else
-    s.dependency "React-jsi"
+    s.exclude_files = "platform/ios/Hermes/*.{mm,h}"
+    s.dependency "React-jsc"
   end
 end
diff --git a/packages/react-native/ReactCommon/react/bridgeless/React-BridgelessCore.podspec b/packages/react-native/ReactCommon/react/bridgeless/React-BridgelessCore.podspec
@@ -56,7 +56,7 @@ Pod::Spec.new do |s|
   if ENV["USE_HERMES"] == nil || ENV["USE_HERMES"] == "1"
     s.dependency "hermes-engine"
   else
-    s.dependency "React-jsi"
+    s.dependency "React-jsc"
   end
 
 end
diff --git a/packages/react-native/ReactCommon/react/bridgeless/React-BridgelessHermes.podspec b/packages/react-native/ReactCommon/react/bridgeless/React-BridgelessHermes.podspec
@@ -51,6 +51,6 @@ Pod::Spec.new do |s|
   if ENV["USE_HERMES"] == nil || ENV["USE_HERMES"] == "1"
     s.dependency "hermes-engine"
   else
-    s.dependency "React-jsi"
+    s.dependency "React-jsc"
   end
 end
diff --git a/packages/react-native/ReactCommon/react/bridgeless/platform/ios/Core/RCTInstance.mm b/packages/react-native/ReactCommon/react/bridgeless/platform/ios/Core/RCTInstance.mm
@@ -28,7 +28,6 @@
 #import <React/RCTModuleData.h>
 #import <React/RCTPerformanceLogger.h>
 #import <React/RCTSurfacePresenter.h>
-#import <ReactCommon/RCTLegacyUIManagerConstantsProvider.h>
 #import <ReactCommon/RCTTurboModuleManager.h>
 #import <ReactCommon/RuntimeExecutor.h>
 #import <cxxreact/ReactMarker.h>

diff --git a/packages/react-native/ReactCommon/react/renderer/mapbuffer/MapBufferBuilder.h b/packages/react-native/ReactCommon/react/renderer/mapbuffer/MapBufferBuilder.h
@@ -8,8 +8,8 @@
 #pragma once
 
 #include <react/debug/react_native_assert.h>
-#include <react/renderer/mapbuffer/MapBuffer.h>
 #include <vector>
+#include "MapBuffer.h"
 
 namespace facebook::react {
 

diff --git a/packages/react-native/scripts/cocoapods/bridgeless.rb b/packages/react-native/scripts/cocoapods/bridgeless.rb
@@ -11,6 +11,8 @@ def setup_bridgeless!(react_native_path: "../node_modules/react-native")
     pod "React-jsitracing", :path => "#{react_native_path}/ReactCommon/hermes/executor/"
     pod "React-runtimescheduler", :path => "#{react_native_path}/ReactCommon/react/renderer/runtimescheduler"
     pod 'React-BridgelessCore', :path => "#{react_native_path}/ReactCommon/react/bridgeless"
-    pod 'React-BridgelessHermes', :path => "#{react_native_path}/ReactCommon/react/bridgeless"
+    if ENV["USE_HERMES"] == nil || ENV["USE_HERMES"] == "1"
+        pod 'React-BridgelessHermes', :path => "#{react_native_path}/ReactCommon/react/bridgeless"
+    end
     pod 'React-BridgelessApple', :path => "#{react_native_path}/ReactCommon/react/bridgeless"
 end
diff --git a/packages/react-native/scripts/react_native_pods.rb b/packages/react-native/scripts/react_native_pods.rb
@@ -143,7 +143,7 @@ def use_react_native! (
   pod 'Yoga', :path => "#{prefix}/ReactCommon/yoga", :modular_headers => true
 
   pod 'DoubleConversion', :podspec => "#{prefix}/third-party-podspecs/DoubleConversion.podspec"
-  pod 'glog', :podspec => "#{prefix}/third-party-podspecs/glog.podspec", :modular_headers => true
+  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
 

diff --git a/...n-tester/NativeModuleExample/Screenshot.m → ...-tester/NativeModuleExample/Screenshot.mm b/...n-tester/NativeModuleExample/Screenshot.m → ...-tester/NativeModuleExample/Screenshot.mm