diff --git a/packages/react-native/Libraries/AppDelegate/RCTAppSetupUtils.mm b/packages/react-native/Libraries/AppDelegate/RCTAppSetupUtils.mm index 6c5f7a4a13b..9cc4e2c63a5 100644 --- a/packages/react-native/Libraries/AppDelegate/RCTAppSetupUtils.mm +++ b/packages/react-native/Libraries/AppDelegate/RCTAppSetupUtils.mm @@ -27,12 +27,9 @@ // jsinspector-modern #import -#if __has_include() +#if __has_include() #define USE_OSS_CODEGEN 1 -#import -#elif __has_include() -#define USE_OSS_CODEGEN 1 -#import +#import #else // Meta internal system do not generate the RCTModulesConformingToProtocolsProvider.h file #define USE_OSS_CODEGEN 0 diff --git a/packages/react-native/Libraries/AppDelegate/React-RCTAppDelegate.podspec b/packages/react-native/Libraries/AppDelegate/React-RCTAppDelegate.podspec index 146ff1ea5cc..bb919f23b91 100644 --- a/packages/react-native/Libraries/AppDelegate/React-RCTAppDelegate.podspec +++ b/packages/react-native/Libraries/AppDelegate/React-RCTAppDelegate.podspec @@ -76,7 +76,7 @@ Pod::Spec.new do |s| s.dependency "React-RCTImage" s.dependency "React-CoreModules" s.dependency "React-nativeconfig" - s.dependency "React-Codegen" + s.dependency "ReactCodegen" add_dependency(s, "ReactCommon", :subspec => "turbomodule/core", :additional_framework_paths => ["react/nativemodule/core"]) add_dependency(s, "React-NativeModulesApple") diff --git a/packages/react-native/Libraries/Blob/React-RCTBlob.podspec b/packages/react-native/Libraries/Blob/React-RCTBlob.podspec index 8b48d45e7f4..ee72d65b637 100644 --- a/packages/react-native/Libraries/Blob/React-RCTBlob.podspec +++ b/packages/react-native/Libraries/Blob/React-RCTBlob.podspec @@ -25,7 +25,7 @@ header_search_paths = [ "\"$(PODS_ROOT)/boost\"", "\"$(PODS_ROOT)/DoubleConversion\"", "\"$(PODS_ROOT)/fmt/include\"", - "\"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\"", + "\"${PODS_ROOT}/Headers/Public/ReactCodegen/react/renderer/components\"", ] Pod::Spec.new do |s| @@ -55,7 +55,7 @@ Pod::Spec.new do |s| s.dependency "React-Core/RCTWebSocket" s.dependency "React-RCTNetwork" - add_dependency(s, "React-Codegen") + add_dependency(s, "ReactCodegen") add_dependency(s, "React-NativeModulesApple") add_dependency(s, "React-jsinspector", :framework_name => 'jsinspector_modern') add_dependency(s, "ReactCommon", :subspec => "turbomodule/core", :additional_framework_paths => ["react/nativemodule/core"]) diff --git a/packages/react-native/Libraries/Image/React-RCTImage.podspec b/packages/react-native/Libraries/Image/React-RCTImage.podspec index 8fb9cca15e2..5aacf0d7999 100644 --- a/packages/react-native/Libraries/Image/React-RCTImage.podspec +++ b/packages/react-native/Libraries/Image/React-RCTImage.podspec @@ -22,7 +22,7 @@ folly_version = folly_config[:version] header_search_paths = [ "\"$(PODS_ROOT)/RCT-Folly\"", - "\"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\"", + "\"${PODS_ROOT}/Headers/Public/ReactCodegen/react/renderer/components\"", ] @@ -53,7 +53,7 @@ Pod::Spec.new do |s| s.dependency "React-Core/RCTImageHeaders" s.dependency "React-RCTNetwork" - add_dependency(s, "React-Codegen") + add_dependency(s, "ReactCodegen") add_dependency(s, "ReactCommon", :subspec => "turbomodule/core", :additional_framework_paths => ["react/nativemodule/core"]) add_dependency(s, "React-NativeModulesApple") diff --git a/packages/react-native/Libraries/LinkingIOS/React-RCTLinking.podspec b/packages/react-native/Libraries/LinkingIOS/React-RCTLinking.podspec index 54745755443..eff125c9615 100644 --- a/packages/react-native/Libraries/LinkingIOS/React-RCTLinking.podspec +++ b/packages/react-native/Libraries/LinkingIOS/React-RCTLinking.podspec @@ -22,7 +22,7 @@ folly_version = folly_config[:version] header_search_paths = [ "\"$(PODS_ROOT)/RCT-Folly\"", - "\"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\"", + "\"${PODS_ROOT}/Headers/Public/ReactCodegen/react/renderer/components\"", ] Pod::Spec.new do |s| @@ -49,7 +49,7 @@ Pod::Spec.new do |s| s.dependency "ReactCommon/turbomodule/core", version s.dependency "React-jsi", version - add_dependency(s, "React-Codegen", :additional_framework_paths => ["build/generated/ios"]) + add_dependency(s, "ReactCodegen", :additional_framework_paths => ["build/generated/ios"]) add_dependency(s, "ReactCommon", :subspec => "turbomodule/core", :additional_framework_paths => ["react/nativemodule/core"]) add_dependency(s, "React-NativeModulesApple", :additional_framework_paths => ["build/generated/ios"]) end diff --git a/packages/react-native/Libraries/NativeAnimation/React-RCTAnimation.podspec b/packages/react-native/Libraries/NativeAnimation/React-RCTAnimation.podspec index fe5a5786da6..c9f32c9eea7 100644 --- a/packages/react-native/Libraries/NativeAnimation/React-RCTAnimation.podspec +++ b/packages/react-native/Libraries/NativeAnimation/React-RCTAnimation.podspec @@ -22,7 +22,7 @@ folly_version = folly_config[:version] header_search_paths = [ "\"$(PODS_ROOT)/RCT-Folly\"", - "\"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\"", + "\"${PODS_ROOT}/Headers/Public/ReactCodegen/react/renderer/components\"", ] Pod::Spec.new do |s| @@ -49,7 +49,7 @@ Pod::Spec.new do |s| s.dependency "React-jsi" s.dependency "React-Core/RCTAnimationHeaders" - add_dependency(s, "React-Codegen", :additional_framework_paths => ["build/generated/ios"]) + add_dependency(s, "ReactCodegen", :additional_framework_paths => ["build/generated/ios"]) add_dependency(s, "ReactCommon", :subspec => "turbomodule/core", :additional_framework_paths => ["react/nativemodule/core"]) add_dependency(s, "React-NativeModulesApple") end diff --git a/packages/react-native/Libraries/Network/React-RCTNetwork.podspec b/packages/react-native/Libraries/Network/React-RCTNetwork.podspec index 179f0da985a..d88cbe7574a 100644 --- a/packages/react-native/Libraries/Network/React-RCTNetwork.podspec +++ b/packages/react-native/Libraries/Network/React-RCTNetwork.podspec @@ -22,7 +22,7 @@ folly_version = folly_config[:version] header_search_paths = [ "\"$(PODS_ROOT)/RCT-Folly\"", - "\"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\"", + "\"${PODS_ROOT}/Headers/Public/ReactCodegen/react/renderer/components\"", ] Pod::Spec.new do |s| @@ -50,7 +50,7 @@ Pod::Spec.new do |s| s.dependency "React-jsi" s.dependency "React-Core/RCTNetworkHeaders" - add_dependency(s, "React-Codegen", :additional_framework_paths => ["build/generated/ios"]) + add_dependency(s, "ReactCodegen", :additional_framework_paths => ["build/generated/ios"]) add_dependency(s, "ReactCommon", :subspec => "turbomodule/core", :additional_framework_paths => ["react/nativemodule/core"]) add_dependency(s, "React-NativeModulesApple", :additional_framework_paths => ["build/generated/ios"]) end diff --git a/packages/react-native/Libraries/PushNotificationIOS/React-RCTPushNotification.podspec b/packages/react-native/Libraries/PushNotificationIOS/React-RCTPushNotification.podspec index 14002a521e9..7a82e20d911 100644 --- a/packages/react-native/Libraries/PushNotificationIOS/React-RCTPushNotification.podspec +++ b/packages/react-native/Libraries/PushNotificationIOS/React-RCTPushNotification.podspec @@ -22,7 +22,7 @@ folly_version = folly_config[:version] header_search_paths = [ "\"$(PODS_ROOT)/RCT-Folly\"", - "\"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\"", + "\"${PODS_ROOT}/Headers/Public/ReactCodegen/react/renderer/components\"", ] Pod::Spec.new do |s| @@ -50,7 +50,7 @@ Pod::Spec.new do |s| s.dependency "React-Core/RCTPushNotificationHeaders" s.dependency "React-jsi" - add_dependency(s, "React-Codegen", :additional_framework_paths => ["build/generated/ios"]) + add_dependency(s, "ReactCodegen", :additional_framework_paths => ["build/generated/ios"]) add_dependency(s, "ReactCommon", :subspec => "turbomodule/core", :additional_framework_paths => ["react/nativemodule/core"]) add_dependency(s, "React-NativeModulesApple") end diff --git a/packages/react-native/Libraries/Settings/React-RCTSettings.podspec b/packages/react-native/Libraries/Settings/React-RCTSettings.podspec index 30f9bdbb1ed..4105f324fa4 100644 --- a/packages/react-native/Libraries/Settings/React-RCTSettings.podspec +++ b/packages/react-native/Libraries/Settings/React-RCTSettings.podspec @@ -22,7 +22,7 @@ folly_version = folly_config[:version] header_search_paths = [ "\"$(PODS_ROOT)/RCT-Folly\"", - "\"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\"", + "\"${PODS_ROOT}/Headers/Public/ReactCodegen/react/renderer/components\"", ] Pod::Spec.new do |s| @@ -50,7 +50,7 @@ Pod::Spec.new do |s| s.dependency "React-jsi" s.dependency "React-Core/RCTSettingsHeaders" - add_dependency(s, "React-Codegen", :additional_framework_paths => ["build/generated/ios"]) + add_dependency(s, "ReactCodegen", :additional_framework_paths => ["build/generated/ios"]) add_dependency(s, "ReactCommon", :subspec => "turbomodule/core", :additional_framework_paths => ["react/nativemodule/core"]) add_dependency(s, "React-NativeModulesApple", :additional_framework_paths => ["build/generated/ios"]) end diff --git a/packages/react-native/Libraries/Vibration/React-RCTVibration.podspec b/packages/react-native/Libraries/Vibration/React-RCTVibration.podspec index e6b7d69cde4..3685818c8e7 100644 --- a/packages/react-native/Libraries/Vibration/React-RCTVibration.podspec +++ b/packages/react-native/Libraries/Vibration/React-RCTVibration.podspec @@ -22,7 +22,7 @@ folly_version = folly_config[:version] header_search_paths = [ "\"$(PODS_ROOT)/RCT-Folly\"", - "\"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\"", + "\"${PODS_ROOT}/Headers/Public/ReactCodegen/react/renderer/components\"", ] Pod::Spec.new do |s| @@ -50,7 +50,7 @@ Pod::Spec.new do |s| s.dependency "React-jsi" s.dependency "React-Core/RCTVibrationHeaders" - add_dependency(s, "React-Codegen", :additional_framework_paths => ["build/generated/ios"]) + add_dependency(s, "ReactCodegen", :additional_framework_paths => ["build/generated/ios"]) add_dependency(s, "ReactCommon", :subspec => "turbomodule/core", :additional_framework_paths => ["react/nativemodule/core"]) add_dependency(s, "React-NativeModulesApple") end diff --git a/packages/react-native/React/CoreModules/React-CoreModules.podspec b/packages/react-native/React/CoreModules/React-CoreModules.podspec index b6f2cfb1e23..f29771e5c3e 100644 --- a/packages/react-native/React/CoreModules/React-CoreModules.podspec +++ b/packages/react-native/React/CoreModules/React-CoreModules.podspec @@ -27,7 +27,7 @@ header_search_paths = [ "\"$(PODS_ROOT)/RCT-Folly\"", "\"$(PODS_ROOT)/DoubleConversion\"", "\"$(PODS_ROOT)/fmt/include\"", - "\"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\"", + "\"${PODS_ROOT}/Headers/Public/ReactCodegen/react/renderer/components\"", ] Pod::Spec.new do |s| @@ -59,7 +59,7 @@ Pod::Spec.new do |s| s.dependency "SocketRocket", socket_rocket_version add_dependency(s, "React-jsinspector", :framework_name => 'jsinspector_modern') - add_dependency(s, "React-Codegen") + add_dependency(s, "ReactCodegen") add_dependency(s, "ReactCommon", :subspec => "turbomodule/core", :additional_framework_paths => ["react/nativemodule/core"]) add_dependency(s, "React-NativeModulesApple") end diff --git a/packages/react-native/React/React-RCTFabric.podspec b/packages/react-native/React/React-RCTFabric.podspec index 5781df022f9..9a28eeec44d 100644 --- a/packages/react-native/React/React-RCTFabric.podspec +++ b/packages/react-native/React/React-RCTFabric.podspec @@ -30,7 +30,7 @@ header_search_paths = [ "\"$(PODS_ROOT)/RCT-Folly\"", "\"$(PODS_ROOT)/Headers/Private/React-Core\"", "\"$(PODS_ROOT)/Headers/Private/Yoga\"", - "\"$(PODS_ROOT)/Headers/Public/React-Codegen\"", + "\"$(PODS_ROOT)/Headers/Public/ReactCodegen\"", ] if ENV['USE_FRAMEWORKS'] diff --git a/packages/react-native/ReactCommon/React-FabricImage.podspec b/packages/react-native/ReactCommon/React-FabricImage.podspec index be125c11dee..4380d05d6dd 100644 --- a/packages/react-native/ReactCommon/React-FabricImage.podspec +++ b/packages/react-native/ReactCommon/React-FabricImage.podspec @@ -38,7 +38,7 @@ if ENV['USE_FRAMEWORKS'] "\"$(PODS_TARGET_SRCROOT)\"", "\"$(PODS_TARGET_SRCROOT)/react/renderer/textlayoutmanager/platform/ios\"", "\"$(PODS_TARGET_SRCROOT)/react/renderer/components/textinput/platform/ios\"", - # "\"$(PODS_CONFIGURATION_BUILD_DIR)/React-Codegen/React_Codegen.framework/Headers\"", + # "\"$(PODS_CONFIGURATION_BUILD_DIR)/ReactCodegen/ReactCodegen.framework/Headers\"", ] end diff --git a/packages/react-native/ReactCommon/react/nativemodule/samples/ReactCommon-Samples.podspec b/packages/react-native/ReactCommon/react/nativemodule/samples/ReactCommon-Samples.podspec index a034edc582e..5c6fc31aa53 100644 --- a/packages/react-native/ReactCommon/react/nativemodule/samples/ReactCommon-Samples.podspec +++ b/packages/react-native/ReactCommon/react/nativemodule/samples/ReactCommon-Samples.podspec @@ -64,7 +64,7 @@ Pod::Spec.new do |s| s.dependency "React-Core" s.dependency "React-cxxreact" s.dependency "React-jsi" - add_dependency(s, "React-Codegen", :additional_framework_paths => ["build/generated/ios"]) + add_dependency(s, "ReactCodegen", :additional_framework_paths => ["build/generated/ios"]) add_dependency(s, "ReactCommon", :subspec => "turbomodule/core", :additional_framework_paths => ["react/nativemodule/core"]) add_dependency(s, "React-NativeModulesApple", :additional_framework_paths => ["build/generated/ios"]) diff --git a/packages/react-native/scripts/cocoapods/__tests__/codegen_utils-test.rb b/packages/react-native/scripts/cocoapods/__tests__/codegen_utils-test.rb index 194faddaa88..04c3c8674ee 100644 --- a/packages/react-native/scripts/cocoapods/__tests__/codegen_utils-test.rb +++ b/packages/react-native/scripts/cocoapods/__tests__/codegen_utils-test.rb @@ -64,7 +64,7 @@ class CodegenUtilsTests < Test::Unit::TestCase CodegenUtils.new().generate_react_codegen_podspec!(spec, codegen_output_dir, file_manager: FileMock) # Assert - assert_equal(Pod::UI.collected_messages, ["[Codegen] Skipping React-Codegen podspec generation."]) + assert_equal(Pod::UI.collected_messages, ["[Codegen] Skipping ReactCodegen podspec generation."]) assert_equal(Pathname.pwd_invocation_count, 0) assert_equal(Pod::Executable.executed_commands, []) assert_equal(Pod::Config.instance.installation_root.relative_path_from_invocation_count, 0) @@ -83,8 +83,8 @@ class CodegenUtilsTests < Test::Unit::TestCase assert_equal(Pathname.pwd_invocation_count, 1) assert_equal(Pod::Config.instance.installation_root.relative_path_from_invocation_count, 1) assert_equal(Pod::Executable.executed_commands, [{ "command" => 'mkdir', "arguments" => ["-p", "~/app/ios/build"]}]) - assert_equal(Pod::UI.collected_messages, ["[Codegen] Generating ~/app/ios/build/React-Codegen.podspec.json"]) - assert_equal(FileMock.open_files_with_mode["~/app/ios/build/React-Codegen.podspec.json"], 'w') + assert_equal(Pod::UI.collected_messages, ["[Codegen] Generating ~/app/ios/build/ReactCodegen.podspec.json"]) + assert_equal(FileMock.open_files_with_mode["~/app/ios/build/ReactCodegen.podspec.json"], 'w') assert_equal(FileMock.open_files[0].collected_write, ['{"name":"Test Podspec"}']) assert_equal(FileMock.open_files[0].fsync_invocation_count, 1) @@ -108,7 +108,7 @@ class CodegenUtilsTests < Test::Unit::TestCase # Assert assert_equal(podspec, get_podspec_fabric_and_script_phases("echo Test Script Phase")) - assert_equal(Pod::UI.collected_messages, ["[Codegen] Adding script_phases to React-Codegen."]) + assert_equal(Pod::UI.collected_messages, ["[Codegen] Adding script_phases to ReactCodegen."]) end def testGetReactCodegenSpec_whenUseFrameworksAndNewArch_generatesAPodspec @@ -337,7 +337,7 @@ class CodegenUtilsTests < Test::Unit::TestCase # Arrange app_path = "~/app" computed_script = "echo TestScript" - codegen_spec = {"name" => "React-Codegen"} + codegen_spec = {"name" => "ReactCodegen"} codegen_utils_mock = CodegenUtilsMock.new( :react_codegen_script_phases => computed_script, @@ -370,7 +370,7 @@ class CodegenUtilsTests < Test::Unit::TestCase }]) assert_equal(codegen_utils_mock.generate_react_codegen_spec_params, [{ :codegen_output_dir=>"build/generated/ios", - :react_codegen_spec=>{"name"=>"React-Codegen"} + :react_codegen_spec=>{"name"=>"ReactCodegen"} }]) assert_equal(Pod::Executable.executed_commands, [ { @@ -501,7 +501,7 @@ class CodegenUtilsTests < Test::Unit::TestCase def get_podspec_no_fabric_no_script spec = { - 'name' => "React-Codegen", + 'name' => "ReactCodegen", 'version' => "99.98.97", 'summary' => 'Temp pod for generated files for React Native', 'homepage' => 'https://facebook.com/', @@ -522,7 +522,7 @@ class CodegenUtilsTests < Test::Unit::TestCase "\"$(PODS_ROOT)/RCT-Folly\"", "\"$(PODS_ROOT)/DoubleConversion\"", "\"$(PODS_ROOT)/fmt/include\"", - "\"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\"", + "\"${PODS_ROOT}/Headers/Public/ReactCodegen/react/renderer/components\"", "\"$(PODS_ROOT)/Headers/Private/React-Fabric\"", "\"$(PODS_ROOT)/Headers/Private/React-RCTFabric\"", "\"$(PODS_ROOT)/Headers/Private/Yoga\"", diff --git a/packages/react-native/scripts/cocoapods/__tests__/new_architecture-test.rb b/packages/react-native/scripts/cocoapods/__tests__/new_architecture-test.rb index d5c204eb2e7..328a705b8dc 100644 --- a/packages/react-native/scripts/cocoapods/__tests__/new_architecture-test.rb +++ b/packages/react-native/scripts/cocoapods/__tests__/new_architecture-test.rb @@ -161,7 +161,7 @@ class NewArchitectureTests < Test::Unit::TestCase { :dependency_name => "RCT-Folly", "version"=>"2024.01.01.00" }, { :dependency_name => "glog" }, { :dependency_name => "React-RCTFabric" }, - { :dependency_name => "React-Codegen" }, + { :dependency_name => "ReactCodegen" }, { :dependency_name => "RCTRequired" }, { :dependency_name => "RCTTypeSafety" }, { :dependency_name => "ReactCommon/turbomodule/bridging" }, @@ -184,7 +184,7 @@ class NewArchitectureTests < Test::Unit::TestCase # Arrange spec = SpecMock.new spec.compiler_flags = '' - other_flags = "\"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/boost\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-Codegen/React_Codegen.framework/Headers\"" + other_flags = "\"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/boost\" \"${PODS_CONFIGURATION_BUILD_DIR}/ReactCodegen/ReactCodegen.framework/Headers\"" spec.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => other_flags } @@ -203,7 +203,7 @@ class NewArchitectureTests < Test::Unit::TestCase { :dependency_name => "RCT-Folly", "version"=>"2024.01.01.00" }, { :dependency_name => "glog" }, { :dependency_name => "React-RCTFabric" }, - { :dependency_name => "React-Codegen" }, + { :dependency_name => "ReactCodegen" }, { :dependency_name => "RCTRequired" }, { :dependency_name => "RCTTypeSafety" }, { :dependency_name => "ReactCommon/turbomodule/bridging" }, diff --git a/packages/react-native/scripts/cocoapods/__tests__/utils-test.rb b/packages/react-native/scripts/cocoapods/__tests__/utils-test.rb index 2b25929fe32..d5089aae641 100644 --- a/packages/react-native/scripts/cocoapods/__tests__/utils-test.rb +++ b/packages/react-native/scripts/cocoapods/__tests__/utils-test.rb @@ -764,7 +764,7 @@ class UtilsTests < Test::Unit::TestCase first_target = prepare_target("FirstTarget") second_target = prepare_target("SecondTarget", nil, [ DependencyMock.new("RCT-Folly"), - DependencyMock.new("React-Codegen"), + DependencyMock.new("ReactCodegen"), DependencyMock.new("ReactCommon"), DependencyMock.new("React-RCTFabric"), DependencyMock.new("React-ImageManager"), @@ -798,7 +798,7 @@ class UtilsTests < Test::Unit::TestCase if pod_name == "SecondTarget" target_installation_result.native_target.build_configurations.each do |config| received_search_path = config.build_settings["HEADER_SEARCH_PATHS"] - expected_Search_path = "$(inherited) \"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/fmt/include\" \"$(PODS_ROOT)/boost\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-Codegen/React_Codegen.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-RCTFabric/RCTFabric.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers/react/renderer/components/view/platform/cxx\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-FabricImage/React_FabricImage.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-Graphics/React_graphics.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-Graphics/React_graphics.framework/Headers/react/renderer/graphics/platform/ios\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers/react/renderer/imagemanager/platform/ios\"" + expected_Search_path = "$(inherited) \"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/fmt/include\" \"$(PODS_ROOT)/boost\" \"${PODS_CONFIGURATION_BUILD_DIR}/ReactCodegen/ReactCodegen.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-RCTFabric/RCTFabric.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers/react/renderer/components/view/platform/cxx\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-FabricImage/React_FabricImage.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-Graphics/React_graphics.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-Graphics/React_graphics.framework/Headers/react/renderer/graphics/platform/ios\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers/react/renderer/imagemanager/platform/ios\"" assert_equal(received_search_path, expected_Search_path) end else diff --git a/packages/react-native/scripts/cocoapods/codegen_utils.rb b/packages/react-native/scripts/cocoapods/codegen_utils.rb index ebdc01e9fef..6669f729bbd 100644 --- a/packages/react-native/scripts/cocoapods/codegen_utils.rb +++ b/packages/react-native/scripts/cocoapods/codegen_utils.rb @@ -43,7 +43,7 @@ class CodegenUtils # This podspec file should only be create once in the session/pod install. # This happens when multiple targets are calling use_react_native!. if @@REACT_CODEGEN_PODSPEC_GENERATED - Pod::UI.puts "[Codegen] Skipping React-Codegen podspec generation." + Pod::UI.puts "[Codegen] Skipping ReactCodegen podspec generation." return end @@ -51,7 +51,7 @@ class CodegenUtils output_dir = "#{relative_installation_root}/#{codegen_output_dir}" Pod::Executable.execute_command("mkdir", ["-p", output_dir]); - podspec_path = file_manager.join(output_dir, 'React-Codegen.podspec.json') + podspec_path = file_manager.join(output_dir, 'ReactCodegen.podspec.json') Pod::UI.puts "[Codegen] Generating #{podspec_path}" file_manager.open(podspec_path, 'w') do |f| @@ -62,7 +62,7 @@ class CodegenUtils @@REACT_CODEGEN_PODSPEC_GENERATED = true end - # It generates the podspec object that represents the `React-Codegen.podspec` file + # It generates the podspec object that represents the `ReactCodegen.podspec` file # # Parameters # - package_json_file: the path to the `package.json`, required to extract the proper React Native version @@ -81,7 +81,7 @@ class CodegenUtils "\"$(PODS_ROOT)/RCT-Folly\"", "\"$(PODS_ROOT)/DoubleConversion\"", "\"$(PODS_ROOT)/fmt/include\"", - "\"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\"", + "\"${PODS_ROOT}/Headers/Public/ReactCodegen/react/renderer/components\"", "\"$(PODS_ROOT)/Headers/Private/React-Fabric\"", "\"$(PODS_ROOT)/Headers/Private/React-RCTFabric\"", "\"$(PODS_ROOT)/Headers/Private/Yoga\"", @@ -108,7 +108,7 @@ class CodegenUtils end spec = { - 'name' => "React-Codegen", + 'name' => "ReactCodegen", 'version' => version, 'summary' => 'Temp pod for generated files for React Native', 'homepage' => 'https://facebook.com/', @@ -156,7 +156,7 @@ class CodegenUtils end if script_phases - Pod::UI.puts "[Codegen] Adding script_phases to React-Codegen." + Pod::UI.puts "[Codegen] Adding script_phases to ReactCodegen." spec[:'script_phases'] = script_phases end @@ -298,7 +298,7 @@ class CodegenUtils Pod::UI.warn '[Codegen] warn: using experimental new codegen integration' relative_installation_root = Pod::Config.instance.installation_root.relative_path_from(Pathname.pwd) - # Generate React-Codegen podspec here to add the script phases. + # Generate ReactCodegen podspec here to add the script phases. script_phases = codegen_utils.get_react_codegen_script_phases( app_path, :fabric_enabled => fabric_enabled, diff --git a/packages/react-native/scripts/cocoapods/new_architecture.rb b/packages/react-native/scripts/cocoapods/new_architecture.rb index d9a24ae54f2..2f3212a2ec4 100644 --- a/packages/react-native/scripts/cocoapods/new_architecture.rb +++ b/packages/react-native/scripts/cocoapods/new_architecture.rb @@ -114,7 +114,7 @@ class NewArchitectureHelper ReactNativePodsUtils.add_flag_to_map_with_inheritance(current_config, "OTHER_CPLUSPLUSFLAGS", self.computeFlags(new_arch_enabled)) spec.dependency "React-RCTFabric" # This is for Fabric Component - spec.dependency "React-Codegen" + spec.dependency "ReactCodegen" spec.dependency "RCTRequired" spec.dependency "RCTTypeSafety" diff --git a/packages/react-native/scripts/cocoapods/utils.rb b/packages/react-native/scripts/cocoapods/utils.rb index 6df005cee4f..ffe6a70c7e9 100644 --- a/packages/react-native/scripts/cocoapods/utils.rb +++ b/packages/react-native/scripts/cocoapods/utils.rb @@ -529,9 +529,9 @@ class ReactNativePodsUtils end def self.set_codegen_search_paths(target_installation_result) - header_search_paths = ReactNativePodsUtils.create_header_search_path_for_frameworks("PODS_CONFIGURATION_BUILD_DIR", "React-Codegen", "React_Codegen", []) + header_search_paths = ReactNativePodsUtils.create_header_search_path_for_frameworks("PODS_CONFIGURATION_BUILD_DIR", "ReactCodegen", "ReactCodegen", []) .map { |search_path| "\"#{search_path}\"" } - ReactNativePodsUtils.update_header_paths_if_depends_on(target_installation_result, "React-Codegen", header_search_paths) + ReactNativePodsUtils.update_header_paths_if_depends_on(target_installation_result, "ReactCodegen", header_search_paths) end def self.set_reactcommon_searchpaths(target_installation_result) @@ -564,7 +564,7 @@ class ReactNativePodsUtils "RCTRequired", "RCTTypeSafety", "React", - "React-Codegen", + "ReactCodegen", "React-Core", "React-CoreModules", "React-Fabric", diff --git a/packages/react-native/scripts/react_native_pods.rb b/packages/react-native/scripts/react_native_pods.rb index 0943e9029e9..7752d48f425 100644 --- a/packages/react-native/scripts/react_native_pods.rb +++ b/packages/react-native/scripts/react_native_pods.rb @@ -169,7 +169,7 @@ def use_react_native! ( :folly_version => folly_config[:version] ) - pod 'React-Codegen', :path => $CODEGEN_OUTPUT_DIR, :modular_headers => true + pod 'ReactCodegen', :path => $CODEGEN_OUTPUT_DIR, :modular_headers => true # Always need fabric to access the RCTSurfacePresenterBridgeAdapter which allow to enable the RuntimeScheduler # If the New Arch is turned off, we will use the Old Renderer, though. @@ -286,7 +286,7 @@ def react_native_post_install( ReactNativePodsUtils.set_use_hermes_build_setting(installer, hermes_enabled) ReactNativePodsUtils.set_node_modules_user_settings(installer, react_native_path) ReactNativePodsUtils.set_ccache_compiler_and_linker_build_settings(installer, react_native_path, ccache_enabled) - ReactNativePodsUtils.apply_xcode_15_patch(installer) + ReactNativePodsUtils.apply_xcode_15_patch(installer) ReactNativePodsUtils.updateOSDeploymentTarget(installer) ReactNativePodsUtils.set_dynamic_frameworks_flags(installer) ReactNativePodsUtils.add_ndebug_flag_to_pods_in_release(installer) diff --git a/packages/rn-tester/NativeComponentExample/MyNativeView.podspec b/packages/rn-tester/NativeComponentExample/MyNativeView.podspec index 2e4eb0613d9..fd9f314c6d6 100644 --- a/packages/rn-tester/NativeComponentExample/MyNativeView.podspec +++ b/packages/rn-tester/NativeComponentExample/MyNativeView.podspec @@ -22,7 +22,7 @@ Pod::Spec.new do |s| s.author = "Meta Platforms, Inc. and its affiliates" s.source = { :git => "https://github.com/facebook/my-native-view.git", :tag => "#{s.version}" } s.pod_target_xcconfig = { - "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/boost\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-Codegen/React_Codegen.framework/Headers\"", + "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/boost\" \"${PODS_CONFIGURATION_BUILD_DIR}/ReactCodegen/ReactCodegen.framework/Headers\"", "CLANG_CXX_LANGUAGE_STANDARD" => "c++20" } diff --git a/packages/rn-tester/NativeCxxModuleExample/NativeCxxModuleExample.h b/packages/rn-tester/NativeCxxModuleExample/NativeCxxModuleExample.h index 9017ab9f7b6..327744b0c17 100644 --- a/packages/rn-tester/NativeCxxModuleExample/NativeCxxModuleExample.h +++ b/packages/rn-tester/NativeCxxModuleExample/NativeCxxModuleExample.h @@ -7,8 +7,8 @@ #pragma once -#if __has_include() // CocoaPod headers on Apple -#include +#if __has_include() // CocoaPod headers on Apple +#include #elif __has_include("AppSpecsJSI.h") // Cmake headers on Android #include "AppSpecsJSI.h" #else // BUCK headers diff --git a/packages/rn-tester/Podfile.lock b/packages/rn-tester/Podfile.lock index 66e57f4f87b..1f0abbe7382 100644 --- a/packages/rn-tester/Podfile.lock +++ b/packages/rn-tester/Podfile.lock @@ -20,7 +20,6 @@ PODS: - RCT-Folly (= 2024.01.01.00) - RCTRequired - RCTTypeSafety - - React-Codegen - React-Core - React-debug - React-Fabric @@ -31,6 +30,7 @@ PODS: - React-RCTFabric - React-rendererdebug - React-utils + - ReactCodegen - ReactCommon/turbomodule/bridging - ReactCommon/turbomodule/core - Yoga @@ -41,7 +41,6 @@ PODS: - RCT-Folly (= 2024.01.01.00) - RCTRequired - RCTTypeSafety - - React-Codegen - React-Core - React-debug - React-Fabric @@ -52,6 +51,7 @@ PODS: - React-RCTFabric - React-rendererdebug - React-utils + - ReactCodegen - ReactCommon/turbomodule/bridging - ReactCommon/turbomodule/core - Yoga @@ -92,26 +92,6 @@ PODS: - React-RCTText (= 1000.0.0) - React-RCTVibration (= 1000.0.0) - React-callinvoker (1000.0.0) - - React-Codegen (1000.0.0): - - DoubleConversion - - glog - - hermes-engine - - RCT-Folly - - RCTRequired - - RCTTypeSafety - - React-Core - - React-debug - - React-Fabric - - React-FabricImage - - React-featureflags - - React-graphics - - React-jsi - - React-jsiexecutor - - React-NativeModulesApple - - React-rendererdebug - - React-utils - - ReactCommon/turbomodule/bridging - - ReactCommon/turbomodule/core - React-Core (1000.0.0): - glog - hermes-engine @@ -372,13 +352,13 @@ PODS: - fmt (= 9.1.0) - RCT-Folly (= 2024.01.01.00) - RCTTypeSafety (= 1000.0.0) - - React-Codegen - React-Core/CoreModulesHeaders (= 1000.0.0) - React-jsi (= 1000.0.0) - React-jsinspector - React-NativeModulesApple - React-RCTBlob - React-RCTImage (= 1000.0.0) + - ReactCodegen - ReactCommon - SocketRocket (= 0.7.0) - React-cxxreact (1000.0.0): @@ -952,8 +932,9 @@ PODS: - React-cxxreact (= 1000.0.0) - React-jsi - React-jsiexecutor (= 1000.0.0) - - React-jsinspector (= 1000.0.0) + - React-jsinspector - React-perflogger (= 1000.0.0) + - React-runtimeexecutor - React-ImageManager (1000.0.0): - glog - RCT-Folly/Fabric @@ -988,8 +969,11 @@ PODS: - React-jsinspector (1000.0.0): - DoubleConversion - glog + - hermes-engine - RCT-Folly (= 2024.01.01.00) - React-featureflags + - React-jsi + - React-runtimeexecutor (= 1000.0.0) - React-jsitracing (1000.0.0): - React-jsi - React-logger (1000.0.0): @@ -1015,10 +999,10 @@ PODS: - React-RCTAnimation (1000.0.0): - RCT-Folly (= 2024.01.01.00) - RCTTypeSafety - - React-Codegen - React-Core/RCTAnimationHeaders - React-jsi - React-NativeModulesApple + - ReactCodegen - ReactCommon - React-RCTAppDelegate (1000.0.0): - RCT-Folly (= 2024.01.01.00) @@ -1041,19 +1025,20 @@ PODS: - React-RuntimeHermes - React-runtimescheduler - React-utils + - ReactCodegen - ReactCommon - React-RCTBlob (1000.0.0): - DoubleConversion - fmt (= 9.1.0) - hermes-engine - RCT-Folly (= 2024.01.01.00) - - React-Codegen - React-Core/RCTBlobHeaders - React-Core/RCTWebSocket - React-jsi - React-jsinspector - React-NativeModulesApple - React-RCTNetwork + - ReactCodegen - ReactCommon - React-RCTFabric (1000.0.0): - glog @@ -1063,6 +1048,7 @@ PODS: - React-debug - React-Fabric - React-FabricImage + - React-featureflags - React-graphics - React-ImageManager - React-jsi @@ -1077,41 +1063,41 @@ PODS: - React-RCTImage (1000.0.0): - RCT-Folly (= 2024.01.01.00) - RCTTypeSafety - - React-Codegen - React-Core/RCTImageHeaders - React-jsi - React-NativeModulesApple - React-RCTNetwork + - ReactCodegen - ReactCommon - React-RCTLinking (1000.0.0): - - React-Codegen - React-Core/RCTLinkingHeaders (= 1000.0.0) - React-jsi (= 1000.0.0) - React-NativeModulesApple + - ReactCodegen - ReactCommon - ReactCommon/turbomodule/core (= 1000.0.0) - React-RCTNetwork (1000.0.0): - RCT-Folly (= 2024.01.01.00) - RCTTypeSafety - - React-Codegen - React-Core/RCTNetworkHeaders - React-jsi - React-NativeModulesApple + - ReactCodegen - ReactCommon - React-RCTPushNotification (1000.0.0): - RCTTypeSafety - - React-Codegen - React-Core/RCTPushNotificationHeaders - React-jsi - React-NativeModulesApple + - ReactCodegen - ReactCommon - React-RCTSettings (1000.0.0): - RCT-Folly (= 2024.01.01.00) - RCTTypeSafety - - React-Codegen - React-Core/RCTSettingsHeaders - React-jsi - React-NativeModulesApple + - ReactCodegen - ReactCommon - React-RCTTest (1000.0.0): - RCT-Folly (= 2024.01.01.00) @@ -1124,10 +1110,10 @@ PODS: - Yoga - React-RCTVibration (1000.0.0): - RCT-Folly (= 2024.01.01.00) - - React-Codegen - React-Core/RCTVibrationHeaders - React-jsi - React-NativeModulesApple + - ReactCodegen - ReactCommon - React-rendererdebug (1000.0.0): - DoubleConversion @@ -1172,7 +1158,9 @@ PODS: - hermes-engine - RCT-Folly/Fabric (= 2024.01.01.00) - React-featureflags + - React-hermes - React-jsi + - React-jsinspector - React-jsitracing - React-nativeconfig - React-RuntimeCore @@ -1191,21 +1179,42 @@ PODS: - React-utils - React-utils (1000.0.0): - glog + - hermes-engine - RCT-Folly (= 2024.01.01.00) - React-debug + - React-jsi (= 1000.0.0) + - ReactCodegen (1000.0.0): + - DoubleConversion + - glog + - hermes-engine + - RCT-Folly + - RCTRequired + - RCTTypeSafety + - React-Core + - React-debug + - React-Fabric + - React-FabricImage + - React-featureflags + - React-graphics + - React-jsi + - React-jsiexecutor + - React-NativeModulesApple + - React-rendererdebug + - React-utils + - ReactCommon/turbomodule/bridging + - ReactCommon/turbomodule/core - ReactCommon (1000.0.0): - - React-logger (= 1000.0.0) - ReactCommon/turbomodule (= 1000.0.0) - ReactCommon-Samples (1000.0.0): - DoubleConversion - fmt (= 9.1.0) - hermes-engine - RCT-Folly - - React-Codegen - React-Core - React-cxxreact - React-jsi - React-NativeModulesApple + - ReactCodegen - ReactCommon - ReactCommon/turbomodule (1000.0.0): - DoubleConversion @@ -1243,6 +1252,7 @@ PODS: - React-jsi (= 1000.0.0) - React-logger (= 1000.0.0) - React-perflogger (= 1000.0.0) + - React-utils (= 1000.0.0) - ScreenshotManager (0.0.1): - DoubleConversion - glog @@ -1250,7 +1260,6 @@ PODS: - RCT-Folly (= 2024.01.01.00) - RCTRequired - RCTTypeSafety - - React-Codegen - React-Core - React-debug - React-Fabric @@ -1261,6 +1270,7 @@ PODS: - React-RCTFabric - React-rendererdebug - React-utils + - ReactCodegen - ReactCommon/turbomodule/bridging - ReactCommon/turbomodule/core - Yoga @@ -1284,7 +1294,6 @@ DEPENDENCIES: - RCTTypeSafety (from `../react-native/Libraries/TypeSafety`) - React (from `../react-native/`) - React-callinvoker (from `../react-native/ReactCommon/callinvoker`) - - React-Codegen (from `build/generated/ios`) - React-Core (from `../react-native/`) - React-Core/RCTWebSocket (from `../react-native/`) - React-CoreModules (from `../react-native/React/CoreModules`) @@ -1327,6 +1336,7 @@ DEPENDENCIES: - React-RuntimeHermes (from `../react-native/ReactCommon/react/runtime`) - React-runtimescheduler (from `../react-native/ReactCommon/react/renderer/runtimescheduler`) - React-utils (from `../react-native/ReactCommon/react/utils`) + - ReactCodegen (from `build/generated/ios`) - ReactCommon-Samples (from `../react-native/ReactCommon/react/nativemodule/samples`) - ReactCommon/turbomodule/core (from `../react-native/ReactCommon`) - ScreenshotManager (from `NativeModuleExample`) @@ -1367,8 +1377,6 @@ EXTERNAL SOURCES: :path: "../react-native/" React-callinvoker: :path: "../react-native/ReactCommon/callinvoker" - React-Codegen: - :path: build/generated/ios React-Core: :path: "../react-native/" React-CoreModules: @@ -1451,6 +1459,8 @@ EXTERNAL SOURCES: :path: "../react-native/ReactCommon/react/renderer/runtimescheduler" React-utils: :path: "../react-native/ReactCommon/react/utils" + ReactCodegen: + :path: build/generated/ios ReactCommon: :path: "../react-native/ReactCommon" ReactCommon-Samples: @@ -1466,9 +1476,9 @@ SPEC CHECKSUMS: FBLazyVector: f4492a543c5a8fa1502d3a5867e3f7252497cfe8 fmt: 4c2741a687cc09f0634a2e2c72a838b99f1ff120 glog: c5d68082e772fa1c511173d6b30a9de2c05a69a2 - hermes-engine: b6ed6780e02b97c31d4d84407f579e3523177780 - MyNativeView: 08e59984e995c857953374e22082d058be3cb945 - NativeCxxModuleExample: 51569707f2da9a460d1ebf74a29d02f0a86c549e + hermes-engine: a1af2c958bf22d19bff4df14e977c77fb469d48f + MyNativeView: 34e8a4347e7fae110d5878e10740224ebbf881a6 + NativeCxxModuleExample: 64d8720a77e8c9ff9383f9a98af7045c510092c0 OCMock: 9491e4bec59e0b267d52a9184ff5605995e74be8 RCT-Folly: 045d6ecaa59d826c5736dfba0b2f4083ff8d79df RCTDeprecation: 3808e36294137f9ee5668f4df2e73dc079cd1dcf @@ -1476,53 +1486,53 @@ SPEC CHECKSUMS: RCTTypeSafety: 5f57d4ae5dfafc85a0f575d756c909b584722c52 React: cb6dc75e09f32aeddb4d8fb58a394a67219a92fe React-callinvoker: bae59cbd6affd712bbfc703839dad868ff35069d - React-Codegen: b66fa3765bc7a786e88e56ff92459a41dec00b0f React-Core: 738c8db837b21aae813479f2eb284d5507a5c256 - React-CoreModules: 0b94c427e958c1b7ce268d03aa39a1f424d76901 + React-CoreModules: 7647d54882adb778c614ac0053865ef1f92eb211 React-cxxreact: dadc89738f0089c3e2b85f36de940a088759b20d - React-debug: 4097205dd5ff0ada516e7df5b6721a9464a6f20b - React-Fabric: a3214cc064ca25e029aff0a42e2beb8c87b71861 - React-FabricImage: 6daf9bcd047ac1c424cfd7cae298089f8d495761 - React-featureflags: 36f601a77af59dca45877a298c804883dd04f8d0 - React-graphics: 8d54d923bef33e9f423d06c4fd51431f917a4b2f - React-hermes: 14e7007ebbfcc9f674c9c4f3ac768aa587b6da79 - React-ImageManager: 44304168f3ec4733a0191dadee7b1711291272f4 - React-jserrorhandler: 2809ae4d87fb880d2c18be72bcaed114e79f3993 + React-debug: 296b501a90c41f83961f58c6d96a01330d499da5 + React-Fabric: 1875e77c86078dfc0f116806f2de976d0df6da77 + React-FabricImage: da62cc5089fe6bdaa6ec0ab6ccca75c7d679065d + React-featureflags: 23f83a12963770bf3cff300e8990678192436b36 + React-graphics: 7e646eb47b666d2cb4e148ec4afcecc4253f1736 + React-hermes: 65dd94615e5cb47f0f2f7510231f80c65abf338c + React-ImageManager: 716592dcbe11a4960e1eb3d82adb264ee15b5f6d + React-jserrorhandler: 13a0cce4e1e445d2ace089dc6122fb85411a11b3 React-jsi: b7645527d3f77afdea4365488e47dbc5b293177f React-jsiexecutor: 42eeb6b4e73e1b50caa3940ad0189171723c6b29 - React-jsinspector: 363ee50f69cb39cc2ee4eef0705f2fc4a33f83f3 - React-jsitracing: 46474207a88a3978c08e191d9cf33a6457722d65 + React-jsinspector: 8c41e3113f94f08385a730aff19eb16af810c82d + React-jsitracing: dd08057dd5b74119cb406beb42028da85ed5b8a5 React-logger: 8486d7a1d32b972414b1d34a93470ee2562c6ee2 - React-Mapbuffer: 9d18546228182de42aae8cb047baa5e14886a922 - React-nativeconfig: a5a38eee09c6a57824489bf9005d46d2e3fbb78b - React-NativeModulesApple: ff03b94214a1628f920b43bb64964860fc227f9f + React-Mapbuffer: fd0d0306c1c4326be5f18a61e978d32a66b20a85 + React-nativeconfig: 40a2c848083ef4065c163c854e1c82b5f9e9db84 + React-NativeModulesApple: 48f0205edc54b8a1c24328f2deeb74b4f1570418 React-perflogger: 70d009f755dd10002183454cdf5ad9b22de4a1d7 React-RCTActionSheet: 943bd5f540f3af1e5a149c13c4de81858edf718a - React-RCTAnimation: 07583f0ebfa7154f0e696a75c32a8f8b180fc8c5 - React-RCTAppDelegate: 60cfe221df61de818f6e6b200ff55b4346e6ea7c - React-RCTBlob: 2dbf6931deac47ff5d3910e4c81cdd856ea239d6 - React-RCTFabric: e613b7e4aec23114ee6999295ca97b3f0508ee0f - React-RCTImage: 8f46d82257827c2332bc4108fddef1a840f440a7 - React-RCTLinking: efa67827466e50e07c5471447c12e474cbc5e336 - React-RCTNetwork: a80529d2d90f79caa5e31d49e840735a10d6d91a - React-RCTPushNotification: c34ef3969207da3ddc777f36a252f99754b89e2d - React-RCTSettings: 39ca10f68da0ec88a63c33152d43c222c8c38119 + React-RCTAnimation: 4d88a95a05dbb9a5cbc9a55e08f1a79364aeb206 + React-RCTAppDelegate: 560ef776e8bc5b4b478a839ac34ec3726e3dcb5c + React-RCTBlob: 74c2fa0adba3a2e4ebbc4f9fc4ec3c3691b93854 + React-RCTFabric: d5b371f6fabd59163270b60d42e6149457bb8212 + React-RCTImage: 2413fa5ca25235b878fb2694115b26b176280f31 + React-RCTLinking: 7c821b30c5b4401037ed3da63f9580ac42b9e02e + React-RCTNetwork: a556f5005d28d99df0b577d9ef8b28f29c0ff498 + React-RCTPushNotification: c0871d7ebfd7832a5763b571f68b936772654ed3 + React-RCTSettings: 25141964d76155f25dd993b87345656a29dd0d24 React-RCTTest: 3b9f62c66c3814ccace402441597160aefc9e812 React-RCTText: d9925903524a7b179cf7803162a98038e0bfb4fd - React-RCTVibration: 33bef249bc4a637ed91bf1cf0d94d9329381dc7b - React-rendererdebug: bc0f2a1816a4607e85ed603170a413c44c1d2635 - React-rncore: 79f594bc32c96203ab607bd9868ec76caa2f290c - React-RuntimeApple: 504b50d20ddf82de9c2c527c6b5a09119e03b737 - React-RuntimeCore: 9dc8d98bc09b0797c2dca7a30be5e8f84ecf5746 + React-RCTVibration: 63e015aa41be5e956440ebe8b8796f56ddd1acc8 + React-rendererdebug: 0abbd75e947eeae23542f3bf7491b048ae063141 + React-rncore: e903b3d2819a25674403c548ec103f34bf02ba2b + React-RuntimeApple: b43ad6a5d60157f37ff3139e4dfb0cd6340e9be6 + React-RuntimeCore: 7cfdac312222d7260d8ba9604686fbb4aa4f8a13 React-runtimeexecutor: e1c32bc249dd3cf3919cb4664fd8dc84ef70cff7 - React-RuntimeHermes: b1f60690c9ed90d448f1325355f72c662c02e49a - React-runtimescheduler: 0df238ee8e88e1b8874d332856ee7d36870be4ad - React-utils: 00c57742056c9c90e58b1a8cd06ca50d30528d6f - ReactCommon: 4148a8bfb8bbfdbea8f517f98cadeeb0f30c8de8 - ReactCommon-Samples: 5d703e2b5e1c8ddb812e7b7cace5a8effbcc6438 - ScreenshotManager: 823189e19d4e6f7d4792fe1db6b037df7efc2fab + React-RuntimeHermes: b19a99a600c6e1e33d7796cb91a5c76f92bd3407 + React-runtimescheduler: d5fecf52a345c1e557499ee86c864089c2a01fb8 + React-utils: f5525c0072f467cf2f25bdd8dbbf0835f6384972 + ReactCodegen: 23192ed6132b7eb93d61cc2ee8e21a816b361a37 + ReactCommon: 9ee429c89520684edefef7f68d5fa55e7f3478cc + ReactCommon-Samples: e2bf03c8237c461fa36bda8e4638368fa82b633c + ScreenshotManager: 2c0ba89924202a5717df5e9ded68536e68df64c7 SocketRocket: abac6f5de4d4d62d24e11868d7a2f427e0ef940d - Yoga: 53e99e2a727b8498ea9e8aed8d917b808c9ff2ea + Yoga: f58ba5e0ac1e7eb3ef4caedcf80c5aa39985b039 PODFILE CHECKSUM: 60b84dd598fc04e9ed84dbc82e2cb3b99b1d7adf diff --git a/packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj b/packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj index edfdf6aa584..4e7c3b9024a 100644 --- a/packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj +++ b/packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj @@ -7,7 +7,7 @@ objects = { /* Begin PBXBuildFile section */ - 00915AE8006CF5DB156153DD /* Pods_RNTester.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F9DA138FE541ED31A6C589D7 /* Pods_RNTester.framework */; }; + 08E25EBE4A584CD7B70FBB1E /* libPods-RNTester.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D74056A5352F0925816E50E0 /* libPods-RNTester.a */; }; 13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.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 */; }; @@ -15,8 +15,9 @@ 5C60EB1C226440DB0018C04F /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5C60EB1B226440DB0018C04F /* AppDelegate.mm */; }; 8145AE06241172D900A3F8DA /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8145AE05241172D900A3F8DA /* LaunchScreen.storyboard */; }; 832F45BB2A8A6E1F0097B4E6 /* SwiftTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 832F45BA2A8A6E1F0097B4E6 /* SwiftTest.swift */; }; - 836E54623F6567BB812F3F6A /* Pods_RNTesterUnitTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B5084412F9118F6F7FA99DA /* Pods_RNTesterUnitTests.framework */; }; + BEB82277FE76227A15DED9EF /* libPods-RNTesterIntegrationTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 77E101C7D8E22A8E70EE76DF /* libPods-RNTesterIntegrationTests.a */; }; CD10C7A5290BD4EB0033E1ED /* RCTEventEmitterTests.m in Sources */ = {isa = PBXBuildFile; fileRef = CD10C7A4290BD4EB0033E1ED /* RCTEventEmitterTests.m */; }; + D626973C1F0D4ABDE2F9028A /* libPods-RNTesterUnitTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D8DE57E3292D41E28251988A /* libPods-RNTesterUnitTests.a */; }; 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 */; }; @@ -55,7 +56,6 @@ E7DB216422B2F3EC005AC45F /* RCTUIManagerScenarioTests.m in Sources */ = {isa = PBXBuildFile; fileRef = E7DB215F22B2F3EC005AC45F /* RCTUIManagerScenarioTests.m */; }; E7DB216722B2F69F005AC45F /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7DB213022B2C649005AC45F /* JavaScriptCore.framework */; }; E7DB218C22B41FCD005AC45F /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7DB218B22B41FCD005AC45F /* XCTest.framework */; }; - FA45ED19FFAECF4CFEFE0DC7 /* Pods_RNTesterIntegrationTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 87E71F82CA94BF2D3CA3110A /* Pods_RNTesterIntegrationTests.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -88,18 +88,19 @@ 2DDEF00F1F84BF7B00DBDF73 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = RNTester/Images.xcassets; sourceTree = ""; }; 359825B9A5AE4A3F4AA612DD /* 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 = ""; }; 383889D923A7398900D06C3E /* RCTConvert_UIColorTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTConvert_UIColorTests.m; sourceTree = ""; }; - 3B5084412F9118F6F7FA99DA /* Pods_RNTesterUnitTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RNTesterUnitTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 3D2AFAF41D646CF80089D1A3 /* legacy_image@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "legacy_image@2x.png"; path = "RNTester/legacy_image@2x.png"; sourceTree = ""; }; 5C60EB1B226440DB0018C04F /* AppDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = AppDelegate.mm; path = RNTester/AppDelegate.mm; sourceTree = ""; }; 66C3087F2D5BF762FE9E6422 /* 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 = ""; }; + 77E101C7D8E22A8E70EE76DF /* libPods-RNTesterIntegrationTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-RNTesterIntegrationTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 7CDA7A212644C6BB8C0D00D8 /* 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 = ""; }; 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 = ""; }; - 87E71F82CA94BF2D3CA3110A /* Pods_RNTesterIntegrationTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RNTesterIntegrationTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 8BFB9C61D7BDE894E24BF24F /* 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 = ""; }; 9B8542B8C590B51BD0588751 /* 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 = ""; }; AC474BFB29BBD4A1002BDAED /* RNTester.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; name = RNTester.xctestplan; path = RNTester/RNTester.xctestplan; sourceTree = ""; }; CD10C7A4290BD4EB0033E1ED /* RCTEventEmitterTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTEventEmitterTests.m; sourceTree = ""; }; + D74056A5352F0925816E50E0 /* libPods-RNTester.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-RNTester.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + D8DE57E3292D41E28251988A /* libPods-RNTesterUnitTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-RNTesterUnitTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 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; }; @@ -161,7 +162,6 @@ E7DB215E22B2F3EC005AC45F /* RCTLoggingTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTLoggingTests.m; sourceTree = ""; }; E7DB215F22B2F3EC005AC45F /* RCTUIManagerScenarioTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTUIManagerScenarioTests.m; sourceTree = ""; }; E7DB218B22B41FCD005AC45F /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = XCTest.framework; sourceTree = DEVELOPER_DIR; }; - F9DA138FE541ED31A6C589D7 /* Pods_RNTester.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RNTester.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -169,7 +169,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 00915AE8006CF5DB156153DD /* Pods_RNTester.framework in Frameworks */, + 08E25EBE4A584CD7B70FBB1E /* libPods-RNTester.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -178,7 +178,7 @@ buildActionMask = 2147483647; files = ( E7DB213122B2C649005AC45F /* JavaScriptCore.framework in Frameworks */, - 836E54623F6567BB812F3F6A /* Pods_RNTesterUnitTests.framework in Frameworks */, + D626973C1F0D4ABDE2F9028A /* libPods-RNTesterUnitTests.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -188,7 +188,7 @@ files = ( E7DB218C22B41FCD005AC45F /* XCTest.framework in Frameworks */, E7DB216722B2F69F005AC45F /* JavaScriptCore.framework in Frameworks */, - FA45ED19FFAECF4CFEFE0DC7 /* Pods_RNTesterIntegrationTests.framework in Frameworks */, + BEB82277FE76227A15DED9EF /* libPods-RNTesterIntegrationTests.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -258,9 +258,9 @@ E7DB211822B2BD53005AC45F /* libReact-RCTText.a */, E7DB211A22B2BD53005AC45F /* libReact-RCTVibration.a */, E7DB212222B2BD53005AC45F /* libyoga.a */, - F9DA138FE541ED31A6C589D7 /* Pods_RNTester.framework */, - 87E71F82CA94BF2D3CA3110A /* Pods_RNTesterIntegrationTests.framework */, - 3B5084412F9118F6F7FA99DA /* Pods_RNTesterUnitTests.framework */, + D74056A5352F0925816E50E0 /* libPods-RNTester.a */, + 77E101C7D8E22A8E70EE76DF /* libPods-RNTesterIntegrationTests.a */, + D8DE57E3292D41E28251988A /* libPods-RNTesterUnitTests.a */, ); name = Frameworks; sourceTree = "";