react-native-tvos 0.81.4-0 → 0.82.0-0

package/scripts/hermes/hermes-utils.js

@@ -28,9 +28,9 @@ const HERMES_SOURCE_TARBALL_BASE_URL =
 const HERMES_TARBALL_DOWNLOAD_DIR = path.join(SDKS_DIR, 'download');
 const MACOS_BIN_DIR = path.join(SDKS_DIR, 'hermesc', 'osx-bin');
 const MACOS_HERMESC_PATH = path.join(MACOS_BIN_DIR, 'hermesc');
-const MACOS_IMPORT_HERMESC_PATH = path.join(
+const MACOS_IMPORT_HOST_COMPILERS_PATH = path.join(
   MACOS_BIN_DIR,
-  'ImportHermesc.cmake',
+  'ImportHostCompilers.cmake',
 );
 
 /**
@@ -227,14 +227,17 @@ function shouldUsePrebuiltHermesC(
 }
 
 function configureMakeForPrebuiltHermesC() {
-  const IMPORT_HERMESC_TEMPLATE = `add_executable(native-hermesc IMPORTED)
+  const IMPORT_HOST_COMPILERS_TEMPLATE = `add_executable(native-hermesc IMPORTED)
 set_target_properties(native-hermesc PROPERTIES
   IMPORTED_LOCATION "${MACOS_HERMESC_PATH}"
   )`;
 
   try {
     fs.mkdirSync(MACOS_BIN_DIR, {recursive: true});
-    fs.writeFileSync(MACOS_IMPORT_HERMESC_PATH, IMPORT_HERMESC_TEMPLATE);
+    fs.writeFileSync(
+      MACOS_IMPORT_HOST_COMPILERS_PATH,
+      IMPORT_HOST_COMPILERS_TEMPLATE,
+    );
   } catch (error) {
     console.warn(
       `[Hermes] Re-compiling hermesc. Unable to configure make: ${error}`,
@@ -320,7 +323,7 @@ function createHermesPrebuiltArtifactsTarball(
 function validateHermesFrameworksExist(destrootDir /*: string */) {
   if (
     !fs.existsSync(
-      path.join(destrootDir, 'Library/Frameworks/macosx/hermes.framework'),
+      path.join(destrootDir, 'Library/Frameworks/macosx/hermesvm.framework'),
     )
   ) {
     throw new Error(
@@ -329,7 +332,10 @@ function validateHermesFrameworksExist(destrootDir /*: string */) {
   }
   if (
     !fs.existsSync(
-      path.join(destrootDir, 'Library/Frameworks/universal/hermes.xcframework'),
+      path.join(
+        destrootDir,
+        'Library/Frameworks/universal/hermesvm.xcframework',
+      ),
     )
   ) {
     throw new Error(

package/scripts/react_native_pods.rb

@@ -56,7 +56,7 @@ end
 # Parameters
 # - path: path to react_native installation.
 # - fabric_enabled: whether fabric should be enabled or not.
-# - new_arch_enabled: whether the new architecture should be enabled or not.
+# - new_arch_enabled: [DEPRECATED] whether the new architecture should be enabled or not.
 # - :production [DEPRECATED] whether the dependencies must be installed to target a Debug or a Release build.
 # - hermes_enabled: whether Hermes should be enabled or not.
 # - app_path: path to the React Native app. Required by the New Architecture.
@@ -72,6 +72,7 @@ def use_react_native! (
   privacy_file_aggregation_enabled: true
 )
   error_if_try_to_use_jsc_from_core()
+  warn_if_new_arch_disabled()
 
   hermes_enabled= true
   # Set the app_path as env variable so the podspecs can access it.
@@ -94,11 +95,11 @@ def use_react_native! (
   # Better to rely and enable this environment flag if the new architecture is turned on using flags.
   relative_path_from_current = Pod::Config.instance.installation_root.relative_path_from(Pathname.pwd)
   react_native_version = NewArchitectureHelper.extract_react_native_version(File.join(relative_path_from_current, path))
-  fabric_enabled = fabric_enabled || NewArchitectureHelper.new_arch_enabled
+  fabric_enabled = true
 
-  ENV['RCT_FABRIC_ENABLED'] = fabric_enabled ? "1" : "0"
+  ENV['RCT_FABRIC_ENABLED'] = "1"
   ENV['RCT_AGGREGATE_PRIVACY_FILES'] = privacy_file_aggregation_enabled ? "1" : "0"
-  ENV["RCT_NEW_ARCH_ENABLED"] = new_arch_enabled ? "1" : "0"
+  ENV["RCT_NEW_ARCH_ENABLED"] = "1"
 
   prefix = path
 
@@ -110,7 +111,7 @@ def use_react_native! (
   # Update ReactNativeCoreUtils so that we can easily switch between source and prebuilt
   ReactNativeCoreUtils.setup_rncore(prefix, react_native_version)
 
-  Pod::UI.puts "Configuring the target with the #{new_arch_enabled ? "New" : "Legacy"} Architecture\n"
+  Pod::UI.puts "Configuring the target with the New Architecture\n"
 
   # The Pods which should be included in all projects
   pod 'FBLazyVector', :path => "#{prefix}/Libraries/FBLazyVector"
@@ -142,6 +143,7 @@ def use_react_native! (
   pod 'React-featureflagsnativemodule', :path => "#{prefix}/ReactCommon/react/nativemodule/featureflags"
   pod 'React-microtasksnativemodule', :path => "#{prefix}/ReactCommon/react/nativemodule/microtasks"
   pod 'React-idlecallbacksnativemodule', :path => "#{prefix}/ReactCommon/react/nativemodule/idlecallbacks"
+  pod 'React-webperformancenativemodule', :path => "#{prefix}/ReactCommon/react/nativemodule/webperformance"
   pod 'React-domnativemodule', :path => "#{prefix}/ReactCommon/react/nativemodule/dom"
   pod 'React-defaultsnativemodule', :path => "#{prefix}/ReactCommon/react/nativemodule/defaults"
   pod 'React-Mapbuffer', :path => "#{prefix}/ReactCommon"
@@ -162,6 +164,7 @@ def use_react_native! (
   pod 'React-jsinspectortracing', :path => "#{prefix}/ReactCommon/jsinspector-modern/tracing"
 
   pod 'React-callinvoker', :path => "#{prefix}/ReactCommon/callinvoker"
+  pod 'React-performancecdpmetrics', :path => "#{prefix}/ReactCommon/react/performance/cdpmetrics"
   pod 'React-performancetimeline', :path => "#{prefix}/ReactCommon/react/performance/timeline"
   pod 'React-timing', :path => "#{prefix}/ReactCommon/react/timing"
   pod 'React-runtimeexecutor', :path => "#{prefix}/ReactCommon/runtimeexecutor"
@@ -284,10 +287,10 @@ end
 #
 # Parameters:
 # - spec: The spec that has to be configured with the New Architecture code
-# - new_arch_enabled: Whether the module should install dependencies for the new architecture
+# - new_arch_enabled: [DEPRECATED] Whether the module should install dependencies for the new architecture
 def install_modules_dependencies(spec, new_arch_enabled: NewArchitectureHelper.new_arch_enabled)
   folly_config = get_folly_config()
-  NewArchitectureHelper.install_modules_dependencies(spec, new_arch_enabled, folly_config[:version])
+  NewArchitectureHelper.install_modules_dependencies(spec, true, folly_config[:version])
 end
 
 # This function is used by podspecs that needs to use the prebuilt sources for React Native.
@@ -390,7 +393,7 @@ end
 
 # This method can be used to set the fast_float config
 # that can be used to configure libraries.
-def set_fast_float_config(fmt_config)
+def set_fast_float_config(fast_float_config)
   Helpers::Constants.set_fast_float_config(fast_float_config)
 end
 
@@ -451,6 +454,24 @@ def print_cocoapods_deprecation_message()
 
 end
 
+def warn_if_new_arch_disabled
+  if ENV["RCT_NEW_ARCH_ENABLED"] == "1" || ENV["RCT_NEW_ARCH_ENABLED"] == nil
+    return
+  end
+
+  puts ''
+  puts '====================== NEW ARCH ONLY ======================='.yellow
+  puts 'WARNING: Calling pod install with `RCT_NEW_ARCH_ENABLED=0'.yellow
+  puts 'is not supported anymore since React Native 0.82.'.yellow
+  puts 'You can remove the ENV["RCT_NEW_ARCH_ENABLED"]=0 from your'.yellow
+  puts 'Podfie, if you have it.'.yellow
+  puts 'The application will run with the New Architecture enabled'.yellow
+  puts 'by default.'.yellow
+  puts '============================================================'.yellow
+  puts ''
+
+end
+
 def error_if_try_to_use_jsc_from_core()
   explicitly_not_use_hermes = ENV['USE_HERMES'] != nil && ENV['USE_HERMES'] == '0'
   not_use_3rd_party_jsc = ENV['USE_THIRD_PARTY_JSC'] == nil || ENV['USE_THIRD_PARTY_JSC'] == '0'

package/sdks/.hermesversion

@@ -1 +1 @@
-hermes-2025-07-07-RNv0.81.0-e0fc67142ec0763c6b6153ca2bf96df815539782
+hermes-2025-09-01-RNv0.82.0-265ef62ff3eb7289d17e366664ac0da82303e101

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

@@ -20,8 +20,14 @@ end
 
 # package.json
 package = JSON.parse(File.read(File.join(react_native_path, "package.json")))
+# TODO: T231755000 read hermes version from version.properties when consuming hermes
 version = core_version(package['version'])
 
+if ENV['RCT_HERMES_V1_ENABLED'] == "1"
+  versionProperties = Hash[*File.read("version.properties").split(/[=\n]+/)]
+  version = versionProperties['HERMES_V1_VERSION_NAME']
+end
+
 source_type = hermes_source_type(version, react_native_path)
 source = podspec_source(source_type, version, react_native_path)
 
@@ -45,10 +51,10 @@ Pod::Spec.new do |spec|
                     "GCC_WARN_INHIBIT_ALL_WARNINGS" => "YES" # Disable warnings because we don't control this library
                   }
 
-  spec.ios.vendored_frameworks = "destroot/Library/Frameworks/ios/hermes.framework"
-  spec.tvos.vendored_frameworks = "destroot/Library/Frameworks/tvos/hermes.framework"
-  spec.osx.vendored_frameworks = "destroot/Library/Frameworks/macosx/hermes.framework"
-  spec.visionos.vendored_frameworks = "destroot/Library/Frameworks/xros/hermes.framework"
+  spec.ios.vendored_frameworks = "destroot/Library/Frameworks/ios/hermesvm.framework"
+  spec.tvos.vendored_frameworks = "destroot/Library/Frameworks/tvos/hermesvm.framework"
+  spec.osx.vendored_frameworks = "destroot/Library/Frameworks/macosx/hermesvm.framework"
+  spec.visionos.vendored_frameworks = "destroot/Library/Frameworks/xros/hermesvm.framework"
 
   if HermesEngineSourceType::isPrebuilt(source_type) then
 
@@ -56,12 +62,27 @@ Pod::Spec.new do |spec|
       ss.preserve_paths = ["destroot/bin/*"].concat(["**/*.{h,c,cpp}"])
       ss.source_files = "destroot/include/hermes/**/*.h"
       ss.header_mappings_dir = "destroot/include"
-      ss.ios.vendored_frameworks = "destroot/Library/Frameworks/universal/hermes.xcframework"
-      ss.visionos.vendored_frameworks = "destroot/Library/Frameworks/universal/hermes.xcframework"
-      ss.tvos.vendored_frameworks = "destroot/Library/Frameworks/universal/hermes.xcframework"
-      ss.osx.vendored_frameworks = "destroot/Library/Frameworks/macosx/hermes.framework"
+      ss.ios.vendored_frameworks = "destroot/Library/Frameworks/universal/hermesvm.xcframework"
+      ss.visionos.vendored_frameworks = "destroot/Library/Frameworks/universal/hermesvm.xcframework"
+      ss.tvos.vendored_frameworks = "destroot/Library/Frameworks/universal/hermesvm.xcframework"
+      ss.osx.vendored_frameworks = "destroot/Library/Frameworks/macosx/hermesvm.framework"
     end
 
+    # When using the local prebuilt tarball, it should include hermesc compatible with the used VM.
+    # In other cases, when using Hermes V1, the prebuilt versioned binaries can be used.
+    # TODO: T236142916 hermesc should be consumed from NPM even when not using Hermes V1
+    if source_type != HermesEngineSourceType::LOCAL_PREBUILT_TARBALL && ENV['RCT_HERMES_V1_ENABLED'] == "1"
+      hermes_compiler_path = File.dirname(Pod::Executable.execute_command('node', ['-p',
+        'require.resolve(
+        "hermes-compiler",
+        {paths: [process.argv[1]]}
+        )', __dir__]).strip
+      )
+
+      spec.user_target_xcconfig = {
+        'HERMES_CLI_PATH' => "#{hermes_compiler_path}/hermesc/osx-bin/hermesc"
+      }
+    end
 
     # Right now, even reinstalling pods with the PRODUCTION flag turned on, does not change the version of hermes that is downloaded
     # To remove the PRODUCTION flag, we want to download the right version of hermes on the flight
@@ -100,24 +121,26 @@ Pod::Spec.new do |spec|
       ss.header_dir = 'hermes/cdp'
     end
 
-    spec.subspec 'inspector' do |ss|
-      ss.source_files = ''
-      ss.public_header_files = 'API/hermes/inspector/*.h'
-      ss.header_dir = 'hermes/inspector'
-    end
-
-    spec.subspec 'inspector_chrome' do |ss|
-      ss.source_files = ''
-      ss.public_header_files = 'API/hermes/inspector/chrome/*.h'
-      ss.header_dir = 'hermes/inspector/chrome'
-    end
-
     spec.subspec 'Public' do |ss|
       ss.source_files = ''
       ss.public_header_files = 'public/hermes/Public/*.h'
       ss.header_dir = 'hermes/Public'
     end
 
+    if ENV['RCT_HERMES_V1_ENABLED'] != "1"
+      spec.subspec 'inspector' do |ss|
+        ss.source_files = ''
+        ss.public_header_files = 'API/hermes/inspector/*.h'
+        ss.header_dir = 'hermes/inspector'
+      end
+
+      spec.subspec 'inspector_chrome' do |ss|
+        ss.source_files = ''
+        ss.public_header_files = 'API/hermes/inspector/chrome/*.h'
+        ss.header_dir = 'hermes/inspector/chrome'
+      end
+    end
+
     hermesc_path = "${PODS_ROOT}/hermes-engine/build_host_hermesc"
 
     if ENV.has_key?('HERMES_OVERRIDE_HERMESC_PATH') && File.exist?(ENV['HERMES_OVERRIDE_HERMESC_PATH']) then
@@ -139,7 +162,7 @@ Pod::Spec.new do |spec|
         {
           :name => '[RN] [1] Build Hermesc',
           :output_files => [
-            "#{hermesc_path}/ImportHermesc.cmake"
+            "#{hermesc_path}/ImportHostCompilers.cmake"
           ],
           :script => <<-EOS
           . "${REACT_NATIVE_PATH}/scripts/xcode/with-environment.sh"
@@ -149,14 +172,14 @@ Pod::Spec.new do |spec|
         },
         {
           :name => '[RN] [2] Build Hermes',
-          :input_files => ["#{hermesc_path}/ImportHermesc.cmake"],
+          :input_files => ["#{hermesc_path}/ImportHostCompilers.cmake"],
           :output_files => [
-            "${PODS_ROOT}/hermes-engine/build/iphonesimulator/API/hermes/hermes.framework/hermes"
+            "${PODS_ROOT}/hermes-engine/build/iphonesimulator/API/hermes/hermesvm.framework/hermesvm"
           ],
           :script => <<-EOS
           . "${REACT_NATIVE_PATH}/scripts/xcode/with-environment.sh"
           export CMAKE_BINARY=${CMAKE_BINARY:-#{CMAKE_BINARY}}
-          . ${REACT_NATIVE_PATH}/sdks/hermes-engine/utils/build-hermes-xcode.sh #{version} #{hermesc_path}/ImportHermesc.cmake ${REACT_NATIVE_PATH}/ReactCommon/jsi
+          . ${REACT_NATIVE_PATH}/sdks/hermes-engine/utils/build-hermes-xcode.sh #{version} #{hermesc_path}/ImportHostCompilers.cmake ${REACT_NATIVE_PATH}/ReactCommon/jsi
           EOS
         }
       ]

package/sdks/hermes-engine/hermes-utils.rb

@@ -90,6 +90,10 @@ def hermes_commit_envvar_defined()
     return ENV.has_key?('HERMES_COMMIT')
 end
 
+def hermes_v1_enabled()
+    return ENV['RCT_HERMES_V1_ENABLED'] == "1"
+end
+
 def force_build_from_tag(react_native_path)
     return ENV[ENV_BUILD_FROM_SOURCE] === 'true' && File.exist?(hermestag_file(react_native_path))
 end
@@ -181,13 +185,19 @@ end
 
 def podspec_source_build_from_github_tag(react_native_path)
     tag = File.read(hermestag_file(react_native_path)).strip
-    hermes_log("Using tag difined in sdks/.hermesversion: #{tag}")
+
+    if hermes_v1_enabled()
+        hermes_log("Using tag defined in sdks/.hermesv1version: #{tag}")
+    else
+        hermes_log("Using tag defined in sdks/.hermesversion: #{tag}")
+    end
     return {:git => HERMES_GITHUB_URL, :tag => tag}
 end
 
 def podspec_source_build_from_github_main()
-    hermes_log("Using the latest commit from main.")
-    return {:git => HERMES_GITHUB_URL, :commit => `git ls-remote #{HERMES_GITHUB_URL} main | cut -f 1`.strip}
+    branch = hermes_v1_enabled() ? "250829098.0.0-stable" : "main"
+    hermes_log("Using the latest commit from #{branch}.")
+    return {:git => HERMES_GITHUB_URL, :commit => `git ls-remote #{HERMES_GITHUB_URL} #{branch} | cut -f 1`.strip}
 end
 
 def podspec_source_download_prebuild_release_tarball(react_native_path, version)
@@ -211,20 +221,32 @@ def artifacts_dir()
 end
 
 def hermestag_file(react_native_path)
-    return File.join(react_native_path, "sdks", ".hermesversion")
+    if hermes_v1_enabled()
+        return File.join(react_native_path, "sdks", ".hermesv1version")
+    else
+        return File.join(react_native_path, "sdks", ".hermesversion")
+    end
 end
 
 def release_tarball_url(version, build_type)
-    ## You can use the `ENTERPRISE_REPOSITORY` ariable to customise the base url from which artifacts will be downloaded.
+    ## You can use the `ENTERPRISE_REPOSITORY` variable to customise the base url from which artifacts will be downloaded.
     ## The mirror's structure must be the same of the Maven repo the react-native core team publishes on Maven Central.
     maven_repo_url =
         ENV['ENTERPRISE_REPOSITORY'] != nil && ENV['ENTERPRISE_REPOSITORY'] != "" ?
         ENV['ENTERPRISE_REPOSITORY'] :
         "https://repo1.maven.org/maven2"
-    namespace = "com/facebook/react"
-    # Sample url from Maven:
-    # https://repo1.maven.org/maven2/com/facebook/react/react-native-artifacts/0.71.0/react-native-artifacts-0.71.0-hermes-ios-debug.tar.gz
-    return "#{maven_repo_url}/#{namespace}/react-native-artifacts/#{version}/react-native-artifacts-#{version}-hermes-ios-#{build_type.to_s}.tar.gz"
+
+    if hermes_v1_enabled()
+        namespace = "com/facebook/hermes"
+        # Sample url from Maven:
+        # https://repo1.maven.org/maven2/com/facebook/hermes/hermes-ios/0.14.0/hermes-ios-0.14.0-hermes-ios-debug.tar.gz
+        return "#{maven_repo_url}/#{namespace}/hermes-ios/#{version}/hermes-ios-#{version}-hermes-ios-#{build_type.to_s}.tar.gz"
+    else
+        namespace = "com/facebook/react"
+        # Sample url from Maven:
+        # https://repo1.maven.org/maven2/com/facebook/react/react-native-artifacts/0.71.0/react-native-artifacts-0.71.0-hermes-ios-debug.tar.gz
+        return "#{maven_repo_url}/#{namespace}/react-native-artifacts/#{version}/react-native-artifacts-#{version}-hermes-ios-#{build_type.to_s}.tar.gz"
+    end
 end
 
 def download_stable_hermes(react_native_path, version, configuration)
@@ -246,9 +268,18 @@ def download_hermes_tarball(react_native_path, tarball_url, version, configurati
 end
 
 def nightly_tarball_url(version)
+  # TODO: T231755027 update coordinates and versioning
   artifact_coordinate = "react-native-artifacts"
   artifact_name = "hermes-ios-debug.tar.gz"
-  xml_url = "https://central.sonatype.com/repository/maven-snapshots/com/facebook/react/#{artifact_coordinate}/#{version}-SNAPSHOT/maven-metadata.xml"
+  namespace = "com/facebook/react"
+
+  if hermes_v1_enabled()
+    artifact_coordinate = "hermes-ios"
+    artifact_name = "hermes-ios-debug.tar.gz"
+    namespace = "com/facebook/hermes"
+  end
+
+  xml_url = "https://central.sonatype.com/repository/maven-snapshots/#{namespace}/#{artifact_coordinate}/#{version}-SNAPSHOT/maven-metadata.xml"
 
   response = Net::HTTP.get_response(URI(xml_url))
   if response.is_a?(Net::HTTPSuccess)
@@ -256,7 +287,7 @@ def nightly_tarball_url(version)
     timestamp = xml.elements['metadata/versioning/snapshot/timestamp'].text
     build_number = xml.elements['metadata/versioning/snapshot/buildNumber'].text
     full_version = "#{version}-#{timestamp}-#{build_number}"
-    final_url = "https://central.sonatype.com/repository/maven-snapshots/com/facebook/react/#{artifact_coordinate}/#{version}-SNAPSHOT/#{artifact_coordinate}-#{full_version}-#{artifact_name}"
+    final_url = "https://central.sonatype.com/repository/maven-snapshots/#{namespace}/#{artifact_coordinate}/#{version}-SNAPSHOT/#{artifact_coordinate}-#{full_version}-#{artifact_name}"
 
     return final_url
   else

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

@@ -9,7 +9,7 @@
 
 CURR_SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd -P)"
 
-IMPORT_HERMESC_PATH=${HERMES_OVERRIDE_HERMESC_PATH:-$PWD/build_host_hermesc/ImportHermesc.cmake}
+IMPORT_HOST_COMPILERS_PATH=${HERMES_OVERRIDE_HERMESC_PATH:-$PWD/build_host_hermesc/ImportHostCompilers.cmake}
 BUILD_TYPE=${BUILD_TYPE:-Debug}
 
 HERMES_PATH="$CURR_SCRIPT_DIR/.."
@@ -105,6 +105,11 @@ function configure_apple_framework {
     xcode_15_flags="LINKER:-ld_classic"
   fi
 
+  boost_context_flag=""
+  if [[ $1 == "catalyst" ]]; then
+    boost_context_flag="-DHERMES_ALLOW_BOOST_CONTEXT=0"
+  fi
+
   pushd "$HERMES_PATH" > /dev/null || exit 1
     cmake -S . -B "build_$1" \
       -DHERMES_EXTRA_LINKER_FLAGS="$xcode_15_flags" \
@@ -121,28 +126,29 @@ function configure_apple_framework {
       -DHERMES_BUILD_SHARED_JSI:BOOLEAN=false \
       -DCMAKE_CXX_FLAGS:STRING="-gdwarf" \
       -DCMAKE_C_FLAGS:STRING="-gdwarf" \
-      -DIMPORT_HERMESC:PATH="$IMPORT_HERMESC_PATH" \
+      -DIMPORT_HOST_COMPILERS:PATH="$IMPORT_HOST_COMPILERS_PATH" \
       -DJSI_DIR="$JSI_PATH" \
       -DHERMES_RELEASE_VERSION="for RNTV $(get_release_version)" \
-      -DCMAKE_BUILD_TYPE="$cmake_build_type"
+      -DCMAKE_BUILD_TYPE="$cmake_build_type" \
+      $boost_context_flag
     popd > /dev/null || exit 1
 }
 
 function build_host_hermesc_if_needed {
-  if [[ ! -f "$IMPORT_HERMESC_PATH" ]]; then
+  if [[ ! -f "$IMPORT_HOST_COMPILERS_PATH" ]]; then
     build_host_hermesc
   else
-    echo "[HermesC] Skipping! Found an existent hermesc already at: $IMPORT_HERMESC_PATH"
+    echo "[HermesC] Skipping! Found an existent hermesc already at: $IMPORT_HOST_COMPILERS_PATH"
   fi
 }
 
 # Utility function to build an Apple framework
 function build_apple_framework {
-  # Only build host HermesC if no file found at $IMPORT_HERMESC_PATH
+  # Only build host HermesC if no file found at $IMPORT_HOST_COMPILERS_PATH
   build_host_hermesc_if_needed
 
-  # Confirm ImportHermesc.cmake is now available.
-  [ ! -f "$IMPORT_HERMESC_PATH" ] &&
+  # Confirm ImportHostCompilers.cmake is now available.
+  [ ! -f "$IMPORT_HOST_COMPILERS_PATH" ] &&
   echo "Host hermesc is required to build apple frameworks!"
 
   # $1: platform, $2: architectures, $3: deployment target
@@ -151,10 +157,10 @@ function build_apple_framework {
 
   pushd "$HERMES_PATH" > /dev/null || exit 1
     mkdir -p "destroot/Library/Frameworks/$1"
-    cmake --build "./build_$1" --target libhermes -j "${NUM_CORES}"
+    cmake --build "./build_$1" --target hermesvm -j "${NUM_CORES}"
     # Produce the dSYM.
-    xcrun dsymutil "./build_$1/API/hermes/hermes.framework/hermes" -o "./build_$1/API/hermes/hermes.framework.dSYM"
-    cp -R "./build_$1"/API/hermes/hermes.framework* "destroot/Library/Frameworks/$1"
+    xcrun dsymutil "./build_$1/lib/hermesvm.framework/hermesvm" -o "./build_$1/lib/hermesvm.framework.dSYM"
+    cp -R "./build_$1"/lib/hermesvm.framework* "destroot/Library/Frameworks/$1"
 
     # In a MacOS build, also produce the hermes and hermesc CLI tools.
     if [[ $1 == macosx ]]; then
@@ -188,7 +194,7 @@ 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"
+    cp -R "./build_$platform/lib/hermesvm.framework"* "destroot/Library/Frameworks/$platform"
   done
 
   cp "./build_macosx/bin/"* "destroot/bin"
@@ -226,15 +232,15 @@ function create_universal_framework {
 
   for i in "${!platforms[@]}"; do
     local platform="${platforms[$i]}"
-    local hermes_framework_path="${platform}/hermes.framework"
+    local hermes_framework_path="${platform}/hermesvm.framework"
     args+="-framework $hermes_framework_path "
   done
 
   mkdir -p universal
   # shellcheck disable=SC2086
-  if xcodebuild -create-xcframework $args -output "universal/hermes.xcframework"
+  if xcodebuild -create-xcframework $args -output "universal/hermesvm.xcframework"
   then
-    # # Remove the thin iOS hermes.frameworks that are now part of the universal
+    # # Remove the thin iOS hermesvm.frameworks that are now part of the universal
     # XCFramework
     for platform in "${platforms[@]}"; do
       rm -r "$platform"

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

@@ -59,6 +59,11 @@ if [[ $xcode_major_version -ge 15 ]]; then
   xcode_15_flags="LINKER:-ld_classic"
 fi
 
+boost_context_flag=""
+if [[ $PLATFORM_NAME == "catalyst" ]]; then
+  boost_context_flag="-DHERMES_ALLOW_BOOST_CONTEXT=0"
+fi
+
 architectures=$( echo "$ARCHS" | tr  " " ";" )
 
 echo "Configure Apple framework"
@@ -80,22 +85,24 @@ echo "Configure Apple framework"
   -DHERMES_BUILD_SHARED_JSI:BOOLEAN=false \
   -DCMAKE_CXX_FLAGS:STRING="-gdwarf" \
   -DCMAKE_C_FLAGS:STRING="-gdwarf" \
-  -DIMPORT_HERMESC:PATH="${hermesc_path}" \
+  -DIMPORT_HOST_COMPILERS:PATH="${hermesc_path}" \
   -DJSI_DIR="$jsi_path" \
   -DHERMES_RELEASE_VERSION="for RN $release_version" \
-  -DCMAKE_BUILD_TYPE="$cmake_build_type"
+  -DCMAKE_BUILD_TYPE="$cmake_build_type" \
+  $boost_context_flag
 
 echo "Build Apple framework"
 
 "$CMAKE_BINARY" \
   --build "${PODS_ROOT}/hermes-engine/build/${PLATFORM_NAME}" \
-  --target libhermes \
+  --target hermesvm \
   -j "$(sysctl -n hw.ncpu)"
 
 echo "Copy Apple framework to destroot/Library/Frameworks"
 
 platform_copy_destination=$(get_platform_copy_destination $PLATFORM_NAME)
 
+mkdir -p "${PODS_ROOT}/hermes-engine/destroot/Library/Frameworks/${platform_copy_destination}"
 cp -pfR \
-  "${PODS_ROOT}/hermes-engine/build/${PLATFORM_NAME}/API/hermes/hermes.framework" \
+  "${PODS_ROOT}/hermes-engine/build/${PLATFORM_NAME}/lib/hermesvm.framework" \
   "${PODS_ROOT}/hermes-engine/destroot/Library/Frameworks/${platform_copy_destination}"

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

@@ -18,7 +18,7 @@ SDKROOT=$(xcode-select -p)/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk
 env -i \
   PATH="$PATH" \
   SDKROOT="$SDKROOT" \
-  "$CMAKE_BINARY" -S "${PODS_ROOT}/hermes-engine" -B "$hermesc_dir_path" -DJSI_DIR="$jsi_path"
+  "$CMAKE_BINARY" -S "${PODS_ROOT}/hermes-engine" -B "$hermesc_dir_path" -DJSI_DIR="$jsi_path" -DCMAKE_BUILD_TYPE=Release
 
 env -i \
   PATH="$PATH" \

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

@@ -39,7 +39,7 @@ function get_deployment_target {
 # build a single framework
 # $1 is the target to build
 function build_framework {
-  if [ ! -d destroot/Library/Frameworks/universal/hermes.xcframework ]; then
+  if [ ! -d destroot/Library/Frameworks/universal/hermesvm.xcframework ]; then
     deployment_target=$(get_deployment_target "$1")
 
     architecture=$(get_architecture "$1")
@@ -52,7 +52,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
+    if [ ! -d destroot/Library/Frameworks/universal/hermesvm.xcframework ]; then
         create_universal_framework "iphoneos" "iphonesimulator" "catalyst" "xros" "xrsimulator" "appletvos" "appletvsimulator"
     else
         echo "Skipping; Clean \"destroot\" to rebuild".
@@ -62,7 +62,7 @@ function build_universal_framework {
 # single function that builds sequentially iphoneos, iphonesimulator and catalyst
 # this is used to preserve backward compatibility
 function create_framework {
-    if [ ! -d destroot/Library/Frameworks/universal/hermes.xcframework ]; then
+    if [ ! -d destroot/Library/Frameworks/universal/hermesvm.xcframework ]; then
         build_framework "iphoneos"
         build_framework "iphonesimulator"
         build_framework "appletvos"

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

@@ -13,7 +13,7 @@ set -e
 CURR_SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd -P)"
 . "${CURR_SCRIPT_DIR}/build-apple-framework.sh"
 
-if [ ! -d destroot/Library/Frameworks/macosx/hermes.framework ]; then
+if [ ! -d destroot/Library/Frameworks/macosx/hermesvm.framework ]; then
     mac_deployment_target=$(get_mac_deployment_target)
 
     build_apple_framework "macosx" "x86_64;arm64" "$mac_deployment_target"

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

@@ -8,7 +8,7 @@ set -x
 
 # CocoaPods requires vendored frameworks to exist before `pod install` is run,
 # and to be proper Moch-O binaries in order to auto-link them to the user's Xcode project.
-# This script creates dummy hermes.framework for macosx and ios.
+# This script creates dummy hermesvm.framework for macosx and ios.
 # They are then get rewritten by `build-hermes-xcode.sh` during Xcode build.
 
 rm -rf destroot
@@ -21,10 +21,10 @@ echo '' > dummy.c
 
 platforms=( "macosx" "ios" "xros" ) # Add other platforms here if needed
 
-for platform in "${platforms[@]}" 
-do 
-    mkdir -p "${platform}/hermes.framework"
-    clang dummy.c -dynamiclib -o "${platform}/hermes.framework/hermes"
+for platform in "${platforms[@]}"
+do
+    mkdir -p "${platform}/hermesvm.framework"
+    clang dummy.c -dynamiclib -o "${platform}/hermesvm.framework/hermesvm"
 done
 
 rm dummy.c

package/sdks/hermes-engine/version.properties

@@ -0,0 +1 @@
+HERMES_V1_VERSION_NAME=250829098.0.1

package/settings.gradle.kts

@@ -29,3 +29,35 @@ include(":packages:react-native:ReactAndroid:hermes-engine")
 
 project(":packages:react-native:ReactAndroid:hermes-engine").projectDir =
     file("ReactAndroid/hermes-engine/")
+
+// Since Gradle 9.0, all the projects in the path must have an existing folder.
+// As we build :packages:react-native:ReactAndroid, we need to declare the folders
+// for :packages and :packages:react-native as well as otherwise the build from
+// source will fail with a missing folder exception.
+
+project(":packages").projectDir = file("/tmp")
+
+project(":packages:react-native").projectDir = file("/tmp")
+
+// Gradle properties defined in `gradle.properties` are not inherited by
+// included builds, see https://github.com/gradle/gradle/issues/2534.
+// This is a workaround to read the configuration from the consuming project,
+// and apply relevant properties to the :react-native project.
+buildscript {
+  val properties = java.util.Properties()
+  val propertiesToInherit = listOf("hermesV1Enabled", "react.hermesV1Enabled")
+
+  try {
+    file("../../android/gradle.properties").inputStream().use { properties.load(it) }
+
+    gradle.rootProject {
+      propertiesToInherit.forEach { property ->
+        if (properties.containsKey(property)) {
+          gradle.rootProject.extra.set(property, properties.getProperty(property))
+        }
+      }
+    }
+  } catch (e: Exception) {
+    // fail silently
+  }
+}