react-native-tvos 0.71.8-0rc2 → 0.71.8-0rc4

package/Libraries/Core/ReactNativeVersion.js

@@ -13,5 +13,5 @@ exports.version = {
   major: 0,
   minor: 71,
   patch: 8,
-  prerelease: '0rc2',
+  prerelease: '0rc4',
 };

package/React/Base/RCTVersion.m

@@ -24,7 +24,7 @@ NSDictionary* RCTGetReactNativeVersion(void)
                   RCTVersionMajor: @(0),
                   RCTVersionMinor: @(71),
                   RCTVersionPatch: @(8),
-                  RCTVersionPrerelease: @"0rc2",
+                  RCTVersionPrerelease: @"0rc4",
                   };
   });
   return __rnVersion;

package/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm

@@ -1029,8 +1029,10 @@ using namespace facebook::react;
   if ([_propKeysManagedByAnimated_DO_NOT_USE_THIS_IS_BROKEN containsObject:@"opacity"]) {
     self.layer.opacity = (float)props.opacity;
   }
-  
+
+#if TARGET_OS_TV
   [self removeFocusGuide];
+#endif
 
   _propKeysManagedByAnimated_DO_NOT_USE_THIS_IS_BROKEN = nil;
   _eventEmitter.reset();

package/ReactAndroid/build.gradle

@@ -539,6 +539,8 @@ android {
         // that will include the necessary .so files to load.
         exclude("**/libhermes.so")
         exclude("**/libjsc.so")
+        exclude "**/libc++_shared.so"
+        exclude "**/libfbjni.so"
     }
 
     buildFeatures {
@@ -666,6 +668,8 @@ dependencies {
     // Therefore hermes-engine is a compileOnly dependency.
     compileOnly(project(":ReactAndroid:hermes-engine"))
 
+    implementation("com.facebook.fbjni:fbjni:0.3.0")
+
     testImplementation("junit:junit:${JUNIT_VERSION}")
     testImplementation("org.assertj:assertj-core:${ASSERTJ_VERSION}")
     testImplementation("org.mockito:mockito-core:${MOCKITO_CORE_VERSION}")

package/ReactAndroid/gradle.properties

@@ -1,4 +1,4 @@
-VERSION_NAME=0.71.8-0rc2
+VERSION_NAME=0.71.8-0rc4
 
 # GROUP=com.facebook.react
 # Group for the TV repo

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

@@ -18,5 +18,5 @@ public class ReactNativeVersion {
       "major", 0,
       "minor", 71,
       "patch", 8,
-      "prerelease", "0rc2");
+      "prerelease", "0rc4");
 }

package/ReactCommon/cxxreact/ReactNativeVersion.h

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-tvos",
-  "version": "0.71.8-0rc2",
+  "version": "0.71.8-0rc4",
   "bin": "./cli.js",
   "description": "A framework for building native apps using React",
   "license": "MIT",

package/scripts/cocoapods/new_architecture.rb

@@ -16,7 +16,7 @@ class NewArchitectureHelper
         language_standard = nil
 
         installer.pods_project.targets.each do |target|
-            if target.name == 'React-Core'
+            if target.name.include? 'React-Core'
                 language_standard = target.resolved_build_setting("CLANG_CXX_LANGUAGE_STANDARD", resolve_against_xcconfig: true).values[0]
             end
         end
@@ -54,7 +54,7 @@ class NewArchitectureHelper
 
         # Add RCT_NEW_ARCH_ENABLED to generated pod target projects
         installer.target_installation_results.pod_target_installation_results.each do |pod_name, target_installation_result|
-            if pod_name == 'React-Core'
+            if pod_name.include? 'React-Core'
                 target_installation_result.native_target.build_configurations.each do |config|
                     config.build_settings['OTHER_CPLUSPLUSFLAGS'] = @@new_arch_cpp_flags
                 end

package/scripts/cocoapods/utils.rb

@@ -66,6 +66,7 @@ class ReactNativePodsUtils
         projects.each do |project|
             project.build_configurations.each do |config|
                 config.build_settings["EXCLUDED_ARCHS[sdk=iphonesimulator*]"] = excluded_archs_default
+                config.build_settings["EXCLUDED_ARCHS[sdk=appletvsimulator*]"] = excluded_archs_default
             end
 
             project.save()

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

@@ -58,11 +58,14 @@ function build_host_hermesc {
 function configure_apple_framework {
   local build_cli_tools enable_bitcode enable_debugger cmake_build_type
 
-  if [[ $1 == appletvos || $1 == iphoneos || $1 == catalyst ]]; then
-    enable_bitcode="true"
-  else
-    enable_bitcode="false"
-  fi
+#  if [[ $1 == appletvos || $1 == iphoneos || $1 == catalyst ]]; then
+#    enable_bitcode="true"
+#  else
+#    enable_bitcode="false"
+#  fi
+#
+# Xcode 14 deprecates bitcode, so we turn this off
+  enable_bitcode="false"
   if [[ $1 == macosx ]]; then
     build_cli_tools="true"
   else

package/template/package.json

@@ -11,7 +11,7 @@
   },
   "dependencies": {
     "react": "18.2.0",
-    "react-native": "npm:react-native-tvos@0.71.8-0rc2"
+    "react-native": "npm:react-native-tvos@0.71.8-0rc4"
   },
   "devDependencies": {
     "@babel/core": "^7.20.0",