@react-native/gradle-plugin 0.82.0-rc.1 → 0.82.0-rc.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native/gradle-plugin",
-  "version": "0.82.0-rc.1",
+  "version": "0.82.0-rc.2",
   "description": "Gradle Plugin for React Native",
   "license": "MIT",
   "repository": {

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

@@ -55,8 +55,8 @@ class ReactPlugin : Plugin<Project> {
                 project,
             )
 
-    if (project.rootProject.isHermesV1Enabled != rootExtension.hermesV1Enabled.get()) {
-      rootExtension.hermesV1Enabled.set(project.rootProject.isHermesV1Enabled)
+    if (project.rootProject.isHermesV1Enabled) {
+      rootExtension.hermesV1Enabled.set(true)
     }
 
     // App Only Configuration
@@ -71,11 +71,11 @@ class ReactPlugin : Plugin<Project> {
       project.afterEvaluate {
         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 hermesVersionPropertiesFile =
+            File(reactNativeDir, "sdks/hermes-engine/version.properties")
+        val versionAndGroupStrings =
+            readVersionAndGroupStrings(propertiesFile, hermesVersionPropertiesFile)
+        val hermesV1Enabled = rootExtension.hermesV1Enabled.get()
         configureDependencies(project, versionAndGroupStrings, hermesV1Enabled)
         configureRepositories(project)
       }

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

@@ -13,7 +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_VERSION_NAME
+import com.facebook.react.utils.PropertyUtils.INTERNAL_HERMES_V1_VERSION_NAME
 import com.facebook.react.utils.PropertyUtils.INTERNAL_REACT_NATIVE_MAVEN_LOCAL_REPO
 import com.facebook.react.utils.PropertyUtils.INTERNAL_REACT_PUBLISHING_GROUP
 import com.facebook.react.utils.PropertyUtils.INTERNAL_USE_HERMES_NIGHTLY
@@ -31,6 +31,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,
   )
@@ -113,7 +114,12 @@ internal object DependencyUtils {
       coordinates: Coordinates,
       hermesV1Enabled: Boolean = false,
   ) {
-    if (coordinates.versionString.isBlank() || coordinates.hermesVersionString.isBlank()) return
+    if (
+        coordinates.versionString.isBlank() ||
+            (!hermesV1Enabled && coordinates.hermesVersionString.isBlank()) ||
+            (hermesV1Enabled && coordinates.hermesV1VersionString.isBlank())
+    )
+        return
     project.rootProject.allprojects { eachProject ->
       eachProject.configurations.all { configuration ->
         // Here we set a dependencySubstitution for both react-native and hermes-engine as those
@@ -133,7 +139,11 @@ 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}"
+              // TODO: T237406039 update coordinates
+              if (hermesV1Enabled)
+                  "${coordinates.hermesGroupString}:hermes-android:${coordinates.hermesV1VersionString}"
+              else
+                  "${coordinates.reactGroupString}:hermes-android:${coordinates.hermesVersionString}"
           )
         }
       }
@@ -146,10 +156,11 @@ internal object DependencyUtils {
   ): List<Triple<String, String, String>> {
     // TODO: T231755027 update coordinates and versioning
     val dependencySubstitution = mutableListOf<Triple<String, String, String>>()
+    // TODO: T237406039 update coordinates
     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.reactGroupString}:hermes-android:${coordinates.hermesVersionString}"
     dependencySubstitution.add(
         Triple(
             "com.facebook.react:react-native",
@@ -172,6 +183,7 @@ internal object DependencyUtils {
               "The react-android dependency was modified to use the correct Maven group.",
           )
       )
+      // TODO: T237406039 update coordinates
       dependencySubstitution.add(
           Triple(
               "com.facebook.react:hermes-android",
@@ -183,14 +195,10 @@ internal object DependencyUtils {
     return dependencySubstitution
   }
 
-  fun readVersionAndGroupStrings(propertiesFile: File): Coordinates {
+  fun readVersionAndGroupStrings(propertiesFile: File, hermesVersionFile: File): Coordinates {
     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()
     // If on a nightly, we need to fetch the -SNAPSHOT artifact from Sonatype.
     val versionString =
         if (versionStringFromFile.startsWith("0.0.0") || "-nightly-" in versionStringFromFile) {
@@ -205,9 +213,18 @@ internal object DependencyUtils {
     val hermesGroupString =
         reactAndroidProperties[INTERNAL_HERMES_PUBLISHING_GROUP] as? String
             ?: DEFAULT_INTERNAL_HERMES_PUBLISHING_GROUP
+    // TODO: T237406039 read both versions from the same file
+    val hermesVersionProperties = Properties()
+    hermesVersionFile.inputStream().use { hermesVersionProperties.load(it) }
+
+    val hermesVersion = versionString
+    val hermesV1Version =
+        (hermesVersionProperties[INTERNAL_HERMES_V1_VERSION_NAME] as? String).orEmpty()
+
     return Coordinates(
         versionString,
-        hermesVersionStringFromFile,
+        hermesVersion,
+        hermesV1Version,
         reactGroupString,
         hermesGroupString,
     )

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

@@ -153,6 +153,7 @@ internal fun detectOSAwareHermesCommand(
 
   // 3. If Hermes V1 is enabled, use hermes-compiler from npm, otherwise, if the
   // react-native contains a pre-built hermesc, use it.
+  // TODO: T237406039 use hermes-compiler from npm for both
   val hermesCPath = if (hermesV1Enabled) HERMES_COMPILER_NPM_DIR else HERMESC_IN_REACT_NATIVE_DIR
   val prebuiltHermesPath =
       hermesCPath

package/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/ProjectUtils.kt

@@ -23,6 +23,7 @@ import com.facebook.react.utils.PropertyUtils.SCOPED_USE_THIRD_PARTY_JSC
 import com.facebook.react.utils.PropertyUtils.USE_THIRD_PARTY_JSC
 import org.gradle.api.Project
 import org.gradle.api.file.DirectoryProperty
+import org.jetbrains.kotlin.gradle.plugin.extraProperties
 
 internal object ProjectUtils {
 
@@ -75,7 +76,11 @@ internal object ProjectUtils {
         (project.hasProperty(HERMES_V1_ENABLED) &&
             project.property(HERMES_V1_ENABLED).toString().toBoolean()) ||
             (project.hasProperty(SCOPED_HERMES_V1_ENABLED) &&
-                project.property(SCOPED_HERMES_V1_ENABLED).toString().toBoolean())
+                project.property(SCOPED_HERMES_V1_ENABLED).toString().toBoolean()) ||
+            (project.extraProperties.has(HERMES_V1_ENABLED) &&
+                project.extraProperties.get(HERMES_V1_ENABLED).toString().toBoolean()) ||
+            (project.extraProperties.has(SCOPED_HERMES_V1_ENABLED) &&
+                project.extraProperties.get(SCOPED_HERMES_V1_ENABLED).toString().toBoolean())
 
   internal fun Project.needsCodegenFromPackageJson(rootProperty: DirectoryProperty): Boolean {
     val parsedPackageJson = readPackageJsonFile(this, rootProperty)

package/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/PropertyUtils.kt

@@ -79,6 +79,10 @@ object PropertyUtils {
 
   /** Internal property used to control the version name of React Native */
   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, shared with iOS, used to control the version name of Hermes Engine. This is
+   * stored in sdks/hermes-engine/version.properties
+   */
+  const val INTERNAL_HERMES_V1_VERSION_NAME = "HERMES_V1_VERSION_NAME"
 }

package/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/utils/DependencyUtilsTest.kt

@@ -271,54 +271,69 @@ class DependencyUtilsTest {
         .isEqualTo(2)
   }
 
-  // TODO: T236767053
-
   @Test
   fun configureDependencies_withEmptyVersion_doesNothing() {
     val project = createProject()
 
-    configureDependencies(project, DependencyUtils.Coordinates("", ""))
+    configureDependencies(project, DependencyUtils.Coordinates("", "", ""))
 
     assertThat(project.configurations.first().resolutionStrategy.forcedModules.isEmpty()).isTrue()
   }
 
   @Test
-  fun configureDependencies_withVersionString_appliesResolutionStrategy() {
+  fun configureDependencies_withVersionString_appliesResolutionStrategy_withClassicHermes() {
+    val project = createProject()
+
+    configureDependencies(project, DependencyUtils.Coordinates("1.2.3", "4.5.6", "7.8.9"))
+
+    val forcedModules = project.configurations.first().resolutionStrategy.forcedModules
+    assertThat(forcedModules.any { it.toString() == "com.facebook.react:react-android:1.2.3" })
+        .isTrue()
+    assertThat(forcedModules.any { it.toString() == "com.facebook.react:hermes-android:4.5.6" })
+        .isTrue()
+  }
+
+  @Test
+  fun configureDependencies_withVersionString_appliesResolutionStrategy_withHermesV1() {
     val project = createProject()
 
-    configureDependencies(project, DependencyUtils.Coordinates("1.2.3", "1.2.3"))
+    configureDependencies(
+        project,
+        DependencyUtils.Coordinates("1.2.3", "4.5.6", "7.8.9"),
+        hermesV1Enabled = true,
+    )
 
     val forcedModules = project.configurations.first().resolutionStrategy.forcedModules
     assertThat(forcedModules.any { it.toString() == "com.facebook.react:react-android:1.2.3" })
         .isTrue()
-    assertThat(forcedModules.any { it.toString() == "com.facebook.react:hermes-android:1.2.3" })
+    assertThat(forcedModules.any { it.toString() == "com.facebook.hermes:hermes-android:7.8.9" })
         .isTrue()
   }
 
   @Test
-  fun configureDependencies_withVersionString_appliesOnAllProjects() {
+  fun configureDependencies_withVersionString_appliesOnAllProjects_withClassicHermes() {
     val rootProject = ProjectBuilder.builder().build()
     val appProject = ProjectBuilder.builder().withName("app").withParent(rootProject).build()
     val libProject = ProjectBuilder.builder().withName("lib").withParent(rootProject).build()
     appProject.plugins.apply("com.android.application")
     libProject.plugins.apply("com.android.library")
 
-    configureDependencies(appProject, DependencyUtils.Coordinates("1.2.3", "1.2.3"))
+    configureDependencies(appProject, DependencyUtils.Coordinates("1.2.3", "4.5.6", "7.8.9"))
 
     val appForcedModules = appProject.configurations.first().resolutionStrategy.forcedModules
     val libForcedModules = libProject.configurations.first().resolutionStrategy.forcedModules
     assertThat(appForcedModules.any { it.toString() == "com.facebook.react:react-android:1.2.3" })
         .isTrue()
-    assertThat(appForcedModules.any { it.toString() == "com.facebook.react:hermes-android:1.2.3" })
+    assertThat(appForcedModules.any { it.toString() == "com.facebook.react:hermes-android:4.5.6" })
         .isTrue()
     assertThat(libForcedModules.any { it.toString() == "com.facebook.react:react-android:1.2.3" })
         .isTrue()
-    assertThat(libForcedModules.any { it.toString() == "com.facebook.react:hermes-android:1.2.3" })
+    assertThat(libForcedModules.any { it.toString() == "com.facebook.react:hermes-android:4.5.6" })
         .isTrue()
   }
 
   @Test
-  fun configureDependencies_withVersionStringAndGroupString_appliesOnAllProjects() {
+  fun configureDependencies_withVersionString_appliesOnAllProjects_withHermesV1() {
     val rootProject = ProjectBuilder.builder().build()
     val appProject = ProjectBuilder.builder().withName("app").withParent(rootProject).build()
     val libProject = ProjectBuilder.builder().withName("lib").withParent(rootProject).build()
@@ -327,25 +342,93 @@ class DependencyUtilsTest {
 
     configureDependencies(
         appProject,
-        DependencyUtils.Coordinates("1.2.3", "1.2.3", "io.github.test"),
+        DependencyUtils.Coordinates("1.2.3", "4.5.6", "7.8.9"),
+        hermesV1Enabled = true,
+    )
+
+    val appForcedModules = appProject.configurations.first().resolutionStrategy.forcedModules
+    val libForcedModules = libProject.configurations.first().resolutionStrategy.forcedModules
+    assertThat(appForcedModules.any { it.toString() == "com.facebook.react:react-android:1.2.3" })
+        .isTrue()
+    assertThat(appForcedModules.any { it.toString() == "com.facebook.hermes:hermes-android:7.8.9" })
+        .isTrue()
+    assertThat(libForcedModules.any { it.toString() == "com.facebook.react:react-android:1.2.3" })
+        .isTrue()
+    assertThat(libForcedModules.any { it.toString() == "com.facebook.hermes:hermes-android:7.8.9" })
+        .isTrue()
+  }
+
+  @Test
+  fun configureDependencies_withVersionStringAndGroupString_appliesOnAllProjects_withClassicHermes() {
+    val rootProject = ProjectBuilder.builder().build()
+    val appProject = ProjectBuilder.builder().withName("app").withParent(rootProject).build()
+    val libProject = ProjectBuilder.builder().withName("lib").withParent(rootProject).build()
+    appProject.plugins.apply("com.android.application")
+    libProject.plugins.apply("com.android.library")
+
+    configureDependencies(
+        appProject,
+        DependencyUtils.Coordinates(
+            "1.2.3",
+            "4.5.6",
+            "7.8.9",
+            "io.github.test",
+            "io.github.test.hermes",
+        ),
     )
 
     val appForcedModules = appProject.configurations.first().resolutionStrategy.forcedModules
     val libForcedModules = libProject.configurations.first().resolutionStrategy.forcedModules
     assertThat(appForcedModules.any { it.toString() == "io.github.test:react-android:1.2.3" })
         .isTrue()
-    assertThat(appForcedModules.any { it.toString() == "io.github.test:hermes-android:1.2.3" })
+    assertThat(appForcedModules.any { it.toString() == "io.github.test:hermes-android:4.5.6" })
         .isTrue()
     assertThat(libForcedModules.any { it.toString() == "io.github.test:react-android:1.2.3" })
         .isTrue()
-    assertThat(libForcedModules.any { it.toString() == "io.github.test:hermes-android:1.2.3" })
+    assertThat(libForcedModules.any { it.toString() == "io.github.test:hermes-android:4.5.6" })
         .isTrue()
   }
 
   @Test
-  fun getDependencySubstitutions_withDefaultGroup_substitutesCorrectly() {
+  fun configureDependencies_withVersionStringAndGroupString_appliesOnAllProjects_withHermesV1() {
+    val rootProject = ProjectBuilder.builder().build()
+    val appProject = ProjectBuilder.builder().withName("app").withParent(rootProject).build()
+    val libProject = ProjectBuilder.builder().withName("lib").withParent(rootProject).build()
+    appProject.plugins.apply("com.android.application")
+    libProject.plugins.apply("com.android.library")
+
+    configureDependencies(
+        appProject,
+        DependencyUtils.Coordinates(
+            "1.2.3",
+            "4.5.6",
+            "7.8.9",
+            "io.github.test",
+            "io.github.test.hermes",
+        ),
+        hermesV1Enabled = true,
+    )
+
+    val appForcedModules = appProject.configurations.first().resolutionStrategy.forcedModules
+    val libForcedModules = libProject.configurations.first().resolutionStrategy.forcedModules
+    assertThat(appForcedModules.any { it.toString() == "io.github.test:react-android:1.2.3" })
+        .isTrue()
+    assertThat(
+            appForcedModules.any { it.toString() == "io.github.test.hermes:hermes-android:7.8.9" }
+        )
+        .isTrue()
+    assertThat(libForcedModules.any { it.toString() == "io.github.test:react-android:1.2.3" })
+        .isTrue()
+    assertThat(
+            libForcedModules.any { it.toString() == "io.github.test.hermes:hermes-android:7.8.9" }
+        )
+        .isTrue()
+  }
+
+  @Test
+  fun getDependencySubstitutions_withDefaultGroup_substitutesCorrectly_withClassicHermes() {
     val dependencySubstitutions =
-        getDependencySubstitutions(DependencyUtils.Coordinates("0.42.0", "0.42.0"))
+        getDependencySubstitutions(DependencyUtils.Coordinates("0.42.0", "0.42.0", "0.43.0"))
 
     assertThat("com.facebook.react:react-native").isEqualTo(dependencySubstitutions[0].first)
     assertThat("com.facebook.react:react-android:0.42.0")
@@ -364,10 +447,40 @@ class DependencyUtilsTest {
   }
 
   @Test
-  fun getDependencySubstitutions_withCustomGroup_substitutesCorrectly() {
+  fun getDependencySubstitutions_withDefaultGroup_substitutesCorrectly_withHermesV1() {
     val dependencySubstitutions =
         getDependencySubstitutions(
-            DependencyUtils.Coordinates("0.42.0", "0.42.0", "io.github.test")
+            DependencyUtils.Coordinates("0.42.0", "0.42.0", "0.43.0"),
+            hermesV1Enabled = true,
+        )
+
+    assertThat("com.facebook.react:react-native").isEqualTo(dependencySubstitutions[0].first)
+    assertThat("com.facebook.react:react-android:0.42.0")
+        .isEqualTo(dependencySubstitutions[0].second)
+    assertThat(
+            "The react-native artifact was deprecated in favor of react-android due to https://github.com/facebook/react-native/issues/35210."
+        )
+        .isEqualTo(dependencySubstitutions[0].third)
+    assertThat("com.facebook.react:hermes-engine").isEqualTo(dependencySubstitutions[1].first)
+    assertThat("com.facebook.hermes:hermes-android:0.43.0")
+        .isEqualTo(dependencySubstitutions[1].second)
+    assertThat(
+            "The hermes-engine artifact was deprecated in favor of hermes-android due to https://github.com/facebook/react-native/issues/35210."
+        )
+        .isEqualTo(dependencySubstitutions[1].third)
+  }
+
+  @Test
+  fun getDependencySubstitutions_withCustomGroup_substitutesCorrectly_withClassicHermes() {
+    val dependencySubstitutions =
+        getDependencySubstitutions(
+            DependencyUtils.Coordinates(
+                "0.42.0",
+                "0.42.0",
+                "0.43.0",
+                "io.github.test",
+                "io.github.test.hermes",
+            )
         )
 
     assertThat("com.facebook.react:react-native").isEqualTo(dependencySubstitutions[0].first)
@@ -392,6 +505,44 @@ class DependencyUtilsTest {
         .isEqualTo(dependencySubstitutions[3].third)
   }
 
+  @Test
+  fun getDependencySubstitutions_withCustomGroup_substitutesCorrectly_withHermesV1() {
+    val dependencySubstitutions =
+        getDependencySubstitutions(
+            DependencyUtils.Coordinates(
+                "0.42.0",
+                "0.42.0",
+                "0.43.0",
+                "io.github.test",
+                "io.github.test.hermes",
+            ),
+            hermesV1Enabled = true,
+        )
+
+    assertThat("com.facebook.react:react-native").isEqualTo(dependencySubstitutions[0].first)
+    assertThat("io.github.test:react-android:0.42.0").isEqualTo(dependencySubstitutions[0].second)
+    assertThat(
+            "The react-native artifact was deprecated in favor of react-android due to https://github.com/facebook/react-native/issues/35210."
+        )
+        .isEqualTo(dependencySubstitutions[0].third)
+    assertThat("com.facebook.react:hermes-engine").isEqualTo(dependencySubstitutions[1].first)
+    assertThat("io.github.test.hermes:hermes-android:0.43.0")
+        .isEqualTo(dependencySubstitutions[1].second)
+    assertThat(
+            "The hermes-engine artifact was deprecated in favor of hermes-android due to https://github.com/facebook/react-native/issues/35210."
+        )
+        .isEqualTo(dependencySubstitutions[1].third)
+    assertThat("com.facebook.react:react-android").isEqualTo(dependencySubstitutions[2].first)
+    assertThat("io.github.test:react-android:0.42.0").isEqualTo(dependencySubstitutions[2].second)
+    assertThat("The react-android dependency was modified to use the correct Maven group.")
+        .isEqualTo(dependencySubstitutions[2].third)
+    assertThat("com.facebook.react:hermes-android").isEqualTo(dependencySubstitutions[3].first)
+    assertThat("io.github.test.hermes:hermes-android:0.43.0")
+        .isEqualTo(dependencySubstitutions[3].second)
+    assertThat("The hermes-android dependency was modified to use the correct Maven group.")
+        .isEqualTo(dependencySubstitutions[3].third)
+  }
+
   @Test
   fun readVersionString_withCorrectVersionString_returnsIt() {
     val propertiesFile =
@@ -405,9 +556,25 @@ class DependencyUtilsTest {
           )
         }
 
-    val versionString = readVersionAndGroupStrings(propertiesFile).versionString
+    val hermesVersionFile =
+        tempFolder.newFile("version.properties").apply {
+          writeText(
+              """
+        HERMES_V1_VERSION_NAME=1000.0.0
+        ANOTHER_PROPERTY=true
+      """
+                  .trimIndent()
+          )
+        }
+
+    val strings = readVersionAndGroupStrings(propertiesFile, hermesVersionFile)
+    val versionString = strings.versionString
+    val hermesVersionString = strings.hermesVersionString
+    val hermesV1VersionString = strings.hermesV1VersionString
 
     assertThat(versionString).isEqualTo("1000.0.0")
+    assertThat(hermesVersionString).isEqualTo("1000.0.0")
+    assertThat(hermesV1VersionString).isEqualTo("1000.0.0")
   }
 
   @Test
@@ -417,15 +584,33 @@ class DependencyUtilsTest {
           writeText(
               """
         VERSION_NAME=0.0.0-20221101-2019-cfe811ab1
+        HERMES_VERSION_NAME=0.12.0-commitly-20221101-2019-cfe811ab1
+        HERMES_V1_VERSION_NAME=250829098.0.0-stable
+        ANOTHER_PROPERTY=true
+      """
+                  .trimIndent()
+          )
+        }
+
+    val hermesVersionFile =
+        tempFolder.newFile("version.properties").apply {
+          writeText(
+              """
+        HERMES_V1_VERSION_NAME=250829098.0.0-stable
         ANOTHER_PROPERTY=true
       """
                   .trimIndent()
           )
         }
 
-    val versionString = readVersionAndGroupStrings(propertiesFile).versionString
+    val strings = readVersionAndGroupStrings(propertiesFile, hermesVersionFile)
+    val versionString = strings.versionString
+    val hermesVersionString = strings.hermesVersionString
+    val hermesV1VersionString = strings.hermesV1VersionString
 
     assertThat(versionString).isEqualTo("0.0.0-20221101-2019-cfe811ab1-SNAPSHOT")
+    assertThat(hermesVersionString).isEqualTo("0.0.0-20221101-2019-cfe811ab1-SNAPSHOT")
+    assertThat(hermesV1VersionString).isEqualTo("250829098.0.0-stable")
   }
 
   @Test
@@ -440,8 +625,23 @@ class DependencyUtilsTest {
           )
         }
 
-    val versionString = readVersionAndGroupStrings(propertiesFile).versionString
+    val hermesVersionFile =
+        tempFolder.newFile("version.properties").apply {
+          writeText(
+              """
+        ANOTHER_PROPERTY=true
+      """
+                  .trimIndent()
+          )
+        }
+
+    val strings = readVersionAndGroupStrings(propertiesFile, hermesVersionFile)
+    val versionString = strings.versionString
+    val hermesVersionString = strings.hermesVersionString
+    val hermesV1VersionString = strings.hermesV1VersionString
     assertThat(versionString).isEqualTo("")
+    assertThat(hermesVersionString).isEqualTo("")
+    assertThat(hermesV1VersionString).isEqualTo("")
   }
 
   @Test
@@ -457,8 +657,24 @@ class DependencyUtilsTest {
           )
         }
 
-    val versionString = readVersionAndGroupStrings(propertiesFile).versionString
+    val hermesVersionFile =
+        tempFolder.newFile("version.properties").apply {
+          writeText(
+              """
+        HERMES_V1_VERSION_NAME=
+        ANOTHER_PROPERTY=true
+      """
+                  .trimIndent()
+          )
+        }
+
+    val strings = readVersionAndGroupStrings(propertiesFile, hermesVersionFile)
+    val versionString = strings.versionString
+    val hermesVersionString = strings.hermesVersionString
+    val hermesV1VersionString = strings.hermesV1VersionString
     assertThat(versionString).isEqualTo("")
+    assertThat(hermesVersionString).isEqualTo("")
+    assertThat(hermesV1VersionString).isEqualTo("")
   }
 
   @Test
@@ -468,15 +684,30 @@ class DependencyUtilsTest {
           writeText(
               """
         react.internal.publishingGroup=io.github.test
+        react.internal.hermesPublishingGroup=io.github.test
         ANOTHER_PROPERTY=true
       """
                   .trimIndent()
           )
         }
 
-    val groupString = readVersionAndGroupStrings(propertiesFile).reactGroupString
+    val hermesVersionFile =
+        tempFolder.newFile("version.properties").apply {
+          writeText(
+              """
+        HERMES_V1_VERSION_NAME=
+        ANOTHER_PROPERTY=true
+      """
+                  .trimIndent()
+          )
+        }
 
-    assertThat(groupString).isEqualTo("io.github.test")
+    val strings = readVersionAndGroupStrings(propertiesFile, hermesVersionFile)
+    val reactGroupString = strings.reactGroupString
+    val hermesGroupString = strings.hermesGroupString
+
+    assertThat(reactGroupString).isEqualTo("io.github.test")
+    assertThat(hermesGroupString).isEqualTo("io.github.test")
   }
 
   @Test
@@ -491,9 +722,23 @@ class DependencyUtilsTest {
           )
         }
 
-    val groupString = readVersionAndGroupStrings(propertiesFile).reactGroupString
+    val hermesVersionFile =
+        tempFolder.newFile("version.properties").apply {
+          writeText(
+              """
+        HERMES_V1_VERSION_NAME=
+        ANOTHER_PROPERTY=true
+      """
+                  .trimIndent()
+          )
+        }
+
+    val strings = readVersionAndGroupStrings(propertiesFile, hermesVersionFile)
+    val reactGroupString = strings.reactGroupString
+    val hermesGroupString = strings.hermesGroupString
 
-    assertThat(groupString).isEqualTo("com.facebook.react")
+    assertThat(reactGroupString).isEqualTo("com.facebook.react")
+    assertThat(hermesGroupString).isEqualTo("com.facebook.hermes")
   }
 
   @Test

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

@@ -166,7 +166,7 @@ class PathUtilsTest {
   @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")
+    val expected = tempFolder.newFile("node_modules/hermes-compiler/osx-bin/hermesc")
 
     assertThat(detectOSAwareHermesCommand(tempFolder.root, "", hermesV1Enabled = true))
         .isEqualTo(expected.toString())