Update coordinates for remote artifacts of Hermes V1 (#53822)

Summary:
Pull Request resolved: #53822

Changelog: [GENERAL][FIXED] - Fixed coordinates for Hermes V1 artifacts

Reviewed By: cortinico

Differential Revision: D82639319

fbshipit-source-id: becfab3248f2314af97549eb94feb27b19f5d1af

Author: j-piasecki

packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/DependencyUtils.kt

@@ -191,6 +191,14 @@ internal object DependencyUtils {
               "The hermes-android dependency was modified to use the correct Maven group.",
           )
       )
+    } else if (hermesV1Enabled) {
+      dependencySubstitution.add(
+          Triple(
+              "com.facebook.react:hermes-android",
+              hermesVersionString,
+              "The hermes-android dependency was modified to use Hermes V1.",
+          )
+      )
     }
     return dependencySubstitution
   }

packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/PathUtils.kt

@@ -242,7 +242,7 @@ internal fun readPackageJsonFile(
   return packageJson?.let { JsonUtils.fromPackageJson(it) }
 }
 
-private const val HERMES_COMPILER_NPM_DIR = "node_modules/hermes-compiler/%OS-BIN%/"
+private const val HERMES_COMPILER_NPM_DIR = "node_modules/hermes-compiler/hermesc/%OS-BIN%/"
 private const val HERMESC_IN_REACT_NATIVE_DIR = "node_modules/react-native/sdks/hermesc/%OS-BIN%/"
 private const val HERMESC_BUILT_FROM_SOURCE_DIR =
     "node_modules/react-native/ReactAndroid/hermes-engine/build/hermes/bin/"

packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/utils/PathUtilsTest.kt

@@ -165,8 +165,8 @@ class PathUtilsTest {
   @Test
   @WithOs(OS.MAC)
   fun detectOSAwareHermesCommand_withHermesV1Enabled() {
-    tempFolder.newFolder("node_modules/hermes-compiler/osx-bin/")
-    val expected = tempFolder.newFile("node_modules/hermes-compiler/osx-bin/hermesc")
+    tempFolder.newFolder("node_modules/hermes-compiler/hermesc/osx-bin/")
+    val expected = tempFolder.newFile("node_modules/hermes-compiler/hermesc/osx-bin/hermesc")
 
     assertThat(detectOSAwareHermesCommand(tempFolder.root, "", hermesV1Enabled = true))
         .isEqualTo(expected.toString())

packages/react-native/sdks/hermes-engine/hermes-engine.podspec

@@ -80,7 +80,7 @@ Pod::Spec.new do |spec|
       )
 
       spec.user_target_xcconfig = {
-        'HERMES_CLI_PATH' => "#{hermes_compiler_path}/osx-bin/hermesc"
+        'HERMES_CLI_PATH' => "#{hermes_compiler_path}/hermesc/osx-bin/hermesc"
       }
     end
 

packages/react-native/sdks/hermes-engine/hermes-utils.rb

@@ -228,8 +228,8 @@ def release_tarball_url(version, build_type)
     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-debug.tar.gz
-        return "#{maven_repo_url}/#{namespace}/hermes-ios/#{version}/hermes-ios-#{version}-#{build_type.to_s}.tar.gz"
+        # 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:

packages/react-native/settings.gradle.kts

@@ -38,3 +38,26 @@ project(":packages:react-native:ReactAndroid:hermes-engine").projectDir =
 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
+  }
+}

settings.gradle.kts

@@ -44,26 +44,3 @@ configure<com.facebook.react.ReactSettingsExtension> {
       lockFiles = files("yarn.lock"),
   )
 }
-
-// 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
-  }
-}