react-native-tvos 0.71.8-0rc1 → 0.71.8-0rc3

package/Libraries/Core/ReactNativeVersion.js

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

package/React/Base/RCTVersion.m

@@ -24,7 +24,7 @@ NSDictionary* RCTGetReactNativeVersion(void)
                   RCTVersionMajor: @(0),
                   RCTVersionMinor: @(71),
                   RCTVersionPatch: @(8),
-                  RCTVersionPrerelease: @"0rc1",
+                  RCTVersionPrerelease: @"0rc3",
                   };
   });
   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/React-Core.podspec

@@ -19,7 +19,6 @@ end
 folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
 folly_version = '2021.07.22.00'
 boost_compiler_flags = '-Wno-documentation'
-tvos_no_hermes_flags = '-DRCT_USE_HERMES=0'
 
 use_hermes = ENV['USE_HERMES'] == '1'
 
@@ -61,7 +60,7 @@ Pod::Spec.new do |s|
   s.source                 = source
   s.resource_bundle        = { "AccessibilityResources" => ["React/AccessibilityResources/*.lproj"]}
   s.ios.compiler_flags     = folly_compiler_flags + ' ' + boost_compiler_flags
-  s.tvos.compiler_flags    = folly_compiler_flags + ' ' + boost_compiler_flags + ' ' + tvos_no_hermes_flags
+  s.tvos.compiler_flags    = folly_compiler_flags + ' ' + boost_compiler_flags
   s.header_dir             = "React"
   s.framework              = "JavaScriptCore"
   s.pod_target_xcconfig    = {

package/ReactAndroid/gradle.properties

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

package/ReactAndroid/hermes-engine/build.gradle

@@ -47,7 +47,7 @@ def hermesDir = System.getenv("REACT_NATIVE_OVERRIDE_HERMES_DIR") ?: new File(re
 def hermesBuildDir = new File("$buildDir/hermes")
 
 def hermesVersion = "main"
-def hermesVersionFile = new File(reactNativeRootDir, "sdks/.hermesversion")
+def hermesVersionFile = new File(reactNativeRootDir, "node_modules/react-native-core/sdks/.hermesversion")
 if (hermesVersionFile.exists()) {
     hermesVersion = hermesVersionFile.text
 }

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", "0rc1");
+      "prerelease", "0rc3");
 }

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 = "0rc1";
+  std::string_view Prerelease = "0rc3";
 } ReactNativeVersion;
 
 } // namespace facebook::react

package/ReactCommon/hermes/React-hermes.podspec

@@ -31,7 +31,7 @@ Pod::Spec.new do |s|
   s.homepage               = "https://reactnative.dev/"
   s.license                = package['license']
   s.author                 = "Facebook, Inc. and its affiliates"
-  s.platforms              = { :osx => "10.14", :ios => "12.4" }
+  s.platforms              = { :osx => "10.14", :ios => "12.4", :tvos => "12.4" }
   s.source                 = source
   s.source_files           = "executor/*.{cpp,h}",
                              "inspector/*.{cpp,h}",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-tvos",
-  "version": "0.71.8-0rc1",
+  "version": "0.71.8-0rc3",
   "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/scripts/hermes/hermes-utils.js

@@ -18,7 +18,7 @@ const SDKS_DIR = path.normalize(path.join(__dirname, '..', '..', 'sdks'));
 const HERMES_DIR = path.join(SDKS_DIR, 'hermes');
 const HERMES_TAG_FILE_PATH = path.join(SDKS_DIR, '.hermesversion');
 const HERMES_SOURCE_TARBALL_BASE_URL =
-  'https://github.com/facebook/hermes/tarball/';
+  'https://github.com/react-native-tvos/hermes/tarball/';
 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');
@@ -72,7 +72,7 @@ function setHermesTag(hermesTag) {
 
 function getHermesTagSHA(hermesTag) {
   return execSync(
-    `git ls-remote https://github.com/facebook/hermes ${hermesTag} | cut -f 1`,
+    `git ls-remote https://github.com/react-native-tvos/hermes ${hermesTag} | cut -f 1`,
   )
     .toString()
     .trim();
@@ -98,7 +98,7 @@ function downloadHermesSourceTarball() {
   }
 
   console.info(
-    `[Hermes] Downloading Hermes source code for commit ${hermesTagSHA}`,
+    `[Hermes] Downloading Hermes source code for commit ${hermesTagSHA} from ${hermesTarballUrl}`,
   );
   try {
     delegateSync('curl', [hermesTarballUrl, '-Lo', hermesTarballDownloadPath]);

package/sdks/.hermesversion

@@ -1 +1 @@
-hermes-2023-03-07-RNv0.71.4-31fdcf738940875c9bacf251e149006cf515d763
+hermes-2023-05-19-RNv0.71.8-03c5337ba368c343ff3220d428c58f499dbb4ff1

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

@@ -20,7 +20,7 @@ hermestag_file = File.join(react_native_path, "sdks", ".hermesversion")
 isInCI = ENV['REACT_NATIVE_CI'] === 'true'
 
 source = {}
-git = "https://github.com/facebook/hermes.git"
+git = "https://github.com/react-native-tvos/hermes.git"
 
 isInMain = version.include?('1000.0.0')
 isNightly = version.start_with?('0.0.0-')
@@ -51,7 +51,9 @@ elsif File.exist?(hermestag_file) && isInCI
 else
   # 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
-  source[:http] = "https://repo1.maven.org/maven2/com/facebook/react/react-native-artifacts/#{version}/react-native-artifacts-#{version}-hermes-ios-#{build_type.to_s}.tar.gz"
+  source[:http] = "https://s01.oss.sonatype.org/content/groups/public/io/github/react-native-tvos/react-native-artifacts/#{version}/react-native-artifacts-#{version}-hermes-ios-#{build_type.to_s}.tar.gz"
+  # Use the URL below when testing artifacts published to local temp Maven
+  # source[:http] = "file:///tmp/maven-local/io/github/react-native-tvos/react-native-artifacts/#{version}/react-native-artifacts-#{version}-hermes-ios-#{build_type.to_s}.tar.gz"
 end
 
 Pod::Spec.new do |spec|
@@ -63,7 +65,7 @@ Pod::Spec.new do |spec|
   spec.license     = package['license']
   spec.author      = "Facebook"
   spec.source      = source
-  spec.platforms   = { :osx => "10.13", :ios => "12.4" }
+  spec.platforms   = { :osx => "10.13", :ios => "12.4", :tvos => "12.4" }
 
   spec.preserve_paths      = '**/*.*'
   spec.source_files        = ''
@@ -81,6 +83,7 @@ Pod::Spec.new do |spec|
       ss.exclude_files = ["destroot/include/jsi/jsi/JSIDynamic.{h,cpp}", "destroot/include/jsi/jsi/jsilib-*.{h,cpp}"]
       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.osx.vendored_frameworks = "destroot/Library/Frameworks/macosx/hermes.framework"
     end
 
@@ -119,6 +122,8 @@ Pod::Spec.new do |spec|
     spec.user_target_xcconfig = {
       'FRAMEWORK_SEARCH_PATHS' => '"$(PODS_ROOT)/hermes-engine/destroot/Library/Frameworks/iphoneos" ' +
                                   '"$(PODS_ROOT)/hermes-engine/destroot/Library/Frameworks/iphonesimulator" ' +
+                                  '"$(PODS_ROOT)/hermes-engine/destroot/Library/Frameworks/appletvos" ' +
+                                  '"$(PODS_ROOT)/hermes-engine/destroot/Library/Frameworks/appletvsimulator" ' +
                                   '"$(PODS_ROOT)/hermes-engine/destroot/Library/Frameworks/macosx" ' +
                                   '"$(PODS_ROOT)/hermes-engine/destroot/Library/Frameworks/catalyst"',
       'OTHER_LDFLAGS' => '-framework "hermes"',

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

@@ -37,6 +37,10 @@ function get_ios_deployment_target {
   use_env_var_or_ruby_prop "${IOS_DEPLOYMENT_TARGET}" "deployment_target('ios')"
 }
 
+function get_tvos_deployment_target {
+  use_env_var_or_ruby_prop "${IOS_DEPLOYMENT_TARGET}" "deployment_target('tvos')"
+}
+
 function get_mac_deployment_target {
   use_env_var_or_ruby_prop "${MAC_DEPLOYMENT_TARGET}" "deployment_target('osx')"
 }
@@ -54,11 +58,14 @@ function build_host_hermesc {
 function configure_apple_framework {
   local build_cli_tools enable_bitcode enable_debugger cmake_build_type
 
-  if [[ $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
@@ -70,9 +77,7 @@ function configure_apple_framework {
     enable_debugger="false"
   fi
   if [[ $BUILD_TYPE == "Debug" ]]; then
-    # JS developers aren't VM developers.
-    # Therefore we're passing as build type Release, to provide a faster build.
-    cmake_build_type="Release"
+    cmake_build_type="Debug"
   else
     cmake_build_type="MinSizeRel"
   fi

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

@@ -10,12 +10,16 @@ CURR_SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd -P)"
 
 if [ ! -d destroot/Library/Frameworks/universal/hermes.xcframework ]; then
     ios_deployment_target=$(get_ios_deployment_target)
+    tvos_deployment_target=$(get_tvos_deployment_target)
 
     build_apple_framework "iphoneos" "arm64" "$ios_deployment_target"
     build_apple_framework "iphonesimulator" "x86_64;arm64" "$ios_deployment_target"
     build_apple_framework "catalyst" "x86_64;arm64" "$ios_deployment_target"
 
-    create_universal_framework "iphoneos" "iphonesimulator" "catalyst"
+    build_apple_framework "appletvos" "arm64" "$tvos_deployment_target"
+    build_apple_framework "appletvsimulator" "x86_64;arm64" "$tvos_deployment_target"
+
+    create_universal_framework "iphoneos" "iphonesimulator" "appletvos" "appletvsimulator" "catalyst"
 else
     echo "Skipping; Clean \"destroot\" to rebuild".
 fi

package/template/package.json

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