react-native 0.71.0-rc.1 → 0.71.0-rc.2

package/Libraries/Core/ReactNativeVersion.js

@@ -13,5 +13,5 @@ exports.version = {
   major: 0,
   minor: 71,
   patch: 0,
-  prerelease: 'rc.1',
+  prerelease: 'rc.2',
 };

package/React/Base/RCTVersion.m

@@ -24,7 +24,7 @@ NSDictionary* RCTGetReactNativeVersion(void)
                   RCTVersionMajor: @(0),
                   RCTVersionMinor: @(71),
                   RCTVersionPatch: @(0),
-                  RCTVersionPrerelease: @"rc.1",
+                  RCTVersionPrerelease: @"rc.2",
                   };
   });
   return __rnVersion;

package/ReactAndroid/gradle.properties

@@ -1,4 +1,4 @@
-VERSION_NAME=0.71.0-rc.1
+VERSION_NAME=0.71.0-rc.2
 GROUP=com.facebook.react
 
 # JVM Versions

package/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java

@@ -18,5 +18,5 @@ public class ReactNativeVersion {
       "major", 0,
       "minor", 71,
       "patch", 0,
-      "prerelease", "rc.1");
+      "prerelease", "rc.2");
 }

package/ReactCommon/cxxreact/ReactNativeVersion.h

@@ -18,7 +18,7 @@ constexpr struct {
   int32_t Major = 0;
   int32_t Minor = 71;
   int32_t Patch = 0;
-  std::string_view Prerelease = "rc.1";
+  std::string_view Prerelease = "rc.2";
 } ReactNativeVersion;
 
 } // namespace facebook::react

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native",
-  "version": "0.71.0-rc.1",
+  "version": "0.71.0-rc.2",
   "bin": "./cli.js",
   "description": "A framework for building native apps using React",
   "license": "MIT",

package/scripts/cocoapods/jsengine.rb

@@ -37,7 +37,7 @@ end
 
 def add_copy_hermes_framework_script_phase(installer, react_native_path)
     utils_dir = File.join(react_native_path, "sdks", "hermes-engine", "utils")
-    phase_name = "[RN]Copy Hermes framework"
+    phase_name = "[RN] Copy Hermes Framework"
     project = installer.generated_aggregate_targets.first.user_project
     target = project.targets.first
     if target.shell_script_build_phases.none? { |phase| phase.name == phase_name }
@@ -49,9 +49,14 @@ end
 
 def remove_copy_hermes_framework_script_phase(installer, react_native_path)
     utils_dir = File.join(react_native_path, "sdks", "hermes-engine", "utils")
-    phase_name = "[RN]Copy Hermes framework"
+    phase_name = "[RN] Copy Hermes Framework"
     project = installer.generated_aggregate_targets.first.user_project
-    project.targets.first.shell_script_build_phases.delete_if { |phase| phase.name == phase_name }
+    target = project.native_targets.first
+    target.shell_script_build_phases.each do |phase|
+        if phase.name == phase_name
+            target.build_phases.delete(phase)
+        end
+    end
     project.save()
 end
 
@@ -59,14 +64,18 @@ def remove_hermesc_build_dir(react_native_path)
     %x(rm -rf #{react_native_path}/sdks/hermes-engine/build_host_hermesc)
 end
 
-def is_building_hermes_from_source(react_native_version)
-    is_nightly = react_native_version.start_with?('0.0.0-')
-    has_tarball = ENV['HERMES_ENGINE_TARBALL_PATH'] != nil
-
-    # this is the same logic in the hermes-engine.podspec
-    if has_tarball || is_nightly
+def is_building_hermes_from_source(react_native_version, react_native_path)
+    if ENV['HERMES_ENGINE_TARBALL_PATH'] != nil
         return false
     end
 
-    return true
+    isInMain = react_native_version.include?('1000.0.0')
+
+    hermestag_file = File.join(react_native_path, "sdks", ".hermesversion")
+    isInCI = ENV['CI'] === 'true'
+
+    isReleaseBranch = File.exist?(hermestag_file) && isInCI
+
+
+    return isInMain || isReleaseBranch
 end

package/scripts/react_native_pods.rb

@@ -205,10 +205,11 @@ def react_native_post_install(installer, react_native_path = "../node_modules/re
   package = JSON.parse(File.read(File.join(react_native_path, "package.json")))
   version = package['version']
 
-  if ReactNativePodsUtils.has_pod(installer, 'hermes-engine') && is_building_hermes_from_source(version)
+  if ReactNativePodsUtils.has_pod(installer, 'hermes-engine') && is_building_hermes_from_source(version, react_native_path)
     add_copy_hermes_framework_script_phase(installer, react_native_path)
   else
     remove_copy_hermes_framework_script_phase(installer, react_native_path)
+    remove_hermesc_build_dir(react_native_path)
   end
 
   ReactNativePodsUtils.exclude_i386_architecture_while_using_hermes(installer)

package/template/package.json

@@ -11,7 +11,7 @@
   },
   "dependencies": {
     "react": "18.2.0",
-    "react-native": "0.71.0-rc.1"
+    "react-native": "0.71.0-rc.2"
   },
   "devDependencies": {
     "@babel/core": "^7.12.9",