react-native-tvos 0.75.4-0 → 0.76.0-0

package/scripts/cocoapods/helpers.rb

@@ -37,19 +37,86 @@ end
 
 module Helpers
     class Constants
+        @@boost_config = {
+            :git => "https://github.com/react-native-community/boost-for-react-native",
+        }
+
+        @@socket_rocket_config = {
+            :version => '0.7.1'
+        }
+
+        @@folly_config = {
+            :version => '2024.01.01.00',
+            :git => 'https://github.com/facebook/folly.git',
+            :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'
+        }
+
+        @@fmt_config = {
+            :git => "https://github.com/fmtlib/fmt.git",
+        }
+
+        @@glog_config = {
+            :git => "https://github.com/google/glog.git",
+        }
+
+        @@double_conversion_config = {
+            :git => "https://github.com/google/double-conversion.git",
+        }
+
         def self.min_ios_version_supported
-            return '13.4'
+            return '15.1'
         end
 
         def self.min_xcode_version_supported
-            return '14.3'
+            return '15.1'
         end
 
         def self.folly_config
-            return {
-                :version => '2024.01.01.00',
-                :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'
-            }
+            return @@folly_config
+        end
+
+        def self.set_folly_config(new_folly_config)
+            @@folly_config.update(new_folly_config)
+        end
+
+        def self.boost_config
+            return @@boost_config
+        end
+
+        def self.set_boost_config(new_boost_config)
+           @@boost_config.update(new_boost_config)
+        end
+
+        def self.socket_rocket_config
+            return @@socket_rocket_config
+        end
+
+        def self.set_socket_rocket_config(new_socket_rocket_config)
+           @@socket_rocket_config.update(new_socket_rocket_config)
+        end
+
+        def self.fmt_config
+            return @@fmt_config
+        end
+
+        def self.set_fmt_config(new_fmt_config)
+            @@fmt_config.update(new_fmt_config)
+        end
+
+        def self.glog_config
+            return @@glog_config
+        end
+
+        def self.set_glog_config(new_glog_config)
+            @@glog_config.update(new_glog_config)
+        end
+
+        def self.double_conversion_config
+            return @@double_conversion_config
+        end
+
+        def self.set_double_conversion_config(new_double_conversion_config)
+            @@double_conversion_config.update(new_double_conversion_config)
         end
 
         def self.cxx_language_standard

package/scripts/cocoapods/new_architecture.rb

@@ -12,19 +12,33 @@ class NewArchitectureHelper
     @@NewArchWarningEmitted = false # Used not to spam warnings to the user.
 
     def self.set_clang_cxx_language_standard_if_needed(installer)
+        cxxBuildsettingsName = "CLANG_CXX_LANGUAGE_STANDARD"
         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 }")
+            Pod::UI.puts("Setting #{cxxBuildsettingsName} to #{ Helpers::Constants::cxx_language_standard } on #{ project.path }")
 
             project.build_configurations.each do |config|
-                config.build_settings["CLANG_CXX_LANGUAGE_STANDARD"] = Helpers::Constants::cxx_language_standard
+                config.build_settings[cxxBuildsettingsName] = Helpers::Constants::cxx_language_standard
             end
 
             project.save()
         end
+
+        installer.target_installation_results.pod_target_installation_results.each do |pod_name, target_installation_result|
+            target_installation_result.native_target.build_configurations.each do |config|
+                config.build_settings[cxxBuildsettingsName] = Helpers::Constants::cxx_language_standard
+            end
+        end
+
+        # Override targets that would set spec.xcconfig to define c++ version
+        installer.aggregate_targets.each do |aggregate_target|
+            aggregate_target.xcconfigs.each do |config_name, config_file|
+                config_file.attributes[cxxBuildsettingsName] = Helpers::Constants::cxx_language_standard
+            end
+        end
     end
 
     def self.computeFlags(is_new_arch_enabled)
@@ -173,6 +187,6 @@ class NewArchitectureHelper
     end
 
     def self.new_arch_enabled
-        return ENV["RCT_NEW_ARCH_ENABLED"] == "1"
+        return ENV["RCT_NEW_ARCH_ENABLED"] == nil || ENV["RCT_NEW_ARCH_ENABLED"] == "1"
     end
 end

package/scripts/cocoapods/privacy_manifest_utils.rb

@@ -67,14 +67,29 @@ 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" }
-        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|
-                group.class == Xcodeproj::Project::Object::PBXGroup && (group.name == target.name || group.path == target.name)
-            } || user_project
-            file_ref = file_root.new_file(file_path)
-            build_file = target.resources_build_phase.add_file_reference(file_ref, true)
+        privacy_info_filename = File.basename(file_path)
+
+        # Check if the file is already in the PBXBuildFile section
+        build_phase_reference_exists = target.resources_build_phase.files_references.any? { |file_ref| file_ref&.path&.end_with?(privacy_info_filename) }
+
+        unless build_phase_reference_exists
+            # Check if the file is already in the PBXFileReference section
+            existing_file_reference = user_project.files.find { |file| file.path&.end_with?(privacy_info_filename) }
+
+            if existing_file_reference
+                # If the file reference exists, add it to the build phase
+                target.resources_build_phase.add_file_reference(existing_file_reference, true)
+            else
+                # If the file reference doesn't exist, add it to the project and the build phase
+                # 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|
+                    group.class == Xcodeproj::Project::Object::PBXGroup && (group.name == target.name || group.path == target.name)
+                } || user_project
+                puts "file_root: #{file_root}"
+
+                file_ref = file_root.new_file(file_path)
+                target.resources_build_phase.add_file_reference(file_ref, true)
+            end
         end
     end
 

package/scripts/cocoapods/utils.rb

@@ -43,6 +43,7 @@ class ReactNativePodsUtils
 
     def self.set_gcc_preprocessor_definition_for_React_hermes(installer)
         self.add_build_settings_to_pod(installer, "GCC_PREPROCESSOR_DEFINITIONS", "HERMES_ENABLE_DEBUGGER=1", "React-hermes", "Debug")
+        self.add_build_settings_to_pod(installer, "GCC_PREPROCESSOR_DEFINITIONS", "HERMES_ENABLE_DEBUGGER=1", "React-jsinspector", "Debug")
         self.add_build_settings_to_pod(installer, "GCC_PREPROCESSOR_DEFINITIONS", "HERMES_ENABLE_DEBUGGER=1", "hermes-engine", "Debug")
         self.add_build_settings_to_pod(installer, "GCC_PREPROCESSOR_DEFINITIONS", "HERMES_ENABLE_DEBUGGER=1", "React-RuntimeHermes", "Debug")
     end
@@ -116,10 +117,10 @@ class ReactNativePodsUtils
             projects.each do |project|
                 project.build_configurations.each do |config|
                     # Using the un-qualified names means you can swap in different implementations, for example ccache
-                    config.build_settings["CC"] = config.build_settings["CC"] ? config.build_settings["CC"].gsub(/#{Regexp.escape(ccache_clang_sh)}/, '') : ""
-                    config.build_settings["LD"] = config.build_settings["LD"] ? config.build_settings["LD"].gsub(/#{Regexp.escape(ccache_clang_sh)}/, "") : ""
-                    config.build_settings["CXX"] = config.build_settings["CXX"] ? config.build_settings["CXX"].gsub(/#{Regexp.escape(ccache_clangpp_sh)}/, "") : ""
-                    config.build_settings["LDPLUSPLUS"] = config.build_settings["LDPLUSPLUS"] ? config.build_settings["LDPLUSPLUS"].gsub(/#{Regexp.escape(ccache_clangpp_sh)}/, "") : ""
+                    config.build_settings["CC"] = config.build_settings["CC"].gsub(/#{Regexp.escape(ccache_clang_sh)}/, '') if config.build_settings["CC"]
+                    config.build_settings["LD"] = config.build_settings["LD"].gsub(/#{Regexp.escape(ccache_clang_sh)}/, "") if config.build_settings["LD"]
+                    config.build_settings["CXX"] = config.build_settings["CXX"].gsub(/#{Regexp.escape(ccache_clangpp_sh)}/, "") if config.build_settings["CXX"]
+                    config.build_settings["LDPLUSPLUS"] = config.build_settings["LDPLUSPLUS"].gsub(/#{Regexp.escape(ccache_clangpp_sh)}/, "") if config.build_settings["LDPLUSPLUS"]
                 end
 
                 project.save()
@@ -235,16 +236,9 @@ class ReactNativePodsUtils
         if !file_manager.exist?("#{file_path}.local")
             # 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.
+            # Using `node --print "process.argv[0]";` we are able to retrieve the actual path from which node is running.
             # 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]
+            node_binary = `node --print "process.argv[0]";`
             system("echo 'export NODE_BINARY=#{node_binary}' > #{file_path}.local")
         end
     end
@@ -542,10 +536,19 @@ class ReactNativePodsUtils
     end
 
     def self.add_search_path_if_not_included(current_search_paths, new_search_path)
-        if !current_search_paths.include?(new_search_path)
-            current_search_paths << " #{new_search_path}"
+        new_search_path = new_search_path.strip
+
+        if current_search_paths.is_a?(String)
+          current_search_paths = current_search_paths.strip
+          return "#{current_search_paths} #{new_search_path}" unless current_search_paths.include?(new_search_path)
+        end
+
+        if current_search_paths.is_a?(Array)
+          current_search_paths = current_search_paths.map(&:strip)
+          return current_search_paths << new_search_path unless current_search_paths.include?(new_search_path)
         end
-        return current_search_paths
+
+        current_search_paths
     end
 
     def self.update_header_paths_if_depends_on(target_installation_result, dependency_name, header_paths)
@@ -634,6 +637,7 @@ class ReactNativePodsUtils
             "React-perflogger",
             "React-rncore",
             "React-runtimeexecutor",
+            "React-timing",
             "ReactCommon",
             "Yoga",
             "boost",
@@ -689,10 +693,18 @@ class ReactNativePodsUtils
             map[field] = "$(inherited)" + flag
         else
             unless map[field].include?(flag)
-                map[field] = map[field] + flag
+                if map[field].instance_of? String
+                    map[field] = map[field] + flag
+                elsif map[field].instance_of? Array
+                    map[field].push(flag)
+                end
             end
             unless map[field].include?("$(inherited)")
-                map[field] = "$(inherited) " + map[field]
+                if map[field].instance_of? String
+                    map[field] = "$(inherited) " + map[field]
+                elsif map[field].instance_of? Array
+                    map[field].unshift("$(inherited)")
+                end
             end
         end
     end

package/scripts/ios-configure-glog.sh

@@ -77,6 +77,8 @@ cat << EOF >> src/config.h
 #undef HAVE_SYSCALL_H
 #undef HAVE_SYS_SYSCALL_H
 #undef OS_MACOSX
+/* NO_THREADS needed right now for Xcode 16 */
+#define NO_THREADS
 #endif
 
 /* Special configuration for ucontext */

package/scripts/react_native_pods.rb

@@ -142,6 +142,7 @@ def use_react_native! (
 
   pod 'React-callinvoker', :path => "#{prefix}/ReactCommon/callinvoker"
   pod 'React-performancetimeline', :path => "#{prefix}/ReactCommon/react/performance/timeline"
+  pod 'React-timing', :path => "#{prefix}/ReactCommon/react/timing"
   pod 'React-runtimeexecutor', :path => "#{prefix}/ReactCommon/runtimeexecutor"
   pod 'React-runtimescheduler', :path => "#{prefix}/ReactCommon/react/renderer/runtimescheduler"
   pod 'React-rendererdebug', :path => "#{prefix}/ReactCommon/react/renderer/debug"
@@ -264,15 +265,85 @@ def get_default_flags()
   return ReactNativePodsUtils.get_default_flags()
 end
 
-# This method returns an hash with the folly version and the folli compiler flags
+# This method returns an hash with the folly version, folly git url and the folly compiler flags
 # that can be used to configure libraries.
 # In this way, we can update those values in react native, and all the libraries will benefit
 # from it.
-# @return an hash with the `:version` and `:compiler_flags` fields.
+# @return an hash with the `:version`, `:git` and `:compiler_flags` fields.
 def get_folly_config()
   return Helpers::Constants.folly_config
 end
 
+# This method returns an hash with the glog git url
+# that can be used to configure libraries.
+# @return an hash with the `:git` field.
+def get_glog_config()
+  return Helpers::Constants.glog_config
+end
+
+# This method returns an hash with the fmt git url
+# that can be used to configure libraries.
+# @return an hash with the `:git` field.
+def get_fmt_config()
+  return Helpers::Constants.fmt_config
+end
+
+# This method returns an hash with the double conversion git url
+# that can be used to configure libraries.
+# @return an hash with the `:git` field.
+def get_double_conversion_config()
+  return Helpers::Constants.double_conversion_config
+end
+
+# This method returns an hash with the double conversion git url
+# that can be used to configure libraries.
+# @return an hash with the `:git` field.
+def get_boost_config()
+  return Helpers::Constants.boost_config
+end
+
+# This method returns an hash with the socket rocket version
+# @return an hash with the `:version` field.
+def get_socket_rocket_config()
+  return Helpers::Constants.socket_rocket_config
+end
+
+# This method can be used to set the glog config
+# that can be used to configure libraries.
+def set_folly_config(folly_config)
+   Helpers::Constants.set_folly_config(folly_config)
+end
+
+# This method can be used to set the glog config
+# that can be used to configure libraries.
+def set_glog_config(glog_config)
+   Helpers::Constants.set_glog_config(glog_config)
+end
+
+# This method can be used to set the fmt config
+# that can be used to configure libraries.
+def set_fmt_config(fmt_config)
+   Helpers::Constants.set_fmt_config(fmt_config)
+end
+
+# This method can be used to set the double conversion config
+# that can be used to configure libraries.
+def set_double_conversion_config(double_conversion_config)
+   Helpers::Constants.set_double_conversion_config(double_conversion_config)
+end
+
+# This method can be used to set the boost config
+# that can be used to configure libraries.
+def set_boost_config(boost_config)
+   Helpers::Constants.set_boost_config(boost_config)
+end
+
+# This method can be used to set the socket rocket config
+# that can be used to configure libraries.
+def set_socket_rocket_config(socket_rocket_config)
+   Helpers::Constants.set_socket_rocket_config(socket_rocket_config)
+end
+
 def rct_cxx_language_standard()
   return Helpers::Constants.cxx_language_standard
 end

package/sdks/.hermesversion

@@ -1 +1 @@
-hermes-2024-08-15-RNv0.75.1-4b3bf912cc0f705b51b71ce1a5b8bd79b93a451b
+hermes-2024-09-09-RNv0.76.0-db6d12e202e15f7a446d8848d6ca8f7abb3cfb32

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

@@ -6,7 +6,12 @@
 require "json"
 require_relative "./hermes-utils.rb"
 
-react_native_path = File.join(__dir__, "..", "..")
+react_native_path = File.dirname(Pod::Executable.execute_command('node', ['-p',
+  'require.resolve(
+  "react-native",
+    {paths: [process.argv[1]]},
+  )', __dir__]).strip
+)
 
 # package.json
 package = JSON.parse(File.read(File.join(react_native_path, "package.json")))
@@ -24,7 +29,7 @@ Pod::Spec.new do |spec|
   spec.license     = package['license']
   spec.author      = "Facebook"
   spec.source      = source
-  spec.platforms   = { :osx => "10.13", :ios => "13.4", :visionos => "1.0", :tvos => "13.4" }
+  spec.platforms   = { :osx => "10.13", :ios => "15.1", :visionos => "1.0", :tvos => "15.1" }
 
   spec.preserve_paths      = '**/*.*'
   spec.source_files        = ''
@@ -37,6 +42,7 @@ Pod::Spec.new do |spec|
   spec.ios.vendored_frameworks = "destroot/Library/Frameworks/universal/hermes.framework"
   spec.tvos.vendored_frameworks = "destroot/Library/Frameworks/universal/hermes.framework"
   spec.osx.vendored_frameworks = "destroot/Library/Frameworks/macosx/hermes.framework"
+  spec.visionos.vendored_frameworks = "destroot/Library/Frameworks/xros/hermes.framework"
 
   if HermesEngineSourceType::isPrebuilt(source_type) then
 
@@ -116,7 +122,7 @@ Pod::Spec.new do |spec|
       'HERMES_CLI_PATH' => "#{hermesc_path}/bin/hermesc"
     }
 
-    spec.prepare_command = ". #{react_native_path}/sdks/hermes-engine/utils/create-dummy-hermes-xcframework.sh"
+    spec.prepare_command = ". '#{react_native_path}/sdks/hermes-engine/utils/create-dummy-hermes-xcframework.sh'"
 
     # This podspec is also run in CI to build Hermes without using Pod install
     # and sometimes CI fails because `Pod::Executable` does not exist if it is not run with Pod Install.

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

@@ -31,16 +31,25 @@ function use_env_var_or_ruby_prop {
   fi
 }
 
+function use_env_var {
+  if [[ -n "$1" ]]; then
+    echo "$1"
+  else
+    echo "error: Missing $2 environment variable"
+    exit 1
+  fi
+}
+
 function get_release_version {
   use_env_var_or_ruby_prop "${RELEASE_VERSION}" "version"
 }
 
 function get_ios_deployment_target {
-  use_env_var_or_ruby_prop "${IOS_DEPLOYMENT_TARGET}" "deployment_target('ios')"
+  use_env_var "${IOS_DEPLOYMENT_TARGET}" "IOS_DEPLOYMENT_TARGET"
 }
 
 function get_visionos_deployment_target {
-  use_env_var_or_ruby_prop "${XROS_DEPLOYMENT_TARGET}" "deployment_target('visionos')"
+  use_env_var "${XROS_DEPLOYMENT_TARGET}" "XROS_DEPLOYMENT_TARGET"
 }
 
 function get_tvos_deployment_target {
@@ -48,7 +57,7 @@ function get_tvos_deployment_target {
 }
 
 function get_mac_deployment_target {
-  use_env_var_or_ruby_prop "${MAC_DEPLOYMENT_TARGET}" "deployment_target('osx')"
+  use_env_var "${MAC_DEPLOYMENT_TARGET}" "MAC_DEPLOYMENT_TARGET"
 }
 
 # Build host hermes compiler for internal bytecode
@@ -113,7 +122,7 @@ function configure_apple_framework {
       -DHERMES_BUILD_APPLE_DSYM:BOOLEAN=true \
       -DIMPORT_HERMESC:PATH="$IMPORT_HERMESC_PATH" \
       -DJSI_DIR="$JSI_PATH" \
-      -DHERMES_RELEASE_VERSION="for RN $(get_release_version)" \
+      -DHERMES_RELEASE_VERSION="for RNTV $(get_release_version)" \
       -DCMAKE_BUILD_TYPE="$cmake_build_type"
     popd > /dev/null || exit 1
 }
@@ -215,19 +224,7 @@ function create_universal_framework {
   for i in "${!platforms[@]}"; do
     local platform="${platforms[$i]}"
     local hermes_framework_path="${platform}/hermes.framework"
-    local dSYM_path="$hermes_framework_path"
-    local dSYM_base_path="$HERMES_PATH/destroot/Library/Frameworks"
-
-    # If the dSYM rename has failed, the dSYM are generated as 0.dSYM
-    # (Apple default name) rather then hermes.framework.dSYM.
-    if [[ -e "$dSYM_base_path/${platform}/0.dSYM" ]]; then
-      dSYM_path="${platform}/0"
-    fi
-
     args+="-framework $hermes_framework_path "
-
-    # Path to dSYM must be absolute
-    args+="-debug-symbols $dSYM_base_path/$dSYM_path.dSYM "
   done
 
   mkdir -p universal

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

@@ -52,10 +52,24 @@ function build_framework {
   fi
 }
 
+# Allows RNTV CI to optionally build Vision OS framework
+function set_include_vision {
+    if [[ "$INCLUDE_VISION_OS" == "0" || "$INCLUDE_VISION_OS" == "false" || "$INCLUDE_VISION_OS" == "FALSE" ]]; then
+        include_vision=0
+    else
+        include_vision=1
+    fi
+}
+
 # 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" "catalyst" "xros" "xrsimulator" "appletvos" "appletvsimulator"
+        set_include_vision
+        if [[ $include_vision == 1 ]]; then
+            create_universal_framework "iphoneos" "iphonesimulator" "catalyst" "xros" "xrsimulator" "appletvos" "appletvsimulator"
+        else
+            create_universal_framework "iphoneos" "iphonesimulator" "catalyst" "appletvos" "appletvsimulator"
+        fi
     else
         echo "Skipping; Clean \"destroot\" to rebuild".
     fi
@@ -65,16 +79,17 @@ function build_universal_framework {
 # this is used to preserve backward compatibility
 function create_framework {
     if [ ! -d destroot/Library/Frameworks/universal/hermes.xcframework ]; then
-        ios_deployment_target=$(get_ios_deployment_target)
+        set_include_vision
 
         build_framework "iphoneos"
         build_framework "iphonesimulator"
         build_framework "appletvos"
         build_framework "appletvsimulator"
         build_framework "catalyst"
-        build_framework "xros"
-        build_framework "xrsimulator"
-
+        if [[ $include_vision == 1 ]]; then
+            build_framework "xros"
+            build_framework "xrsimulator"
+        fi
         build_universal_framework
     else
         echo "Skipping; Clean \"destroot\" to rebuild".