react-native 0.73.0-rc.2 → 0.73.0-rc.3

package/sdks/hermes-engine/utils/replace_hermes_version.js

@@ -52,8 +52,8 @@ function shouldReplaceHermesConfiguration(configuration) {
   return true;
 }
 
-function replaceHermesConfiguration(configuration, version, reactNativePath) {
-  const tarballURLPath = `${reactNativePath}/sdks/downloads/hermes-ios-${version}-${configuration}.tar.gz`;
+function replaceHermesConfiguration(configuration, version, podsRoot) {
+  const tarballURLPath = `${podsRoot}/hermes-engine-artifacts/hermes-ios-${version}-${configuration}.tar.gz`;
 
   const finalLocation = 'hermes-engine';
   console.log('Preparing the final location');
@@ -68,7 +68,7 @@ function updateLastBuildConfiguration(configuration) {
   fs.writeFileSync(LAST_BUILD_FILENAME, configuration);
 }
 
-function main(configuration, version, reactNativePath) {
+function main(configuration, version, podsRoot) {
   validateBuildConfiguration(configuration);
   validateVersion(version);
 
@@ -76,7 +76,7 @@ function main(configuration, version, reactNativePath) {
     return;
   }
 
-  replaceHermesConfiguration(configuration, version, reactNativePath);
+  replaceHermesConfiguration(configuration, version, podsRoot);
   updateLastBuildConfiguration(configuration);
   console.log('Done replacing hermes-engine');
 }
@@ -94,13 +94,13 @@ const argv = yargs
       'The Version of React Native associated with the Hermes tarball.',
   })
   .option('p', {
-    alias: 'reactNativePath',
-    description: 'The path to the React Native root folder',
+    alias: 'podsRoot',
+    description: 'The path to the Pods root folder',
   })
   .usage('Usage: $0 -c Debug -r <version> -p <path/to/react-native>').argv;
 
 const configuration = argv.configuration;
 const version = argv.reactNativeVersion;
-const reactNativePath = argv.reactNativePath;
+const podsRoot = argv.podsRoot;
 
-main(configuration, version, reactNativePath);
+main(configuration, version, podsRoot);

package/template/android/app/build.gradle

@@ -71,7 +71,7 @@ def jscFlavor = 'org.webkit:android-jsc:+'
 
 android {
     ndkVersion rootProject.ext.ndkVersion
-
+    buildToolsVersion rootProject.ext.buildToolsVersion
     compileSdk rootProject.ext.compileSdkVersion
 
     namespace "com.helloworld"

package/template/android/app/src/main/java/com/helloworld/MainApplication.kt

@@ -3,17 +3,15 @@ package com.helloworld
 import android.app.Application
 import com.facebook.react.PackageList
 import com.facebook.react.ReactApplication
+import com.facebook.react.ReactHost
 import com.facebook.react.ReactNativeHost
 import com.facebook.react.ReactPackage
-import com.facebook.react.common.annotations.UnstableReactNativeAPI
 import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.load
-import com.facebook.react.defaults.DefaultReactHost
+import com.facebook.react.defaults.DefaultReactHost.getDefaultReactHost
 import com.facebook.react.defaults.DefaultReactNativeHost
 import com.facebook.react.flipper.ReactNativeFlipper
-import com.facebook.react.interfaces.ReactHost
 import com.facebook.soloader.SoLoader
 
-@UnstableReactNativeAPI
 class MainApplication : Application(), ReactApplication {
 
   override val reactNativeHost: ReactNativeHost =
@@ -33,12 +31,7 @@ class MainApplication : Application(), ReactApplication {
       }
 
   override val reactHost: ReactHost
-    get() =
-        DefaultReactHost.getDefaultReactHost(
-            context = this,
-            packageList = PackageList(this).packages,
-            jsMainModulePath = "index",
-            isHermesEnabled = BuildConfig.IS_HERMES_ENABLED)
+    get() = getDefaultReactHost(this.applicationContext, reactNativeHost)
 
   override fun onCreate() {
     super.onCreate()

package/template/package.json

@@ -11,7 +11,7 @@
   },
   "dependencies": {
     "react": "18.2.0",
-    "react-native": "0.73.0-rc.2"
+    "react-native": "0.73.0-rc.3"
   },
   "devDependencies": {
     "@babel/core": "^7.20.0",

package/third-party-podspecs/glog.podspec

@@ -29,10 +29,23 @@ Pod::Spec.new do |spec|
                         'src/base/*.h'
   spec.exclude_files       = "src/windows/**/*"
   spec.compiler_flags      = '-Wno-shorten-64-to-32'
+
+  # TODO: T167482718 Remove this code after April 2024, when Apple will
+  # push the lower version of Xcode required to upload apps to the Store.
+  xcode_path = `xcodebuild -version` # This return the current version of Xcode
+
+  match = xcode_path.match(/Xcode (\d+)\.(\d+)/)
+  major_version = match[1].to_i
+  minor_version = match[2].to_i
+  is_greater_than_15 = major_version >= 15
+  is_greater_than_14_3 = major_version == 14 && minor_version >= 3
+  should_define_modules = is_greater_than_15 ? "YES" : is_greater_than_14_3 ? "YES" : "NO"
+  # End TODO.
+
   spec.pod_target_xcconfig = {
     "USE_HEADERMAP" => "NO",
     "HEADER_SEARCH_PATHS" => "$(PODS_TARGET_SRCROOT)/src",
-    "DEFINES_MODULE" => "YES"
+    "DEFINES_MODULE" => should_define_modules # When the workaround is removed, set this var to "YES"
   }
 
   # Pinning to the same version as React.podspec.