diff --git a/packages/react-native/Libraries/AppDelegate/RCTAppDelegate.h b/packages/react-native/Libraries/AppDelegate/RCTAppDelegate.h index 52763c21c4b7e9..b36e62f230731c 100644 --- 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 -#import #import +@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 index 1c0950dac21314..6b172b64984c44 100644 --- 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/packages/react-native/Libraries/Image/RCTAnimatedImage.m b/packages/react-native/Libraries/Image/RCTAnimatedImage.mm similarity index 100% rename from packages/react-native/Libraries/Image/RCTAnimatedImage.m rename to packages/react-native/Libraries/Image/RCTAnimatedImage.mm diff --git a/packages/react-native/Libraries/Image/RCTDisplayWeakRefreshable.m b/packages/react-native/Libraries/Image/RCTDisplayWeakRefreshable.mm similarity index 100% rename from packages/react-native/Libraries/Image/RCTDisplayWeakRefreshable.m rename to packages/react-native/Libraries/Image/RCTDisplayWeakRefreshable.mm diff --git a/packages/react-native/Libraries/Image/RCTImageBlurUtils.m b/packages/react-native/Libraries/Image/RCTImageBlurUtils.mm similarity index 100% rename from packages/react-native/Libraries/Image/RCTImageBlurUtils.m rename to packages/react-native/Libraries/Image/RCTImageBlurUtils.mm diff --git a/packages/react-native/Libraries/Image/RCTImageCache.m b/packages/react-native/Libraries/Image/RCTImageCache.mm similarity index 100% rename from packages/react-native/Libraries/Image/RCTImageCache.m rename to packages/react-native/Libraries/Image/RCTImageCache.mm diff --git a/packages/react-native/Libraries/Image/RCTImageShadowView.m b/packages/react-native/Libraries/Image/RCTImageShadowView.mm similarity index 100% rename from packages/react-native/Libraries/Image/RCTImageShadowView.m rename to packages/react-native/Libraries/Image/RCTImageShadowView.mm diff --git a/packages/react-native/Libraries/Image/RCTImageUtils.m b/packages/react-native/Libraries/Image/RCTImageUtils.mm similarity index 97% rename from packages/react-native/Libraries/Image/RCTImageUtils.m rename to packages/react-native/Libraries/Image/RCTImageUtils.mm index a55c81fb41f45c..38fbd6bad434af 100644 --- a/packages/react-native/Libraries/Image/RCTImageUtils.m +++ b/packages/react-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/packages/react-native/Libraries/Image/RCTResizeMode.m b/packages/react-native/Libraries/Image/RCTResizeMode.mm similarity index 100% rename from packages/react-native/Libraries/Image/RCTResizeMode.m rename to packages/react-native/Libraries/Image/RCTResizeMode.mm diff --git a/packages/react-native/Libraries/Image/RCTUIImageViewAnimated.m b/packages/react-native/Libraries/Image/RCTUIImageViewAnimated.mm similarity index 100% rename from packages/react-native/Libraries/Image/RCTUIImageViewAnimated.m rename to packages/react-native/Libraries/Image/RCTUIImageViewAnimated.mm diff --git a/packages/react-native/Libraries/Image/React-RCTImage.podspec b/packages/react-native/Libraries/Image/React-RCTImage.podspec index f6a91baaf99c27..e53162bee2e5b6 100644 --- 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/packages/react-native/Libraries/NativeAnimation/Drivers/RCTDecayAnimation.m b/packages/react-native/Libraries/NativeAnimation/Drivers/RCTDecayAnimation.mm similarity index 100% rename from packages/react-native/Libraries/NativeAnimation/Drivers/RCTDecayAnimation.m rename to packages/react-native/Libraries/NativeAnimation/Drivers/RCTDecayAnimation.mm diff --git a/packages/react-native/Libraries/NativeAnimation/Drivers/RCTEventAnimation.m b/packages/react-native/Libraries/NativeAnimation/Drivers/RCTEventAnimation.mm similarity index 100% rename from packages/react-native/Libraries/NativeAnimation/Drivers/RCTEventAnimation.m rename to packages/react-native/Libraries/NativeAnimation/Drivers/RCTEventAnimation.mm diff --git a/packages/react-native/Libraries/NativeAnimation/Drivers/RCTFrameAnimation.m b/packages/react-native/Libraries/NativeAnimation/Drivers/RCTFrameAnimation.mm similarity index 100% rename from packages/react-native/Libraries/NativeAnimation/Drivers/RCTFrameAnimation.m rename to packages/react-native/Libraries/NativeAnimation/Drivers/RCTFrameAnimation.mm diff --git a/packages/react-native/Libraries/NativeAnimation/Drivers/RCTSpringAnimation.m b/packages/react-native/Libraries/NativeAnimation/Drivers/RCTSpringAnimation.mm similarity index 100% rename from packages/react-native/Libraries/NativeAnimation/Drivers/RCTSpringAnimation.m rename to packages/react-native/Libraries/NativeAnimation/Drivers/RCTSpringAnimation.mm diff --git a/packages/react-native/Libraries/NativeAnimation/Nodes/RCTAdditionAnimatedNode.m b/packages/react-native/Libraries/NativeAnimation/Nodes/RCTAdditionAnimatedNode.mm similarity index 100% rename from packages/react-native/Libraries/NativeAnimation/Nodes/RCTAdditionAnimatedNode.m rename to packages/react-native/Libraries/NativeAnimation/Nodes/RCTAdditionAnimatedNode.mm diff --git a/packages/react-native/Libraries/NativeAnimation/Nodes/RCTAnimatedNode.m b/packages/react-native/Libraries/NativeAnimation/Nodes/RCTAnimatedNode.mm similarity index 100% rename from packages/react-native/Libraries/NativeAnimation/Nodes/RCTAnimatedNode.m rename to packages/react-native/Libraries/NativeAnimation/Nodes/RCTAnimatedNode.mm diff --git a/packages/react-native/Libraries/NativeAnimation/Nodes/RCTColorAnimatedNode.m b/packages/react-native/Libraries/NativeAnimation/Nodes/RCTColorAnimatedNode.mm similarity index 100% rename from packages/react-native/Libraries/NativeAnimation/Nodes/RCTColorAnimatedNode.m rename to packages/react-native/Libraries/NativeAnimation/Nodes/RCTColorAnimatedNode.mm diff --git a/packages/react-native/Libraries/NativeAnimation/Nodes/RCTDiffClampAnimatedNode.m b/packages/react-native/Libraries/NativeAnimation/Nodes/RCTDiffClampAnimatedNode.mm similarity index 100% rename from packages/react-native/Libraries/NativeAnimation/Nodes/RCTDiffClampAnimatedNode.m rename to packages/react-native/Libraries/NativeAnimation/Nodes/RCTDiffClampAnimatedNode.mm diff --git a/packages/react-native/Libraries/NativeAnimation/Nodes/RCTDivisionAnimatedNode.m b/packages/react-native/Libraries/NativeAnimation/Nodes/RCTDivisionAnimatedNode.mm similarity index 100% rename from packages/react-native/Libraries/NativeAnimation/Nodes/RCTDivisionAnimatedNode.m rename to packages/react-native/Libraries/NativeAnimation/Nodes/RCTDivisionAnimatedNode.mm diff --git a/packages/react-native/Libraries/NativeAnimation/Nodes/RCTInterpolationAnimatedNode.h b/packages/react-native/Libraries/NativeAnimation/Nodes/RCTInterpolationAnimatedNode.h index d56395d55d7f18..26a78a7856a0ca 100644 --- 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 *inputRange, NSArray *> *outputRange, NSString *extrapolateLeft, NSString *extrapolateRight); diff --git a/packages/react-native/Libraries/NativeAnimation/Nodes/RCTInterpolationAnimatedNode.m b/packages/react-native/Libraries/NativeAnimation/Nodes/RCTInterpolationAnimatedNode.mm similarity index 99% rename from packages/react-native/Libraries/NativeAnimation/Nodes/RCTInterpolationAnimatedNode.m rename to packages/react-native/Libraries/NativeAnimation/Nodes/RCTInterpolationAnimatedNode.mm index 3c53d537cc77cc..78ee190dee0cd4 100644 --- a/packages/react-native/Libraries/NativeAnimation/Nodes/RCTInterpolationAnimatedNode.m +++ b/packages/react-native/Libraries/NativeAnimation/Nodes/RCTInterpolationAnimatedNode.mm @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import +#import "RCTInterpolationAnimatedNode.h" #import #import diff --git a/packages/react-native/Libraries/NativeAnimation/Nodes/RCTModuloAnimatedNode.m b/packages/react-native/Libraries/NativeAnimation/Nodes/RCTModuloAnimatedNode.mm similarity index 100% rename from packages/react-native/Libraries/NativeAnimation/Nodes/RCTModuloAnimatedNode.m rename to packages/react-native/Libraries/NativeAnimation/Nodes/RCTModuloAnimatedNode.mm diff --git a/packages/react-native/Libraries/NativeAnimation/Nodes/RCTMultiplicationAnimatedNode.m b/packages/react-native/Libraries/NativeAnimation/Nodes/RCTMultiplicationAnimatedNode.mm similarity index 100% rename from packages/react-native/Libraries/NativeAnimation/Nodes/RCTMultiplicationAnimatedNode.m rename to packages/react-native/Libraries/NativeAnimation/Nodes/RCTMultiplicationAnimatedNode.mm diff --git a/packages/react-native/Libraries/NativeAnimation/Nodes/RCTObjectAnimatedNode.m b/packages/react-native/Libraries/NativeAnimation/Nodes/RCTObjectAnimatedNode.mm similarity index 100% rename from packages/react-native/Libraries/NativeAnimation/Nodes/RCTObjectAnimatedNode.m rename to packages/react-native/Libraries/NativeAnimation/Nodes/RCTObjectAnimatedNode.mm diff --git a/packages/react-native/Libraries/NativeAnimation/Nodes/RCTPropsAnimatedNode.m b/packages/react-native/Libraries/NativeAnimation/Nodes/RCTPropsAnimatedNode.mm similarity index 100% rename from packages/react-native/Libraries/NativeAnimation/Nodes/RCTPropsAnimatedNode.m rename to packages/react-native/Libraries/NativeAnimation/Nodes/RCTPropsAnimatedNode.mm diff --git a/packages/react-native/Libraries/NativeAnimation/Nodes/RCTStyleAnimatedNode.m b/packages/react-native/Libraries/NativeAnimation/Nodes/RCTStyleAnimatedNode.mm similarity index 100% rename from packages/react-native/Libraries/NativeAnimation/Nodes/RCTStyleAnimatedNode.m rename to packages/react-native/Libraries/NativeAnimation/Nodes/RCTStyleAnimatedNode.mm diff --git a/packages/react-native/Libraries/NativeAnimation/Nodes/RCTSubtractionAnimatedNode.m b/packages/react-native/Libraries/NativeAnimation/Nodes/RCTSubtractionAnimatedNode.mm similarity index 100% rename from packages/react-native/Libraries/NativeAnimation/Nodes/RCTSubtractionAnimatedNode.m rename to packages/react-native/Libraries/NativeAnimation/Nodes/RCTSubtractionAnimatedNode.mm diff --git a/packages/react-native/Libraries/NativeAnimation/Nodes/RCTTrackingAnimatedNode.m b/packages/react-native/Libraries/NativeAnimation/Nodes/RCTTrackingAnimatedNode.mm similarity index 100% rename from packages/react-native/Libraries/NativeAnimation/Nodes/RCTTrackingAnimatedNode.m rename to packages/react-native/Libraries/NativeAnimation/Nodes/RCTTrackingAnimatedNode.mm diff --git a/packages/react-native/Libraries/NativeAnimation/Nodes/RCTTransformAnimatedNode.m b/packages/react-native/Libraries/NativeAnimation/Nodes/RCTTransformAnimatedNode.mm similarity index 100% rename from packages/react-native/Libraries/NativeAnimation/Nodes/RCTTransformAnimatedNode.m rename to packages/react-native/Libraries/NativeAnimation/Nodes/RCTTransformAnimatedNode.mm diff --git a/packages/react-native/Libraries/NativeAnimation/Nodes/RCTValueAnimatedNode.m b/packages/react-native/Libraries/NativeAnimation/Nodes/RCTValueAnimatedNode.mm similarity index 100% rename from packages/react-native/Libraries/NativeAnimation/Nodes/RCTValueAnimatedNode.m rename to packages/react-native/Libraries/NativeAnimation/Nodes/RCTValueAnimatedNode.mm diff --git a/packages/react-native/Libraries/NativeAnimation/RCTAnimationUtils.m b/packages/react-native/Libraries/NativeAnimation/RCTAnimationUtils.mm similarity index 98% rename from packages/react-native/Libraries/NativeAnimation/RCTAnimationUtils.m rename to packages/react-native/Libraries/NativeAnimation/RCTAnimationUtils.mm index 8006fb808a9bf6..90cfe304d6f68a 100644 --- a/packages/react-native/Libraries/NativeAnimation/RCTAnimationUtils.m +++ b/packages/react-native/Libraries/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/packages/react-native/Libraries/NativeAnimation/RCTNativeAnimatedNodesManager.m b/packages/react-native/Libraries/NativeAnimation/RCTNativeAnimatedNodesManager.mm similarity index 100% rename from packages/react-native/Libraries/NativeAnimation/RCTNativeAnimatedNodesManager.m rename to packages/react-native/Libraries/NativeAnimation/RCTNativeAnimatedNodesManager.mm diff --git a/packages/react-native/Libraries/Text/BaseText/RCTBaseTextShadowView.m b/packages/react-native/Libraries/Text/BaseText/RCTBaseTextShadowView.mm similarity index 100% rename from packages/react-native/Libraries/Text/BaseText/RCTBaseTextShadowView.m rename to packages/react-native/Libraries/Text/BaseText/RCTBaseTextShadowView.mm diff --git a/packages/react-native/Libraries/Text/BaseText/RCTBaseTextViewManager.m b/packages/react-native/Libraries/Text/BaseText/RCTBaseTextViewManager.mm similarity index 100% rename from packages/react-native/Libraries/Text/BaseText/RCTBaseTextViewManager.m rename to packages/react-native/Libraries/Text/BaseText/RCTBaseTextViewManager.mm diff --git a/packages/react-native/Libraries/Text/RCTConvert+Text.m b/packages/react-native/Libraries/Text/RCTConvert+Text.mm similarity index 100% rename from packages/react-native/Libraries/Text/RCTConvert+Text.m rename to packages/react-native/Libraries/Text/RCTConvert+Text.mm diff --git a/packages/react-native/Libraries/Text/RCTTextAttributes.m b/packages/react-native/Libraries/Text/RCTTextAttributes.mm similarity index 100% rename from packages/react-native/Libraries/Text/RCTTextAttributes.m rename to packages/react-native/Libraries/Text/RCTTextAttributes.mm diff --git a/packages/react-native/Libraries/Text/RawText/RCTRawTextShadowView.m b/packages/react-native/Libraries/Text/RawText/RCTRawTextShadowView.mm similarity index 100% rename from packages/react-native/Libraries/Text/RawText/RCTRawTextShadowView.m rename to packages/react-native/Libraries/Text/RawText/RCTRawTextShadowView.mm diff --git a/packages/react-native/Libraries/Text/RawText/RCTRawTextViewManager.m b/packages/react-native/Libraries/Text/RawText/RCTRawTextViewManager.mm similarity index 100% rename from packages/react-native/Libraries/Text/RawText/RCTRawTextViewManager.m rename to packages/react-native/Libraries/Text/RawText/RCTRawTextViewManager.mm diff --git a/packages/react-native/Libraries/Text/React-RCTText.podspec b/packages/react-native/Libraries/Text/React-RCTText.podspec index 36d878b3c3ff33..3777e5d9603f28 100644 --- 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/packages/react-native/Libraries/Text/Text/RCTDynamicTypeRamp.m b/packages/react-native/Libraries/Text/Text/RCTDynamicTypeRamp.mm similarity index 100% rename from packages/react-native/Libraries/Text/Text/RCTDynamicTypeRamp.m rename to packages/react-native/Libraries/Text/Text/RCTDynamicTypeRamp.mm diff --git a/packages/react-native/Libraries/Text/Text/RCTTextShadowView.m b/packages/react-native/Libraries/Text/Text/RCTTextShadowView.mm similarity index 100% rename from packages/react-native/Libraries/Text/Text/RCTTextShadowView.m rename to packages/react-native/Libraries/Text/Text/RCTTextShadowView.mm diff --git a/packages/react-native/Libraries/Text/Text/RCTTextView.m b/packages/react-native/Libraries/Text/Text/RCTTextView.mm similarity index 100% rename from packages/react-native/Libraries/Text/Text/RCTTextView.m rename to packages/react-native/Libraries/Text/Text/RCTTextView.mm diff --git a/packages/react-native/Libraries/Text/Text/RCTTextViewManager.m b/packages/react-native/Libraries/Text/Text/RCTTextViewManager.mm similarity index 100% rename from packages/react-native/Libraries/Text/Text/RCTTextViewManager.m rename to packages/react-native/Libraries/Text/Text/RCTTextViewManager.mm diff --git a/packages/react-native/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputView.m b/packages/react-native/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputView.mm similarity index 100% rename from packages/react-native/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputView.m rename to packages/react-native/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputView.mm diff --git a/packages/react-native/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputViewManager.m b/packages/react-native/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputViewManager.mm similarity index 100% rename from packages/react-native/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputViewManager.m rename to packages/react-native/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputViewManager.mm diff --git a/packages/react-native/Libraries/Text/TextInput/Multiline/RCTUITextView.m b/packages/react-native/Libraries/Text/TextInput/Multiline/RCTUITextView.mm similarity index 100% rename from packages/react-native/Libraries/Text/TextInput/Multiline/RCTUITextView.m rename to packages/react-native/Libraries/Text/TextInput/Multiline/RCTUITextView.mm diff --git a/packages/react-native/Libraries/Text/TextInput/RCTBackedTextInputDelegateAdapter.m b/packages/react-native/Libraries/Text/TextInput/RCTBackedTextInputDelegateAdapter.mm similarity index 100% rename from packages/react-native/Libraries/Text/TextInput/RCTBackedTextInputDelegateAdapter.m rename to packages/react-native/Libraries/Text/TextInput/RCTBackedTextInputDelegateAdapter.mm diff --git a/packages/react-native/Libraries/Text/TextInput/RCTBaseTextInputShadowView.m b/packages/react-native/Libraries/Text/TextInput/RCTBaseTextInputShadowView.mm similarity index 100% rename from packages/react-native/Libraries/Text/TextInput/RCTBaseTextInputShadowView.m rename to packages/react-native/Libraries/Text/TextInput/RCTBaseTextInputShadowView.mm diff --git a/packages/react-native/Libraries/Text/TextInput/RCTBaseTextInputView.m b/packages/react-native/Libraries/Text/TextInput/RCTBaseTextInputView.mm similarity index 100% rename from packages/react-native/Libraries/Text/TextInput/RCTBaseTextInputView.m rename to packages/react-native/Libraries/Text/TextInput/RCTBaseTextInputView.mm diff --git a/packages/react-native/Libraries/Text/TextInput/RCTBaseTextInputViewManager.m b/packages/react-native/Libraries/Text/TextInput/RCTBaseTextInputViewManager.mm similarity index 100% rename from packages/react-native/Libraries/Text/TextInput/RCTBaseTextInputViewManager.m rename to packages/react-native/Libraries/Text/TextInput/RCTBaseTextInputViewManager.mm diff --git a/packages/react-native/Libraries/Text/TextInput/RCTInputAccessoryShadowView.m b/packages/react-native/Libraries/Text/TextInput/RCTInputAccessoryShadowView.mm similarity index 84% rename from packages/react-native/Libraries/Text/TextInput/RCTInputAccessoryShadowView.m rename to packages/react-native/Libraries/Text/TextInput/RCTInputAccessoryShadowView.mm index 0bb54d3dac8a6a..ebe514e037f486 100644 --- a/packages/react-native/Libraries/Text/TextInput/RCTInputAccessoryShadowView.m +++ b/packages/react-native/Libraries/Text/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(RCTScreenSize().width), YGUnitPoint}; } @end diff --git a/packages/react-native/Libraries/Text/TextInput/RCTInputAccessoryView.m b/packages/react-native/Libraries/Text/TextInput/RCTInputAccessoryView.mm similarity index 100% rename from packages/react-native/Libraries/Text/TextInput/RCTInputAccessoryView.m rename to packages/react-native/Libraries/Text/TextInput/RCTInputAccessoryView.mm diff --git a/packages/react-native/Libraries/Text/TextInput/RCTInputAccessoryViewContent.m b/packages/react-native/Libraries/Text/TextInput/RCTInputAccessoryViewContent.mm similarity index 100% rename from packages/react-native/Libraries/Text/TextInput/RCTInputAccessoryViewContent.m rename to packages/react-native/Libraries/Text/TextInput/RCTInputAccessoryViewContent.mm diff --git a/packages/react-native/Libraries/Text/TextInput/RCTInputAccessoryViewManager.m b/packages/react-native/Libraries/Text/TextInput/RCTInputAccessoryViewManager.mm similarity index 100% rename from packages/react-native/Libraries/Text/TextInput/RCTInputAccessoryViewManager.m rename to packages/react-native/Libraries/Text/TextInput/RCTInputAccessoryViewManager.mm diff --git a/packages/react-native/Libraries/Text/TextInput/RCTTextSelection.m b/packages/react-native/Libraries/Text/TextInput/RCTTextSelection.mm similarity index 100% rename from packages/react-native/Libraries/Text/TextInput/RCTTextSelection.m rename to packages/react-native/Libraries/Text/TextInput/RCTTextSelection.mm diff --git a/packages/react-native/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputView.m b/packages/react-native/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputView.mm similarity index 100% rename from packages/react-native/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputView.m rename to packages/react-native/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputView.mm diff --git a/packages/react-native/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputViewManager.m b/packages/react-native/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputViewManager.mm similarity index 100% rename from packages/react-native/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputViewManager.m rename to packages/react-native/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputViewManager.mm diff --git a/packages/react-native/Libraries/Text/TextInput/Singleline/RCTUITextField.m b/packages/react-native/Libraries/Text/TextInput/Singleline/RCTUITextField.mm similarity index 100% rename from packages/react-native/Libraries/Text/TextInput/Singleline/RCTUITextField.m rename to packages/react-native/Libraries/Text/TextInput/Singleline/RCTUITextField.mm diff --git a/packages/react-native/Libraries/Text/VirtualText/RCTVirtualTextShadowView.m b/packages/react-native/Libraries/Text/VirtualText/RCTVirtualTextShadowView.mm similarity index 100% rename from packages/react-native/Libraries/Text/VirtualText/RCTVirtualTextShadowView.m rename to packages/react-native/Libraries/Text/VirtualText/RCTVirtualTextShadowView.mm diff --git a/packages/react-native/Libraries/Text/VirtualText/RCTVirtualTextView.m b/packages/react-native/Libraries/Text/VirtualText/RCTVirtualTextView.mm similarity index 100% rename from packages/react-native/Libraries/Text/VirtualText/RCTVirtualTextView.m rename to packages/react-native/Libraries/Text/VirtualText/RCTVirtualTextView.mm diff --git a/packages/react-native/Libraries/Text/VirtualText/RCTVirtualTextViewManager.m b/packages/react-native/Libraries/Text/VirtualText/RCTVirtualTextViewManager.mm similarity index 100% rename from packages/react-native/Libraries/Text/VirtualText/RCTVirtualTextViewManager.m rename to packages/react-native/Libraries/Text/VirtualText/RCTVirtualTextViewManager.mm diff --git a/packages/react-native/React-Core.podspec b/packages/react-native/React-Core.podspec index 2fad76d2d9726a..c46b5afc4f15fc 100644 --- a/packages/react-native/React-Core.podspec +++ b/packages/react-native/React-Core.podspec @@ -91,7 +91,7 @@ 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 @@ -99,7 +99,7 @@ Pod::Spec.new do |s| 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 b/packages/react-native/React/Base/RCTBridge.mm similarity index 100% rename from packages/react-native/React/Base/RCTBridge.m rename to packages/react-native/React/Base/RCTBridge.mm diff --git a/packages/react-native/React/CoreModules/RCTAlertController.m b/packages/react-native/React/CoreModules/RCTAlertController.mm similarity index 89% rename from packages/react-native/React/CoreModules/RCTAlertController.m rename to packages/react-native/React/CoreModules/RCTAlertController.mm index e3f19959e93427..2b6822108b3152 100644 --- a/packages/react-native/React/CoreModules/RCTAlertController.m +++ b/packages/react-native/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/packages/react-native/React/CoreModules/RCTFPSGraph.m b/packages/react-native/React/CoreModules/RCTFPSGraph.mm similarity index 98% rename from packages/react-native/React/CoreModules/RCTFPSGraph.m rename to packages/react-native/React/CoreModules/RCTFPSGraph.mm index 6beaf7d16f1d45..1fc4bd24b9c37f 100644 --- a/packages/react-native/React/CoreModules/RCTFPSGraph.m +++ b/packages/react-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 index 7941b07c49e013..313947f5c6598f 100644 --- 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 index 407752639b9490..5bd7c31d4d6a86 100644 --- 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 index dc0ab09d0958f9..c96710062695d3 100644 --- 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 index 723cf9119d03dc..156e38aaea9b35 100644 --- 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 index e147d20936254d..74c3722c4b08ac 100644 --- 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 #import #import -#import #import #import #import diff --git a/packages/react-native/ReactCommon/react/renderer/mapbuffer/MapBufferBuilder.h b/packages/react-native/ReactCommon/react/renderer/mapbuffer/MapBufferBuilder.h index 5e45d6e1a2a42b..4eda42bff75c00 100644 --- 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 -#include #include +#include "MapBuffer.h" namespace facebook::react { diff --git a/packages/react-native/scripts/cocoapods/bridgeless.rb b/packages/react-native/scripts/cocoapods/bridgeless.rb index fb0efca61e8214..ce356a38c3ca96 100644 --- 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 index c4b587ad732036..3ad0745321149d 100644 --- 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/packages/rn-tester/NativeModuleExample/Screenshot.m b/packages/rn-tester/NativeModuleExample/Screenshot.mm similarity index 100% rename from packages/rn-tester/NativeModuleExample/Screenshot.m rename to packages/rn-tester/NativeModuleExample/Screenshot.mm diff --git a/packages/rn-tester/Podfile.lock b/packages/rn-tester/Podfile.lock index 546b0a3cf14b6d..c68757a63f5d25 100644 --- a/packages/rn-tester/Podfile.lock +++ b/packages/rn-tester/Podfile.lock @@ -1,7 +1,66 @@ PODS: - boost (1.76.0) + - CocoaAsyncSocket (7.6.5) - DoubleConversion (1.1.6) - FBLazyVector (1000.0.0) + - Flipper (0.182.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.182.0): + - FlipperKit/Core (= 0.182.0) + - FlipperKit/Core (0.182.0): + - Flipper (~> 0.182.0) + - FlipperKit/CppBridge + - FlipperKit/FBCxxFollyDynamicConvert + - FlipperKit/FBDefines + - FlipperKit/FKPortForwarding + - SocketRocket (~> 0.6.0) + - FlipperKit/CppBridge (0.182.0): + - Flipper (~> 0.182.0) + - FlipperKit/FBCxxFollyDynamicConvert (0.182.0): + - Flipper-Folly (~> 2.6) + - FlipperKit/FBDefines (0.182.0) + - FlipperKit/FKPortForwarding (0.182.0): + - CocoaAsyncSocket (~> 7.6) + - Flipper-PeerTalk (~> 0.0.4) + - FlipperKit/FlipperKitHighlightOverlay (0.182.0) + - FlipperKit/FlipperKitLayoutHelpers (0.182.0): + - FlipperKit/Core + - FlipperKit/FlipperKitHighlightOverlay + - FlipperKit/FlipperKitLayoutTextSearchable + - FlipperKit/FlipperKitLayoutIOSDescriptors (0.182.0): + - FlipperKit/Core + - FlipperKit/FlipperKitHighlightOverlay + - FlipperKit/FlipperKitLayoutHelpers + - YogaKit (~> 1.18) + - FlipperKit/FlipperKitLayoutPlugin (0.182.0): + - FlipperKit/Core + - FlipperKit/FlipperKitHighlightOverlay + - FlipperKit/FlipperKitLayoutHelpers + - FlipperKit/FlipperKitLayoutIOSDescriptors + - FlipperKit/FlipperKitLayoutTextSearchable + - YogaKit (~> 1.18) + - FlipperKit/FlipperKitLayoutTextSearchable (0.182.0) + - FlipperKit/FlipperKitNetworkPlugin (0.182.0): + - FlipperKit/Core + - FlipperKit/FlipperKitReactPlugin (0.182.0): + - FlipperKit/Core + - FlipperKit/FlipperKitUserDefaultsPlugin (0.182.0): + - FlipperKit/Core + - FlipperKit/SKIOSNetworkPlugin (0.182.0): + - FlipperKit/Core + - FlipperKit/FlipperKitNetworkPlugin - fmt (6.2.1) - glog (0.3.5) - hermes-engine (1000.0.0): @@ -49,6 +108,7 @@ PODS: - ReactCommon/turbomodule/core - Yoga - OCMock (3.9.1) + - OpenSSL-Universal (1.1.1100) - RCT-Folly (2021.07.22.00): - boost - DoubleConversion @@ -1041,6 +1101,7 @@ PODS: - ReactCommon/turbomodule/core (= 1000.0.0) - React-RCTText (1000.0.0): - React-Core/RCTTextHeaders (= 1000.0.0) + - Yoga - React-RCTVibration (1000.0.0): - RCT-Folly (= 2021.07.22.00) - React-Codegen (= 1000.0.0) @@ -1116,17 +1177,40 @@ PODS: - Yoga - SocketRocket (0.6.0) - Yoga (1.14.0) + - YogaKit (1.18.1): + - Yoga (~> 1.14) DEPENDENCIES: - boost (from `../react-native/third-party-podspecs/boost.podspec`) - DoubleConversion (from `../react-native/third-party-podspecs/DoubleConversion.podspec`) - FBLazyVector (from `../react-native/Libraries/FBLazyVector`) + - Flipper (= 0.182.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.182.0) + - FlipperKit/Core (= 0.182.0) + - FlipperKit/CppBridge (= 0.182.0) + - FlipperKit/FBCxxFollyDynamicConvert (= 0.182.0) + - FlipperKit/FBDefines (= 0.182.0) + - FlipperKit/FKPortForwarding (= 0.182.0) + - FlipperKit/FlipperKitHighlightOverlay (= 0.182.0) + - FlipperKit/FlipperKitLayoutPlugin (= 0.182.0) + - FlipperKit/FlipperKitLayoutTextSearchable (= 0.182.0) + - FlipperKit/FlipperKitNetworkPlugin (= 0.182.0) + - FlipperKit/FlipperKitReactPlugin (= 0.182.0) + - FlipperKit/FlipperKitUserDefaultsPlugin (= 0.182.0) + - FlipperKit/SKIOSNetworkPlugin (= 0.182.0) - glog (from `../react-native/third-party-podspecs/glog.podspec`) - hermes-engine (from `../react-native/sdks/hermes-engine/hermes-engine.podspec`) - libevent (~> 2.1.12) - MyNativeView (from `NativeComponentExample`) - NativeCxxModuleExample (from `NativeCxxModuleExample`) - 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`) @@ -1138,6 +1222,7 @@ 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`) @@ -1182,10 +1267,21 @@ DEPENDENCIES: 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 + - YogaKit EXTERNAL SOURCES: boost: @@ -1306,66 +1402,77 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: boost: 57d2868c099736d80fcd648bf211b4431e51a558 + CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99 DoubleConversion: fea03f2699887d960129cc54bba7e52542b6f953 FBLazyVector: f4492a543c5a8fa1502d3a5867e3f7252497cfe8 + Flipper: 6edb735e6c3e332975d1b17956bcc584eccf5818 + Flipper-Boost-iOSX: fd1e2b8cbef7e662a122412d7ac5f5bea715403c + Flipper-DoubleConversion: 2dc99b02f658daf147069aad9dbd29d8feb06d30 + Flipper-Fmt: 60cbdd92fc254826e61d669a5d87ef7015396a9b + Flipper-Folly: 584845625005ff068a6ebf41f857f468decd26b3 + Flipper-Glog: 70c50ce58ddaf67dc35180db05f191692570f446 + Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9 + FlipperKit: 2efad7007d6745a3f95e4034d547be637f89d3f6 fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9 glog: 99bd064df01718db56b8f75e6b5ea3051c7dad0a - hermes-engine: ab8b04c6ceac7e5cdf8b80be22107a9fffe8dfe6 + hermes-engine: 2afbd66392ccbdab92cd9f2324f25531530addee libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 - MyNativeView: 0476cfb28ffbae3e3a0a7abcd91874a9950dfaaa - NativeCxxModuleExample: 90eae6c1e46e6568b9ee3fd31e82799d22c2a4ad + MyNativeView: f014a1d9c91c1c2992dd4555ad23b9eec8844ca0 + NativeCxxModuleExample: 9ac22dcaa33d118aadba81afa6d16a76625c4743 OCMock: 9491e4bec59e0b267d52a9184ff5605995e74be8 + OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c RCT-Folly: b0d1393cb3763d71efca99db314c65f0072eb0fe RCTRequired: 82c56a03b3efd524bfdb581a906add903f78f978 RCTTypeSafety: 034ade4e3b36be976b8378f825ccadbe104fa852 React: cb6dc75e09f32aeddb4d8fb58a394a67219a92fe - React-BridgelessApple: 7b25cc196775cba0800040f75c7290637ecbf626 - React-BridgelessCore: 7be1f8c12131c57ead18e66aa90a7063e582b968 - React-BridgelessHermes: 879ce79d214be6b15787f7de74674045f97bde03 + React-BridgelessApple: 5a2fba525aa28bc96cdf989396ab9066faf80744 + React-BridgelessCore: f8ea5a5cf6643dd9517121b9778eeda4b37c3166 + React-BridgelessHermes: 1b96642a660126c1d8dab608139a5ffcd744316f React-callinvoker: bae59cbd6affd712bbfc703839dad868ff35069d - React-Codegen: 04ba7912f182dba87522a2c85c5b6b4f4b2ca683 - React-Core: af44a23249c37faccaa4ad490f373819cb23c8f2 - React-CoreModules: b2a626b7880f5ba5434ddb36797d6c3050645069 - React-cxxreact: 21b73aa1e245d6c701e62150312c3748756bbf42 - React-debug: b8ca04c97389d8deb71159f7fbba395904b2d599 - React-Fabric: 63bfc6cc9d2ec9191cf71531ccc52da9c64c8c2a - React-FabricImage: 0c2f22ad19d3920ed1f95dd45f8ea885b8507feb - React-graphics: cb2b0d040a7f798ed14d7ce3caf07a89cb78e306 + React-Codegen: cab0cb4eba8b41f7dfb2b92ec4da38a02517e0a4 + React-Core: 099823b999817fa5d9502fa767ccde84a6d283ce + React-CoreModules: 8708a4f28ad9f4bc0b9b5c702eeeb4055bee1417 + React-cxxreact: ef74209ea42b771bb62a9d33b5dbd51fa6704474 + React-debug: 6cff11e7bbc5d37f8dcc33ccb6db1b7b93382e4c + React-Fabric: 3a97f30ffb174f75ffda77f2506dae493763388f + React-FabricImage: d4167d5307611a19a2a8ec4954f1be4ffd4afd5c + React-graphics: 3990c281a71d901c124e121a9fc27fa95f31663c React-hermes: fa4837e1d1e55f462ad3e485794056189b495d7e - React-ImageManager: 85e3d6600b740cfa25e079bd7d0c460a6ba6665b - React-jserrorhandler: 13d74cf05cdcb78355b8ffb18b5d6c3bf7b4e465 - React-jsi: ae20bc6ced4999f64acc5163cbfa67f878f346f4 + React-ImageManager: 57044135702538c0c6c31c9d5502e82002be37c3 + React-jserrorhandler: 64b01d9ee9e6bea3211d1e76ede8bca102e4ce58 + React-jsi: 9378d68531a6f8d70176774f44873e2f44d54881 React-jsiexecutor: 754993beb8627912e5b25344cad02ed11a616d9f React-jsinspector: bede0a6ac88f2463eafc1301239fe943adf06fa7 - React-jsitracing: db9fb46b96b8e58e1d603b0269a3b92735cd5cad + React-jsitracing: 9c31143708c500579047b26ef7a82e91189329b2 React-logger: c20eb15d006d5c303cf6bfbb11243c8d579d9f56 - React-Mapbuffer: f6997dcdedb2f6816a36b972d1a39ea278c17485 - React-nativeconfig: 614a27e2704609dd6501137b77d1278266beafa2 - React-NativeModulesApple: e818cad892ed5b090dad1467fca70139f14a347c + React-Mapbuffer: 3c6e5c64e6a4a4f344a0525810969473595028ae + React-nativeconfig: 764a90d6e97404b9e144209b734e486da90b32b8 + React-NativeModulesApple: 518f3f3d2d9e4944f99df30e601f8774d1fa1663 React-perflogger: c294d51cfc18b90caa1604ef3a0fe2dd76b9e15e React-RCTActionSheet: 943bd5f540f3af1e5a149c13c4de81858edf718a - React-RCTAnimation: 2c4bb7f0f5734cffc722d08f0db0082b56f74f19 - React-RCTAppDelegate: 8198915c0d666074fca532488b3863926ed67267 - React-RCTBlob: 8ca8256f44b9c002c126ae15764ba7fca9b7e568 - React-RCTFabric: 60cc4beada6b3e82025313cadd22bda7b93d1706 - React-RCTImage: bb95cc1d6ac1370dcebcc88b13938b31d93d5eff - React-RCTLinking: 1d65dcc1acf31b0824a07498b2a62fe0faa8c996 - React-RCTNetwork: 584d43bdefb0d73d90eec6146b79cafcc9242d00 - React-RCTPushNotification: 6e39862fcc7d8de4f243d1fa66836671d050d8d0 - React-RCTSettings: d98d83e8e9737f0a2c5fb2b05956ef31c102ae0b + React-RCTAnimation: a430a8c32e7947b7b014f7bd1ef6825168ad4841 + React-RCTAppDelegate: c2bdfa5d8b34916fbe8f803557b33a8b8bb7fd28 + React-RCTBlob: 9de0f88a876429c31b96b63975173c60978b5586 + React-RCTFabric: b2ab2d53eba67f0f36dbbf9893c7cb813be7f78e + React-RCTImage: c5ebb5cc974afee6ac3135c4ff6d276a30f4b4b8 + React-RCTLinking: aec004e7f55b71be0f68913b1d993964fc8013e1 + React-RCTNetwork: 67229afd0642c55d4493cad5129238a7a1599441 + React-RCTPushNotification: 9e4bba7bb3a4682281216a81f3342caecf84cef7 + React-RCTSettings: 9b6f5a70aa3b859b2686794c3441e278b4f6e0a6 React-RCTTest: d4004e03f9e5ca2607eb05bee5a0618b189a127a - React-RCTText: 6d0a9927391dc26325c2edf60ef7d36f637e709c - React-RCTVibration: f1c57bcb277765818f90c8579b9c4c182dc24e58 - React-rendererdebug: 964a1c7696e5a3db09f969fbea8c4799d357b87e + React-RCTText: e9b0e8ecf0ab4f9fac58916433dcf8e8d5e5c2c1 + React-RCTVibration: ae65884c71d67f356396d6fcc44eec48b5afef70 + React-rendererdebug: e9e35b8c9c6fb17a38ab3bacc9f52c3c35a1fefa React-rncore: 1eb30c961c5061f3ac07850e77f0038f0c29ac46 React-runtimeexecutor: e1c32bc249dd3cf3919cb4664fd8dc84ef70cff7 - React-runtimescheduler: fb782d7880ed883add4f1ad02cd6d444945a45bd - React-utils: 6d6dcf42bdbf8f4972e252bd031f34ccf105f0aa - ReactCommon: 035608c9665dd0bf7a75a6b90bba252731345312 - ReactCommon-Samples: c4f4880fd3ae74e88698c74310f7328a58a66c81 - ScreenshotManager: 6aa4733a336606bfed7e8ce50b825b906f1d2942 + React-runtimescheduler: f5ecd4eab63710b752691bab82db37adb2430d15 + React-utils: 87fd772efdc9c2d0c28b9e1191639c7425e007e5 + ReactCommon: de6e7a92ad50207b08bcf696a61d9b509876e131 + ReactCommon-Samples: 13b7118480fb9abeee8a98bc1cceff06984cfde4 + ScreenshotManager: 5d178180422e6c1b17879c9d019f0220535745b9 SocketRocket: fccef3f9c5cedea1353a9ef6ada904fde10d6608 Yoga: 239f77be94241af2a02e7018fe6165a715bc25f1 + YogaKit: f782866e155069a2cca2517aafea43200b01fd5a PODFILE CHECKSUM: e220946495183a79874329aff76ec197027be224 diff --git a/packages/rn-tester/RNTester/NativeExampleViews/FlexibleSizeExampleView.m b/packages/rn-tester/RNTester/NativeExampleViews/FlexibleSizeExampleView.mm similarity index 100% rename from packages/rn-tester/RNTester/NativeExampleViews/FlexibleSizeExampleView.m rename to packages/rn-tester/RNTester/NativeExampleViews/FlexibleSizeExampleView.mm diff --git a/packages/rn-tester/RNTester/NativeExampleViews/UpdatePropertiesExampleView.m b/packages/rn-tester/RNTester/NativeExampleViews/UpdatePropertiesExampleView.mm similarity index 100% rename from packages/rn-tester/RNTester/NativeExampleViews/UpdatePropertiesExampleView.m rename to packages/rn-tester/RNTester/NativeExampleViews/UpdatePropertiesExampleView.mm diff --git a/packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj b/packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj index 3db35a22d66846..21f894ab822e40 100644 --- a/packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj +++ b/packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj @@ -9,8 +9,6 @@ /* Begin PBXBuildFile section */ 04157F50C11E9F16DDD69B17 /* libPods-RNTester.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2F98312BF816A7F2688C036D /* libPods-RNTester.a */; }; 13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; }; - 272E6B3F1BEA849E001FCF37 /* UpdatePropertiesExampleView.m in Sources */ = {isa = PBXBuildFile; fileRef = 272E6B3C1BEA849E001FCF37 /* UpdatePropertiesExampleView.m */; }; - 27F441EC1BEBE5030039B79C /* FlexibleSizeExampleView.m in Sources */ = {isa = PBXBuildFile; fileRef = 27F441E81BEBE5030039B79C /* FlexibleSizeExampleView.m */; }; 2DDEF0101F84BF7B00DBDF73 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 2DDEF00F1F84BF7B00DBDF73 /* Images.xcassets */; }; 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 */; }; @@ -19,6 +17,8 @@ 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 */; }; 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 */; }; E7C1241A22BEC44B00DA25C0 /* RNTesterIntegrationTests.m in Sources */ = {isa = PBXBuildFile; fileRef = E7C1241922BEC44B00DA25C0 /* RNTesterIntegrationTests.m */; }; E7DB20D122B2BAA6005AC45F /* RCTBundleURLProviderTests.m in Sources */ = {isa = PBXBuildFile; fileRef = E7DB20A922B2BAA3005AC45F /* RCTBundleURLProviderTests.m */; }; E7DB20D222B2BAA6005AC45F /* RCTModuleInitNotificationRaceTests.m in Sources */ = {isa = PBXBuildFile; fileRef = E7DB20AA22B2BAA3005AC45F /* RCTModuleInitNotificationRaceTests.m */; }; @@ -84,8 +84,8 @@ 13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = RNTester/Info.plist; sourceTree = ""; }; 13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = RNTester/main.m; sourceTree = ""; }; 272E6B3B1BEA849E001FCF37 /* UpdatePropertiesExampleView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = UpdatePropertiesExampleView.h; path = RNTester/NativeExampleViews/UpdatePropertiesExampleView.h; sourceTree = ""; }; - 272E6B3C1BEA849E001FCF37 /* UpdatePropertiesExampleView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = UpdatePropertiesExampleView.m; path = RNTester/NativeExampleViews/UpdatePropertiesExampleView.m; sourceTree = ""; }; - 27F441E81BEBE5030039B79C /* FlexibleSizeExampleView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FlexibleSizeExampleView.m; path = RNTester/NativeExampleViews/FlexibleSizeExampleView.m; sourceTree = ""; }; + 272E6B3C1BEA849E001FCF37 /* UpdatePropertiesExampleView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = UpdatePropertiesExampleView.mm; path = RNTester/NativeExampleViews/UpdatePropertiesExampleView.mm; sourceTree = ""; }; + 27F441E81BEBE5030039B79C /* FlexibleSizeExampleView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = FlexibleSizeExampleView.mm; path = RNTester/NativeExampleViews/FlexibleSizeExampleView.mm; sourceTree = ""; }; 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; }; @@ -240,10 +240,10 @@ 272E6B3A1BEA846C001FCF37 /* NativeExampleViews */ = { isa = PBXGroup; children = ( - 27F441E81BEBE5030039B79C /* FlexibleSizeExampleView.m */, + 27F441E81BEBE5030039B79C /* FlexibleSizeExampleView.mm */, 27F441EA1BEBE5030039B79C /* FlexibleSizeExampleView.h */, 272E6B3B1BEA849E001FCF37 /* UpdatePropertiesExampleView.h */, - 272E6B3C1BEA849E001FCF37 /* UpdatePropertiesExampleView.m */, + 272E6B3C1BEA849E001FCF37 /* UpdatePropertiesExampleView.mm */, ); name = NativeExampleViews; sourceTree = ""; @@ -740,8 +740,8 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 272E6B3F1BEA849E001FCF37 /* UpdatePropertiesExampleView.m in Sources */, - 27F441EC1BEBE5030039B79C /* FlexibleSizeExampleView.m in Sources */, + E62F11842A5C6584000BF1C8 /* UpdatePropertiesExampleView.mm in Sources */, + E62F11832A5C6580000BF1C8 /* FlexibleSizeExampleView.mm in Sources */, 5C60EB1C226440DB0018C04F /* AppDelegate.mm in Sources */, 13B07FC11A68108700A75B9A /* main.m in Sources */, );