Use artifacts published from the Hermes repository on Android

build.gradle.kts

@@ -135,7 +135,7 @@ if (project.findProperty("react.internal.useHermesNightly")?.toString()?.toBoole
     configurations.all {
       resolutionStrategy.dependencySubstitution {
         substitute(project(":packages:react-native:ReactAndroid:hermes-engine"))
-            .using(module("com.facebook.react:hermes-android:0.+"))
+            .using(module("com.facebook.hermes:hermes-android:0.+"))
             .because("Users opted to use hermes from nightly")
       }
     }

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

@@ -55,7 +55,7 @@ class ReactPlugin : Plugin<Project> {
                 project,
             )
 
-    if (project.rootProject.isHermesV1Enabled != rootExtension.hermesV1Enabled.get()) {
+    if (project.rootProject.isHermesV1Enabled) {
       rootExtension.hermesV1Enabled.set(project.rootProject.isHermesV1Enabled)
     }
 
@@ -72,10 +72,7 @@ class ReactPlugin : Plugin<Project> {
         val reactNativeDir = extension.reactNativeDir.get().asFile
         val propertiesFile = File(reactNativeDir, "ReactAndroid/gradle.properties")
         val versionAndGroupStrings = readVersionAndGroupStrings(propertiesFile)
-        val hermesV1Enabled =
-            if (project.rootProject.hasProperty("hermesV1Enabled"))
-                project.rootProject.findProperty("hermesV1Enabled") == "true"
-            else false
+        val hermesV1Enabled = rootExtension.hermesV1Enabled.get()
         configureDependencies(project, versionAndGroupStrings, hermesV1Enabled)
         configureRepositories(project)
       }

packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/BundleHermesCTask.kt

@@ -94,12 +94,7 @@ abstract class BundleHermesCTask : DefaultTask() {
     runCommand(bundleCommand)
 
     if (hermesEnabled.get()) {
-      val hermesV1Enabled =
-          if (project.rootProject.hasProperty("hermesV1Enabled"))
-              project.rootProject.findProperty("hermesV1Enabled") == "true"
-          else false
-      val detectedHermesCommand =
-          detectOSAwareHermesCommand(root.get().asFile, hermesCommand.get(), hermesV1Enabled)
+      val detectedHermesCommand = detectOSAwareHermesCommand(root.get().asFile, hermesCommand.get())
       val bytecodeFile = File("${bundleFile}.hbc")
       val outputSourceMap = resolveOutputSourceMap(bundleAssetFilename)
       val compilerSourceMap = resolveCompilerSourceMap(bundleAssetFilename)

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

@@ -13,6 +13,7 @@ import com.facebook.react.utils.PropertyUtils.EXCLUSIVE_ENTEPRISE_REPOSITORY
 import com.facebook.react.utils.PropertyUtils.INCLUDE_JITPACK_REPOSITORY
 import com.facebook.react.utils.PropertyUtils.INCLUDE_JITPACK_REPOSITORY_DEFAULT
 import com.facebook.react.utils.PropertyUtils.INTERNAL_HERMES_PUBLISHING_GROUP
+import com.facebook.react.utils.PropertyUtils.INTERNAL_HERMES_V1_VERSION_NAME
 import com.facebook.react.utils.PropertyUtils.INTERNAL_HERMES_VERSION_NAME
 import com.facebook.react.utils.PropertyUtils.INTERNAL_REACT_NATIVE_MAVEN_LOCAL_REPO
 import com.facebook.react.utils.PropertyUtils.INTERNAL_REACT_PUBLISHING_GROUP
@@ -31,6 +32,7 @@ internal object DependencyUtils {
   internal data class Coordinates(
       val versionString: String,
       val hermesVersionString: String,
+      val hermesV1VersionString: String,
       val reactGroupString: String = DEFAULT_INTERNAL_REACT_PUBLISHING_GROUP,
       val hermesGroupString: String = DEFAULT_INTERNAL_HERMES_PUBLISHING_GROUP,
   )
@@ -133,7 +135,7 @@ internal object DependencyUtils {
           // Contributors only: The hermes-engine version is forced only if the user has
           // not opted into using nightlies for local development.
           configuration.resolutionStrategy.force(
-              "${coordinates.reactGroupString}:hermes-android:${coordinates.versionString}"
+              "${coordinates.hermesGroupString}:hermes-android:${if (hermesV1Enabled) coordinates.hermesV1VersionString else coordinates.hermesVersionString}"
           )
         }
       }
@@ -144,12 +146,11 @@ internal object DependencyUtils {
       coordinates: Coordinates,
       hermesV1Enabled: Boolean = false,
   ): List<Triple<String, String, String>> {
-    // TODO: T231755027 update coordinates and versioning
     val dependencySubstitution = mutableListOf<Triple<String, String, String>>()
     val hermesVersionString =
         if (hermesV1Enabled)
-            "${coordinates.hermesGroupString}:hermes-android:${coordinates.versionString}"
-        else "${coordinates.reactGroupString}:hermes-android:${coordinates.versionString}"
+            "${coordinates.hermesGroupString}:hermes-android:${coordinates.hermesV1VersionString}"
+        else "${coordinates.hermesGroupString}:hermes-android:${coordinates.hermesVersionString}"
     dependencySubstitution.add(
         Triple(
             "com.facebook.react:react-native",
@@ -172,9 +173,11 @@ internal object DependencyUtils {
               "The react-android dependency was modified to use the correct Maven group.",
           )
       )
+    }
+    if (coordinates.hermesVersionString != DEFAULT_INTERNAL_HERMES_PUBLISHING_GROUP) {
       dependencySubstitution.add(
           Triple(
-              "com.facebook.react:hermes-android",
+              "com.facebook.hermes:hermes-android",
               hermesVersionString,
               "The hermes-android dependency was modified to use the correct Maven group.",
           )
@@ -187,17 +190,26 @@ internal object DependencyUtils {
     val reactAndroidProperties = Properties()
     propertiesFile.inputStream().use { reactAndroidProperties.load(it) }
     val versionStringFromFile = (reactAndroidProperties[INTERNAL_VERSION_NAME] as? String).orEmpty()
-    // TODO: T231755027 update HERMES_VERSION_NAME in gradle.properties to point to the correct
-    // hermes version
     val hermesVersionStringFromFile =
         (reactAndroidProperties[INTERNAL_HERMES_VERSION_NAME] as? String).orEmpty()
+    val hermesV1VersionStringFromFile =
+        (reactAndroidProperties[INTERNAL_HERMES_V1_VERSION_NAME] as? String).orEmpty()
     // If on a nightly, we need to fetch the -SNAPSHOT artifact from Sonatype.
     val versionString =
         if (versionStringFromFile.startsWith("0.0.0") || "-nightly-" in versionStringFromFile) {
           "$versionStringFromFile-SNAPSHOT"
         } else {
           versionStringFromFile
         }
+    val hermesVersionString =
+        if (
+            hermesVersionStringFromFile.startsWith("0.0.0") ||
+                "-commitly-" in hermesVersionStringFromFile
+        ) {
+          "$hermesVersionStringFromFile-SNAPSHOT"
+        } else {
+          hermesVersionStringFromFile
+        }
     // Returns Maven group for repos using different group for Maven artifacts
     val reactGroupString =
         reactAndroidProperties[INTERNAL_REACT_PUBLISHING_GROUP] as? String
@@ -207,7 +219,8 @@ internal object DependencyUtils {
             ?: DEFAULT_INTERNAL_HERMES_PUBLISHING_GROUP
     return Coordinates(
         versionString,
-        hermesVersionStringFromFile,
+        hermesVersionString,
+        hermesV1VersionStringFromFile,
         reactGroupString,
         hermesGroupString,
     )

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

@@ -130,7 +130,6 @@ private fun detectCliFile(reactNativeRoot: File, preconfiguredCliFile: File?): F
 internal fun detectOSAwareHermesCommand(
     projectRoot: File,
     hermesCommand: String,
-    hermesV1Enabled: Boolean = false,
 ): String { // 1. If the project specifies a Hermes command, don't second guess it.
   if (hermesCommand.isNotBlank()) {
     val osSpecificHermesCommand =
@@ -151,12 +150,9 @@ internal fun detectOSAwareHermesCommand(
     return builtHermesc.cliPath(projectRoot)
   }
 
-  // 3. If Hermes V1 is enabled, use hermes-compiler from npm, otherwise, if the
-  // react-native contains a pre-built hermesc, use it.
-  val hermesCPath = if (hermesV1Enabled) HERMES_COMPILER_NPM_DIR else HERMESC_IN_REACT_NATIVE_DIR
+  // 3. Use hermes-compiler installed from npm
   val prebuiltHermesPath =
-      hermesCPath
-          .plus(getHermesCBin())
+      HERMES_COMPILER_NPM_DIR.plus(getHermesCBin())
           .replace("%OS-BIN%", getHermesOSBin())
           // Execution on Windows fails with / as separator
           .replace('/', File.separatorChar)
@@ -242,6 +238,5 @@ internal fun readPackageJsonFile(
 }
 
 private const val HERMES_COMPILER_NPM_DIR = "node_modules/hermes-compiler/%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/main/kotlin/com/facebook/react/utils/PropertyUtils.kt

@@ -81,4 +81,6 @@ object PropertyUtils {
   const val INTERNAL_VERSION_NAME = "VERSION_NAME"
   /** Internal property used to control the version name of Hermes Engine */
   const val INTERNAL_HERMES_VERSION_NAME = "HERMES_VERSION_NAME"
+  /** Internal property used to control the version name of Hermes V1 */
+  const val INTERNAL_HERMES_V1_VERSION_NAME = "HERMES_V1_VERSION_NAME"
 }