react-native-tvos 0.74.3-0 → 0.74.5-0

package/ReactCommon/cxxreact/React-cxxreact.podspec

@@ -36,7 +36,7 @@ Pod::Spec.new do |s|
   s.compiler_flags         = folly_compiler_flags + ' ' + boost_compiler_flags
   s.pod_target_xcconfig    = {
     "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/fmt/include\" \"$(PODS_CONFIGURATION_BUILD_DIR)/React-debug/React_debug.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-runtimeexecutor/React_runtimeexecutor.framework/Headers\"",
-    "CLANG_CXX_LANGUAGE_STANDARD" => "c++20"
+    "CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard()
   }
   s.header_dir             = "cxxreact"
 

package/ReactCommon/cxxreact/ReactNativeVersion.h

@@ -17,7 +17,7 @@ namespace facebook::react {
 constexpr struct {
   int32_t Major = 0;
   int32_t Minor = 74;
-  int32_t Patch = 3;
+  int32_t Patch = 5;
   std::string_view Prerelease = "0";
 } ReactNativeVersion;
 

package/ReactCommon/hermes/React-hermes.podspec

@@ -37,7 +37,7 @@ Pod::Spec.new do |s|
   s.compiler_flags         = folly_compiler_flags + ' ' + boost_compiler_flags
   s.pod_target_xcconfig    = {
                                "HEADER_SEARCH_PATHS" => "\"${PODS_ROOT}/hermes-engine/destroot/include\" \"$(PODS_TARGET_SRCROOT)/..\" \"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/fmt/include\"",
-                               "CLANG_CXX_LANGUAGE_STANDARD" => "c++20"
+                               "CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard()
                              }
   s.header_dir             = "reacthermes"
   s.dependency "React-cxxreact", version

package/ReactCommon/hermes/executor/React-jsitracing.podspec

@@ -29,7 +29,7 @@ Pod::Spec.new do |s|
   s.header_dir             = "."
   s.pod_target_xcconfig    = { "HEADER_SEARCH_PATHS" => "\"${PODS_TARGET_SRCROOT}/../..\"",
                                 "USE_HEADERMAP" => "YES",
-                                "CLANG_CXX_LANGUAGE_STANDARD" => "c++20",
+                                "CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard(),
                                 "GCC_WARN_PEDANTIC" => "YES" }
 
   if ENV['USE_FRAMEWORKS']

package/ReactCommon/jserrorhandler/React-jserrorhandler.podspec

@@ -36,7 +36,7 @@ Pod::Spec.new do |s|
   s.source_files           = "JsErrorHandler.{cpp,h}"
   s.pod_target_xcconfig = {
     "USE_HEADERMAP" => "YES",
-    "CLANG_CXX_LANGUAGE_STANDARD" => "c++20"
+    "CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard()
   }
   s.compiler_flags         = folly_compiler_flags + ' ' + boost_compiler_flags
 

package/ReactCommon/jsiexecutor/React-jsiexecutor.podspec

@@ -33,7 +33,7 @@ Pod::Spec.new do |s|
   s.source_files         = "jsireact/*.{cpp,h}"
   s.compiler_flags         = folly_compiler_flags + ' ' + boost_compiler_flags
   s.pod_target_xcconfig    = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/fmt/include\"",
-                               "CLANG_CXX_LANGUAGE_STANDARD" => "c++20" }
+                               "CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard() }
   s.header_dir             = "jsireact"
 
   s.dependency "React-cxxreact", version

package/ReactCommon/jsinspector-modern/React-jsinspector.podspec

@@ -38,7 +38,7 @@ Pod::Spec.new do |s|
   s.compiler_flags         = folly_compiler_flags
   s.pod_target_xcconfig    = {
                                "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/..\" \"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/fmt/include\"",
-                               "CLANG_CXX_LANGUAGE_STANDARD" => "c++20",
+                               "CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard(),
                                "DEFINES_MODULE" => "YES"
   }.merge!(use_frameworks ? {
     "PUBLIC_HEADERS_FOLDER_PATH" => "#{module_name}.framework/Headers/#{header_dir}"

package/ReactCommon/react/debug/React-debug.podspec

@@ -27,7 +27,7 @@ Pod::Spec.new do |s|
   s.source                 = source
   s.source_files           = "**/*.{cpp,h}"
   s.header_dir             = "react/debug"
-  s.pod_target_xcconfig    = { "CLANG_CXX_LANGUAGE_STANDARD" => "c++20",
+  s.pod_target_xcconfig    = { "CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard(),
                                "DEFINES_MODULE" => "YES" }
 
   if ENV['USE_FRAMEWORKS']

package/ReactCommon/react/featureflags/React-featureflags.podspec

@@ -33,7 +33,7 @@ Pod::Spec.new do |s|
   s.source                 = source
   s.source_files           = "*.{cpp,h}"
   s.header_dir             = "react/featureflags"
-  s.pod_target_xcconfig    = { "CLANG_CXX_LANGUAGE_STANDARD" => "c++20",
+  s.pod_target_xcconfig    = { "CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard(),
                                "HEADER_SEARCH_PATHS" => header_search_paths.join(' '),
                                "DEFINES_MODULE" => "YES" }
 

package/ReactCommon/react/nativemodule/core/platform/ios/React-NativeModulesApple.podspec

@@ -36,7 +36,7 @@ Pod::Spec.new do |s|
     s.compiler_flags         = folly_compiler_flags + ' ' + boost_compiler_flags
     s.pod_target_xcconfig    = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/fmt/include\" \"$(PODS_ROOT)/Headers/Private/React-Core\"",
                                 "USE_HEADERMAP" => "YES",
-                                "CLANG_CXX_LANGUAGE_STANDARD" => "c++20",
+                                "CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard(),
                                 "GCC_WARN_PEDANTIC" => "YES" }
     if ENV['USE_FRAMEWORKS']
         s.header_mappings_dir     = './'

package/ReactCommon/react/nativemodule/samples/ReactCommon-Samples.podspec

@@ -47,7 +47,7 @@ Pod::Spec.new do |s|
   s.compiler_flags         = folly_compiler_flags + ' ' + boost_compiler_flags
   s.pod_target_xcconfig    = { "HEADER_SEARCH_PATHS" => header_search_paths,
                                "USE_HEADERMAP" => "YES",
-                               "CLANG_CXX_LANGUAGE_STANDARD" => "c++20",
+                               "CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard(),
                                "GCC_WARN_PEDANTIC" => "YES" }
   if ENV['USE_FRAMEWORKS']
     s.header_mappings_dir     = './'

package/ReactCommon/react/renderer/components/legacyviewmanagerinterop/LegacyViewManagerInteropComponentDescriptor.mm

@@ -125,9 +125,10 @@ static const std::shared_ptr<void> constructCoordinator(
     bridgeModuleDecorator = unwrapManagedObject(optionalModuleDecorator.value());
   }
 
-  RCTComponentData *componentData = [[RCTComponentData alloc] initWithManagerClass:viewManagerClass
-                                                                            bridge:bridge
-                                                                   eventDispatcher:eventDispatcher];
+  RCTComponentData *componentData =
+      [[RCTComponentData alloc] initWithManagerClass:viewManagerClass
+                                              bridge:bridge != nil ? bridge : (RCTBridge *)bridgeProxy
+                                     eventDispatcher:eventDispatcher];
   return wrapManagedObject([[RCTLegacyViewManagerInteropCoordinator alloc]
       initWithComponentData:componentData
                      bridge:bridge

package/ReactCommon/react/renderer/debug/React-rendererdebug.podspec

@@ -45,7 +45,7 @@ Pod::Spec.new do |s|
   s.header_dir             = "react/renderer/debug"
   s.exclude_files          = "tests"
   s.pod_target_xcconfig    = {
-    "CLANG_CXX_LANGUAGE_STANDARD" => "c++20",
+    "CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard(),
     "HEADER_SEARCH_PATHS" => header_search_paths.join(' '),
     "DEFINES_MODULE" => "YES"
   }

package/ReactCommon/react/renderer/graphics/React-graphics.podspec

@@ -57,7 +57,7 @@ Pod::Spec.new do |s|
   s.pod_target_xcconfig  = { "USE_HEADERMAP" => "NO",
                              "HEADER_SEARCH_PATHS" => header_search_paths.join(" "),
                              "DEFINES_MODULE" => "YES",
-                             "CLANG_CXX_LANGUAGE_STANDARD" => "c++20" }
+                             "CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard() }
 
   s.dependency "glog"
   s.dependency "RCT-Folly/Fabric", folly_version

package/ReactCommon/react/renderer/imagemanager/platform/ios/React-ImageManager.podspec

@@ -50,7 +50,7 @@ Pod::Spec.new do |s|
   s.pod_target_xcconfig  = {
     "USE_HEADERMAP" => "NO",
     "HEADER_SEARCH_PATHS" => header_search_paths,
-    "CLANG_CXX_LANGUAGE_STANDARD" => "c++20",
+    "CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard(),
     "DEFINES_MODULE" => "YES",
   }
 

package/ReactCommon/react/renderer/runtimescheduler/React-runtimescheduler.podspec

@@ -43,7 +43,7 @@ Pod::Spec.new do |s|
   s.header_dir             = "react/renderer/runtimescheduler"
   s.exclude_files          = "tests"
   s.pod_target_xcconfig    = {
-    "CLANG_CXX_LANGUAGE_STANDARD" => "c++20",
+    "CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard(),
     "HEADER_SEARCH_PATHS" => header_search_paths.join(' ')}
 
   if ENV['USE_FRAMEWORKS']

package/ReactCommon/react/runtime/React-RuntimeCore.podspec

@@ -37,7 +37,7 @@ Pod::Spec.new do |s|
   s.header_dir             = "react/runtime"
   s.pod_target_xcconfig    = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/Headers/Private/React-Core\" \"${PODS_TARGET_SRCROOT}/../..\"",
                                 "USE_HEADERMAP" => "YES",
-                                "CLANG_CXX_LANGUAGE_STANDARD" => "c++20",
+                                "CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard(),
                                 "GCC_WARN_PEDANTIC" => "YES" }
   s.compiler_flags       = folly_compiler_flags + ' ' + boost_compiler_flags
 

package/ReactCommon/react/runtime/React-RuntimeHermes.podspec

@@ -35,7 +35,7 @@ Pod::Spec.new do |s|
   s.header_dir             = "react/runtime/hermes"
   s.pod_target_xcconfig    = { "HEADER_SEARCH_PATHS" => "\"${PODS_TARGET_SRCROOT}/../..\" \"${PODS_TARGET_SRCROOT}/../../hermes/executor\" \"$(PODS_ROOT)/boost\"",
                                 "USE_HEADERMAP" => "YES",
-                                "CLANG_CXX_LANGUAGE_STANDARD" => "c++20",
+                                "CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard(),
                                 "GCC_WARN_PEDANTIC" => "YES" }
   s.compiler_flags       = folly_compiler_flags + ' ' + boost_compiler_flags
 

package/ReactCommon/react/runtime/platform/ios/React-RuntimeApple.podspec

@@ -42,7 +42,7 @@ Pod::Spec.new do |s|
   s.header_dir             = "ReactCommon"
   s.pod_target_xcconfig    = { "HEADER_SEARCH_PATHS" => header_search_paths,
                                 "USE_HEADERMAP" => "YES",
-                                "CLANG_CXX_LANGUAGE_STANDARD" => "c++20",
+                                "CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard(),
                                 "GCC_WARN_PEDANTIC" => "YES" }
   s.compiler_flags       = folly_compiler_flags + ' ' + boost_compiler_flags
 

package/ReactCommon/react/utils/React-utils.podspec

@@ -39,7 +39,7 @@ Pod::Spec.new do |s|
   s.compiler_flags         = folly_compiler_flags
   s.header_dir             = "react/utils"
   s.exclude_files          = "tests"
-  s.pod_target_xcconfig    = { "CLANG_CXX_LANGUAGE_STANDARD" => "c++20",
+  s.pod_target_xcconfig    = { "CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard(),
                                "HEADER_SEARCH_PATHS" => header_search_paths.join(' '),
                                "DEFINES_MODULE" => "YES" }
 

package/ReactCommon/reactperflogger/React-perflogger.podspec

@@ -32,5 +32,5 @@ Pod::Spec.new do |s|
   s.source                 = source
   s.source_files           = "**/*.{cpp,h}"
   s.header_dir             = "reactperflogger"
-  s.pod_target_xcconfig    = { "CLANG_CXX_LANGUAGE_STANDARD" => "c++20" }
+  s.pod_target_xcconfig    = { "CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard() }
 end

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-tvos",
-  "version": "0.74.3-0",
+  "version": "0.74.5-0",
   "description": "A framework for building native apps using React",
   "license": "MIT",
   "repository": {
@@ -111,13 +111,13 @@
     "@react-native-community/cli": "13.6.9",
     "@react-native-community/cli-platform-android": "13.6.9",
     "@react-native-community/cli-platform-ios": "13.6.9",
-    "@react-native/assets-registry": "0.74.85",
-    "@react-native/codegen": "0.74.85",
-    "@react-native/community-cli-plugin": "0.74.85",
-    "@react-native/gradle-plugin": "0.74.85",
-    "@react-native/js-polyfills": "0.74.85",
-    "@react-native/normalize-colors": "0.74.85",
-    "@react-native-tvos/virtualized-lists": "0.74.3-0",
+    "@react-native/assets-registry": "0.74.87",
+    "@react-native/codegen": "0.74.87",
+    "@react-native/community-cli-plugin": "0.74.87",
+    "@react-native/gradle-plugin": "0.74.87",
+    "@react-native/js-polyfills": "0.74.87",
+    "@react-native/normalize-colors": "0.74.87",
+    "@react-native-tvos/virtualized-lists": "0.74.5-0",
     "abort-controller": "^3.0.0",
     "anser": "^1.4.9",
     "ansi-regex": "^5.0.0",
@@ -164,6 +164,6 @@
     ]
   },
   "devDependencies": {
-    "react-native-core": "npm:react-native@0.74.3"
+    "react-native-core": "npm:react-native@0.74.5"
   }
 }

package/scripts/cocoapods/helpers.rb

@@ -51,5 +51,9 @@ module Helpers
                 :compiler_flags => '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -DFOLLY_CFG_NO_COROUTINES=1 -DFOLLY_HAVE_CLOCK_GETTIME=1 -Wno-comma -Wno-shorten-64-to-32'
             }
         end
+
+        def self.cxx_language_standard
+            return "c++20"
+        end
     end
 end

package/scripts/cocoapods/new_architecture.rb

@@ -9,34 +9,21 @@ require_relative "./utils.rb"
 require_relative "./helpers.rb"
 
 class NewArchitectureHelper
-    @@cplusplus_version = "c++20"
-
     @@NewArchWarningEmitted = false # Used not to spam warnings to the user.
 
     def self.set_clang_cxx_language_standard_if_needed(installer)
-        language_standard = nil
-
-        installer.pods_project.targets.each do |target|
-            # The React-Core pod may have a suffix added by Cocoapods, so we test whether 'React-Core' is a substring, and do not require exact match
-            if target.name.include? 'React-Core'
-                language_standard = target.resolved_build_setting("CLANG_CXX_LANGUAGE_STANDARD", resolve_against_xcconfig: true).values[0]
-            end
-        end
+        projects = installer.aggregate_targets
+            .map{ |t| t.user_project }
+            .uniq{ |p| p.path }
 
-        unless language_standard.nil?
-            projects = installer.aggregate_targets
-                .map{ |t| t.user_project }
-                .uniq{ |p| p.path }
+        projects.each do |project|
+            Pod::UI.puts("Setting CLANG_CXX_LANGUAGE_STANDARD to #{ Helpers::Constants::cxx_language_standard } on #{ project.path }")
 
-            projects.each do |project|
-                Pod::UI.puts("Setting CLANG_CXX_LANGUAGE_STANDARD to #{ language_standard } on #{ project.path }")
-
-                project.build_configurations.each do |config|
-                    config.build_settings["CLANG_CXX_LANGUAGE_STANDARD"] = language_standard
-                end
-
-                project.save()
+            project.build_configurations.each do |config|
+                config.build_settings["CLANG_CXX_LANGUAGE_STANDARD"] = Helpers::Constants::cxx_language_standard
             end
+
+            project.save()
         end
     end
 
@@ -103,7 +90,7 @@ class NewArchitectureHelper
         current_config["HEADER_SEARCH_PATHS"] = current_headers.empty? ?
             header_search_paths_string :
             "#{current_headers} #{header_search_paths_string}"
-        current_config["CLANG_CXX_LANGUAGE_STANDARD"] = @@cplusplus_version
+        current_config["CLANG_CXX_LANGUAGE_STANDARD"] = Helpers::Constants::cxx_language_standard
 
 
         spec.dependency "React-Core"

package/scripts/cocoapods/privacy_manifest_utils.rb

@@ -50,7 +50,7 @@ module PrivacyManifestUtils
     end
 
     def self.get_application_targets(user_project)
-        return user_project.targets.filter { |t| t.symbol_type == :application }
+        return user_project.targets.filter { |t| t.respond_to?(:symbol_type) && t.symbol_type == :application }
     end
 
     def self.read_privacyinfo_file(file_path)
@@ -67,7 +67,7 @@ module PrivacyManifestUtils
     end
 
     def self.ensure_reference(file_path, user_project, target)
-        reference_exists = target.resources_build_phase.files_references.any? { |file_ref| file_ref.path&.end_with? "PrivacyInfo.xcprivacy" }
+        reference_exists = target.resources_build_phase.files_references.any? { |file_ref| file_ref&.path&.end_with? "PrivacyInfo.xcprivacy" }
         unless reference_exists
             # We try to find the main group, but if it doesn't exist, we default to adding the file to the project root – both work
             file_root = user_project.root_object.main_group.children.find { |group|
@@ -79,8 +79,11 @@ module PrivacyManifestUtils
     end
 
     def self.get_privacyinfo_file_path(user_project, targets)
+        
         file_refs = targets.flat_map { |target| target.resources_build_phase.files_references }
-        existing_file = file_refs.find { |file_ref| file_ref.path&.end_with? "PrivacyInfo.xcprivacy" }
+        existing_file = file_refs.find { |file_ref| file_ref&.path&.end_with?("PrivacyInfo.xcprivacy") }
+
+
         if existing_file
             return existing_file.real_path
         end
@@ -89,7 +92,9 @@ module PrivacyManifestUtils
         info_plist_path = user_project.files.find { |file_ref| file_ref.name == "Info.plist" }
         if info_plist_path.nil?
             # return path that is sibling to .xcodeproj
+
             path = user_project.path
+
             return File.join(File.dirname(path), "PrivacyInfo.xcprivacy")
         end
         return File.join(File.dirname(info_plist_path.real_path),"PrivacyInfo.xcprivacy")
@@ -120,6 +125,7 @@ module PrivacyManifestUtils
             end
             end
         end
+
         return used_apis
     end
 
@@ -127,7 +133,7 @@ module PrivacyManifestUtils
         privacy_manifests = user_project
             .files
             .select { |p|
-                p.path&.end_with?('PrivacyInfo.xcprivacy')
+                p&.path&.end_with?('PrivacyInfo.xcprivacy')
             }
         return privacy_manifests
     end
@@ -165,7 +171,7 @@ module PrivacyManifestUtils
                 "NSPrivacyTracking" => false,
                 "NSPrivacyAccessedAPITypes" => get_core_accessed_apis
             }
-            path = File.join(user_project.path.parent, "PrivacyInfo.xcprivacy")
+            path = File.join(user_project&.path.parent, "PrivacyInfo.xcprivacy")
             Xcodeproj::Plist.write_to_path(privacy_manifest, path)
             Pod::UI.puts "Your app does not have a privacy manifest! A template has been generated containing Required Reasons API usage in the core React Native library. Please add the PrivacyInfo.xcprivacy file to your project and complete data use, tracking and any additional required reasons your app is using according to Apple's guidance: https://developer.apple.com/documentation/bundleresources/privacy_manifest_files. Then, you will need to manually add this file to your project in Xcode.".red
         end

package/scripts/cocoapods/utils.rb

@@ -244,7 +244,18 @@ class ReactNativePodsUtils
         end
 
         if !file_manager.exist?("#{file_path}.local")
-            node_binary = `command -v node`
+            # When installing pods with a yarn alias, yarn creates a fake yarn and node executables
+            # in a temporary folder.
+            # Using `type -a` we are able to retrieve all the paths of an executable and we can
+            # exclude the temporary ones.
+            # see https://github.com/facebook/react-native/issues/43285 for more info
+            node_binary = `type -a node`.split("\n").map { |path|
+                path.gsub!("node is ", "")
+            }.select { |b|
+                return !b.start_with?("/var")
+            }
+
+            node_binary = node_binary[0]
             system("echo 'export NODE_BINARY=#{node_binary}' > #{file_path}.local")
         end
     end

package/scripts/react_native_pods.rb

@@ -267,6 +267,10 @@ def get_folly_config()
   return Helpers::Constants.folly_config
 end
 
+def rct_cxx_language_standard()
+  return Helpers::Constants.cxx_language_standard
+end
+
 # Function that executes after React Native has been installed to configure some flags and build settings.
 #
 # Parameters

package/scripts/react_native_pods_utils/script_phases.sh

@@ -104,7 +104,7 @@ moveOutputs () {
     mkdir -p "$RCT_SCRIPT_OUTPUT_DIR"
 
     # Copy all output to output_dir
-    cp -R -X "$TEMP_OUTPUT_DIR/." "$RCT_SCRIPT_OUTPUT_DIR" || exit 1
+    /bin/cp -R -X "$TEMP_OUTPUT_DIR/." "$RCT_SCRIPT_OUTPUT_DIR" || exit 1
     echo "$LIBRARY_NAME output has been written to $RCT_SCRIPT_OUTPUT_DIR:" >> "${SCRIPT_OUTPUT_FILE_0}" 2>&1
     ls -1 "$RCT_SCRIPT_OUTPUT_DIR" >> "${SCRIPT_OUTPUT_FILE_0}" 2>&1
 }

package/sdks/hermes-engine/hermes-engine.podspec

@@ -24,7 +24,7 @@ Pod::Spec.new do |spec|
   spec.license     = package['license']
   spec.author      = "Facebook"
   spec.source      = source
-  spec.platforms   = { :osx => "10.13", :ios => "13.4", :tvos => "13.4" }
+  spec.platforms   = { :osx => "10.13", :ios => "13.4", :tvos => "13.4", :visionos => "1.0" }
 
   spec.preserve_paths      = '**/*.*'
   spec.source_files        = ''
@@ -46,6 +46,7 @@ Pod::Spec.new do |spec|
       ss.header_mappings_dir = "destroot/include"
       ss.ios.vendored_frameworks = "destroot/Library/Frameworks/universal/hermes.xcframework"
       ss.tvos.vendored_frameworks = "destroot/Library/Frameworks/universal/hermes.xcframework"
+      ss.visionos.vendored_frameworks = "destroot/Library/Frameworks/universal/hermes.xcframework"
       ss.osx.vendored_frameworks = "destroot/Library/Frameworks/macosx/hermes.framework"
     end
 

package/sdks/hermes-engine/utils/build-apple-framework.sh

@@ -17,6 +17,8 @@ REACT_NATIVE_PATH=${REACT_NATIVE_PATH:-$CURR_SCRIPT_DIR/../../..}
 
 NUM_CORES=$(sysctl -n hw.ncpu)
 
+PLATFORMS=("macosx" "iphoneos" "iphonesimulator" "catalyst" "xros" "xrsimulator" "appletvos" "appletvsimulator")
+
 if [[ -z "$JSI_PATH" ]]; then
   JSI_PATH="$REACT_NATIVE_PATH/ReactCommon/jsi"
 fi
@@ -41,6 +43,10 @@ function get_tvos_deployment_target {
   use_env_var_or_ruby_prop "${IOS_DEPLOYMENT_TARGET}" "deployment_target('tvos')"
 }
 
+function get_visionos_deployment_target {
+  use_env_var_or_ruby_prop "${XROS_DEPLOYMENT_TARGET}" "deployment_target('visionos')"
+}
+
 function get_mac_deployment_target {
   use_env_var_or_ruby_prop "${MAC_DEPLOYMENT_TARGET}" "deployment_target('osx')"
 }
@@ -164,21 +170,12 @@ function build_apple_framework {
 }
 
 function prepare_dest_root_for_ci {
+  mkdir -p  "destroot/bin"
+  for platform in "${PLATFORMS[@]}"; do
+    mkdir -p "destroot/Library/Frameworks/$platform"
+    cp -R "./build_$platform/API/hermes/hermes.framework"* "destroot/Library/Frameworks/$platform"
+  done
 
-  mkdir -p "destroot/Library/Frameworks/macosx"
-  mkdir -p "destroot/bin"
-  mkdir -p "destroot/Library/Frameworks/iphoneos"
-  mkdir -p "destroot/Library/Frameworks/iphonesimulator"
-  mkdir -p "destroot/Library/Frameworks/appletvos"
-  mkdir -p "destroot/Library/Frameworks/appletvsimulator"
-  mkdir -p "destroot/Library/Frameworks/catalyst"
-
-  cp -R "./build_macosx/API/hermes/hermes.framework"* "destroot/Library/Frameworks/macosx"
-  cp -R "./build_iphoneos/API/hermes/hermes.framework"* "destroot/Library/Frameworks/iphoneos"
-  cp -R "./build_iphonesimulator/API/hermes/hermes.framework"* "destroot/Library/Frameworks/iphonesimulator"
-  cp -R "./build_appletvos/API/hermes/hermes.framework"* "destroot/Library/Frameworks/appletvos"
-  cp -R "./build_appletvsimulator/API/hermes/hermes.framework"* "destroot/Library/Frameworks/appletvsimulator"
-  cp -R "./build_catalyst/API/hermes/hermes.framework"* "destroot/Library/Frameworks/catalyst"
   cp "./build_macosx/bin/"* "destroot/bin"
 
   # Copy over Hermes and JSI API headers.

package/sdks/hermes-engine/utils/build-hermes-xcode.sh

@@ -10,24 +10,30 @@ release_version="$1"; shift
 hermesc_path="$1"; shift
 jsi_path="$1"; shift
 
-# Based on platform name returns the framework copy destination. Used later by `vendored_frameworks` in Podspec. 
+# Based on platform name returns the framework copy destination. Used later by `vendored_frameworks` in Podspec.
 # Fallbacks to "ios" if platform is not recognized.
 function get_platform_copy_destination {
     if [[ $1 == "macosx" ]]; then
       echo "macosx"
       return
+    elif [[ $1 == "xros" || $1 == "xrsimulator" ]]; then
+      echo "xros"
+      return
     fi
-    
+
     echo "ios"
 }
 
 function get_deployment_target {
     if [[ $1 == "macosx" ]]; then
-      echo ${MACOSX_DEPLOYMENT_TARGET}
+      echo "${MACOSX_DEPLOYMENT_TARGET}"
+      return
+    elif [[ $1 == "xrsimulator" || $1 == "xros" ]]; then
+      echo "${XROS_DEPLOYMENT_TARGET}"
       return
     fi
-    
-    echo ${IPHONEOS_DEPLOYMENT_TARGET}
+
+    echo "${IPHONEOS_DEPLOYMENT_TARGET}"
 }
 
 enable_debugger="false"

package/sdks/hermes-engine/utils/build-ios-framework.sh

@@ -10,9 +10,9 @@ fi
 set -e
 
 # Given a specific target, retrieve the right architecture for it
-# $1 the target you want to build. Allowed values: iphoneos, iphonesimulator, catalyst
+# $1 the target you want to build. Allowed values: iphoneos, iphonesimulator, catalyst, xros, xrsimulator
 function get_architecture {
-    if [[ $1 == "iphoneos" ]]; then
+    if [[ $1 == "iphoneos" || $1 == "xros" || $1 == "xrsimulator" ]]; then
       echo "arm64"
     elif [[ $1 == "iphonesimulator" ]]; then
       echo "x86_64;arm64"
@@ -28,18 +28,25 @@ function get_architecture {
     fi
 }
 
+function get_deployment_target {
+    if [[ $1 == "xros" || $1 == "xrsimulator" ]]; then
+      echo "$(get_visionos_deployment_target)"
+    elif [[ $1 == "appletvos" || $1 == "appletvsimulator" ]]; then
+      echo "$(get_tvos_deployment_target)"
+    else
+      echo "$(get_ios_deployment_target)"
+    fi
+}
+
 # build a single framework
 # $1 is the target to build
 function build_framework {
   if [ ! -d destroot/Library/Frameworks/universal/hermes.xcframework ]; then
-    ios_deployment_target=$(get_ios_deployment_target)
-    if [[ "$1" == "appletvos" || "$1" == "appletvsimulator" ]]; then
-      ios_deployment_target=$(get_tvos_deployment_target)
-    fi
+    deployment_target=$(get_deployment_target "$1")
 
     architecture=$(get_architecture "$1")
 
-    build_apple_framework "$1" "$architecture" "$ios_deployment_target"
+    build_apple_framework "$1" "$architecture" "$deployment_target"
   else
     echo "Skipping; Clean \"destroot\" to rebuild".
   fi
@@ -48,7 +55,7 @@ function build_framework {
 # group the frameworks together to create a universal framework
 function build_universal_framework {
     if [ ! -d destroot/Library/Frameworks/universal/hermes.xcframework ]; then
-        create_universal_framework "iphoneos" "iphonesimulator" "appletvos" "appletvsimulator" "catalyst"
+        create_universal_framework "iphoneos" "iphonesimulator" "appletvos" "appletvsimulator" "catalyst" "xros" "xrsimulator"
     else
         echo "Skipping; Clean \"destroot\" to rebuild".
     fi
@@ -65,6 +72,8 @@ function create_framework {
         build_framework "appletvos"
         build_framework "appletvsimulator"
         build_framework "catalyst"
+        build_framework "xros"
+        build_framework "xrsimulator"
 
         build_universal_framework
     else

package/sdks/hermes-engine/utils/create-dummy-hermes-xcframework.sh

@@ -19,7 +19,7 @@ pushd destroot/Library/Frameworks > /dev/null || exit 1
 
 echo '' > dummy.c
 
-platforms=( "macosx" "ios" ) # Add other platforms here if needed
+platforms=( "macosx" "ios" "xros" ) # Add other platforms here if needed
 
 for platform in "${platforms[@]}" 
 do