Generated from a GitHub Pull Request. Run 'jf sync' on this diff to load the correct commit data.

Differential Revision: D104244582

Author: Riccardo Cipolleschi

.github/workflows/prebuild-ios-core.yml

@@ -48,11 +48,9 @@ jobs:
         shell: bash
         run: |
           if [ "${{ inputs.use-hermes-nightly }}" == "true" ]; then
-            # We are not publishing nightly versions of Hermes V1 yet.
-            # For now, we can use the latest version of Hermes V1 published on maven and npm.
             HERMES_VERSION="latest-v1"
           else
-            HERMES_VERSION=$(sed -n 's/^HERMES_V1_VERSION_NAME=//p' packages/react-native/sdks/hermes-engine/version.properties)
+            HERMES_VERSION=$(sed -n 's/^HERMES_VERSION_NAME=//p' packages/react-native/sdks/hermes-engine/version.properties)
           fi
           echo "Using Hermes version: $HERMES_VERSION"
           echo "HERMES_VERSION=$HERMES_VERSION" >> $GITHUB_ENV

.github/workflows/publish-release.yml

@@ -32,10 +32,9 @@ jobs:
         run: |
           echo "Setting hermes versions to latest"
           hermes_version=$(grep -oE 'HERMES_VERSION_NAME=([0-9]+\.[0-9]+\.[0-9]+)' packages/react-native/sdks/hermes-engine/version.properties | cut -d'=' -f2)
-          hermes_v1_version=$(grep -oE 'HERMES_V1_VERSION_NAME=([0-9]+\.[0-9]+\.[0-9]+)' packages/react-native/sdks/hermes-engine/version.properties | cut -d'=' -f2)
 
           echo "HERMES_VERSION=$hermes_version" >> $GITHUB_OUTPUT
-          echo "HERMES_V1_VERSION=$hermes_v1_version" >> $GITHUB_OUTPUT
+          echo "HERMES_V1_VERSION=$hermes_version" >> $GITHUB_OUTPUT
       - name: Print hermes versions
         run: |
           echo "HERMES_VERSION=${{ steps.set_hermes_versions.outputs.HERMES_VERSION }}"

build.gradle.kts

@@ -118,7 +118,7 @@ if (project.findProperty("react.internal.useHermesStable")?.toString()?.toBoolea
   val hermesVersionPropertiesFile =
       rootProject.file("./packages/react-native/sdks/hermes-engine/version.properties")
   hermesVersionPropertiesFile.inputStream().use { hermesVersions.load(it) }
-  val selectedHermesVersion = hermesVersions["HERMES_V1_VERSION_NAME"] as String
+  val selectedHermesVersion = hermesVersions["HERMES_VERSION_NAME"] as String
 
   hermesSubstitution = selectedHermesVersion to "Users opted to use stable hermes release"
 } else if (
@@ -137,15 +137,7 @@ if (project.findProperty("react.internal.useHermesStable")?.toString()?.toBoolea
     )
   }
 
-  val hermesV1Enabled = project.findProperty("hermesV1Enabled")?.toString()?.toBoolean() ?: true
-  // Hermes V1 stable releases are published without the -SNAPSHOT suffix.
-  // Legacy nightly builds use -SNAPSHOT.
-  val resolvedVersion =
-      if (hermesV1Enabled) hermesCompilerVersion else "$hermesCompilerVersion-SNAPSHOT"
-  val reason =
-      if (hermesV1Enabled) "Users opted to use hermes V1 stable"
-      else "Users opted to use hermes nightly"
-  hermesSubstitution = resolvedVersion to reason
+  hermesSubstitution = hermesCompilerVersion to "Users opted to use Hermes V1 prebuilt"
 } else {
   logger.warn(
       """

gradle.properties

@@ -24,6 +24,3 @@ react.internal.useHermesStable=false
 # Controls whether to use Hermes from nightly builds. This will speed up builds
 # but should NOT be turned on for CI or release builds.
 react.internal.useHermesNightly=true
-
-# Controls whether to use Hermes 1.0. Clean and rebuild when changing.
-hermesV1Enabled=true

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

@@ -28,8 +28,8 @@ import com.facebook.react.utils.DependencyUtils.readVersionAndGroupStrings
 import com.facebook.react.utils.JdkConfiguratorUtils.configureJavaToolChains
 import com.facebook.react.utils.JsonUtils
 import com.facebook.react.utils.NdkConfiguratorUtils.configureReactNativeNdk
-import com.facebook.react.utils.ProjectUtils.isHermesV1Enabled
 import com.facebook.react.utils.ProjectUtils.needsCodegenFromPackageJson
+import com.facebook.react.utils.PropertyUtils
 import com.facebook.react.utils.findPackageJsonFile
 import java.io.File
 import kotlin.system.exitProcess
@@ -55,8 +55,25 @@ class ReactPlugin : Plugin<Project> {
                 project,
             )
 
-    if (!project.rootProject.isHermesV1Enabled) {
-      rootExtension.hermesV1Enabled.set(false)
+    // Warn users if they still have the hermesV1Enabled property set.
+    if (
+        project.rootProject.hasProperty(PropertyUtils.HERMES_V1_ENABLED) ||
+            project.rootProject.hasProperty(PropertyUtils.SCOPED_HERMES_V1_ENABLED)
+    ) {
+      val value =
+          (project.rootProject.findProperty(PropertyUtils.HERMES_V1_ENABLED)
+                  ?: project.rootProject.findProperty(PropertyUtils.SCOPED_HERMES_V1_ENABLED))
+              .toString()
+              .toBoolean()
+      if (value) {
+        project.logger.warn(
+            "WARNING: The 'hermesV1Enabled' property is no longer needed. Hermes V1 is now always enabled. You can safely remove this property from your gradle.properties."
+        )
+      } else {
+        project.logger.warn(
+            "WARNING: Opting out of Hermes V1 is no longer supported. The 'hermesV1Enabled=false' property will be ignored. Hermes V1 is now always enabled. Please remove this property from your gradle.properties."
+        )
+      }
     }
 
     // App Only Configuration
@@ -75,8 +92,7 @@ class ReactPlugin : Plugin<Project> {
             File(reactNativeDir, "sdks/hermes-engine/version.properties")
         val versionAndGroupStrings =
             readVersionAndGroupStrings(project, propertiesFile, hermesVersionPropertiesFile)
-        val hermesV1Enabled = rootExtension.hermesV1Enabled.get()
-        configureDependencies(project, versionAndGroupStrings, hermesV1Enabled)
+        configureDependencies(project, versionAndGroupStrings)
         configureRepositories(project, versionAndGroupStrings.isNightly)
       }
 

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

@@ -11,7 +11,6 @@ import javax.inject.Inject
 import org.gradle.api.Project
 import org.gradle.api.file.DirectoryProperty
 import org.gradle.api.provider.ListProperty
-import org.gradle.api.provider.Property
 
 /**
  * A private extension we set on the rootProject to make easier to share values at execution time
@@ -58,6 +57,4 @@ abstract class PrivateReactExtension @Inject constructor(project: Project) {
 
   val codegenDir: DirectoryProperty =
       objects.directoryProperty().convention(root.dir("node_modules/@react-native/codegen"))
-
-  val hermesV1Enabled: Property<Boolean> = objects.property(Boolean::class.java).convention(true)
 }

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

@@ -13,7 +13,6 @@ 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
@@ -32,7 +31,6 @@ 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,
       private val isHermesNightly: Boolean = false,
@@ -114,28 +112,20 @@ internal object DependencyUtils {
    * party libraries which are auto-linked. Specifically it takes care of:
    * - Forcing the react-android/hermes-android version to the one specified in the package.json
    * - Substituting `react-native` with `react-android` and `hermes-engine` with `hermes-android`
-   * - Selecting between the classic Hermes and Hermes V1
    */
   fun configureDependencies(
       project: Project,
       coordinates: Coordinates,
-      hermesV1Enabled: Boolean = true,
   ) {
-    if (
-        coordinates.versionString.isBlank() ||
-            (!hermesV1Enabled && coordinates.hermesVersionString.isBlank()) ||
-            (hermesV1Enabled && coordinates.hermesV1VersionString.isBlank())
-    )
-        return
+    if (coordinates.versionString.isBlank() || coordinates.hermesVersionString.isBlank()) return
     project.rootProject.allprojects { eachProject ->
       eachProject.configurations.all { configuration ->
         // Here we set a dependencySubstitution for both react-native and hermes-engine as those
         // coordinates are voided due to https://github.com/facebook/react-native/issues/35210
         // This allows users to import libraries that are still using
         // implementation("com.facebook.react:react-native:+") and resolve the right dependency.
         configuration.resolutionStrategy.dependencySubstitution {
-          getDependencySubstitutions(coordinates, hermesV1Enabled).forEach { (module, dest, reason)
-            ->
+          getDependencySubstitutions(coordinates).forEach { (module, dest, reason) ->
             it.substitute(it.module(module)).using(it.module(dest)).because(reason)
           }
         }
@@ -146,7 +136,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.hermesGroupString}:hermes-android:${if (hermesV1Enabled) coordinates.hermesV1VersionString else coordinates.hermesVersionString}"
+              "${coordinates.hermesGroupString}:hermes-android:${coordinates.hermesVersionString}"
           )
         }
       }
@@ -155,12 +145,10 @@ internal object DependencyUtils {
 
   internal fun getDependencySubstitutions(
       coordinates: Coordinates,
-      hermesV1Enabled: Boolean = true,
   ): List<Triple<String, String, String>> {
     val dependencySubstitution = mutableListOf<Triple<String, String, String>>()
-    val hermesVersion =
-        if (hermesV1Enabled) coordinates.hermesV1VersionString else coordinates.hermesVersionString
-    val hermesVersionString = "${coordinates.hermesGroupString}:hermes-android:${hermesVersion}"
+    val hermesVersionString =
+        "${coordinates.hermesGroupString}:hermes-android:${coordinates.hermesVersionString}"
     dependencySubstitution.add(
         Triple(
             "com.facebook.react:react-native",
@@ -245,14 +233,11 @@ internal object DependencyUtils {
           hermesVersionString
         }
 
-    val hermesV1Version =
-        (hermesVersionProperties[INTERNAL_HERMES_V1_VERSION_NAME] as? String).orEmpty()
     val isHermesNightly = (project.findProperty(INTERNAL_USE_HERMES_NIGHTLY) as? String).toBoolean()
 
     return Coordinates(
         versionString,
         hermesVersion,
-        hermesV1Version,
         reactGroupString,
         hermesGroupString,
         isHermesNightly,

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

@@ -13,11 +13,9 @@ import com.facebook.react.utils.KotlinStdlibCompatUtils.lowercaseCompat
 import com.facebook.react.utils.KotlinStdlibCompatUtils.toBooleanStrictOrNullCompat
 import com.facebook.react.utils.PropertyUtils.EDGE_TO_EDGE_ENABLED
 import com.facebook.react.utils.PropertyUtils.HERMES_ENABLED
-import com.facebook.react.utils.PropertyUtils.HERMES_V1_ENABLED
 import com.facebook.react.utils.PropertyUtils.REACT_NATIVE_ARCHITECTURES
 import com.facebook.react.utils.PropertyUtils.SCOPED_EDGE_TO_EDGE_ENABLED
 import com.facebook.react.utils.PropertyUtils.SCOPED_HERMES_ENABLED
-import com.facebook.react.utils.PropertyUtils.SCOPED_HERMES_V1_ENABLED
 import com.facebook.react.utils.PropertyUtils.SCOPED_REACT_NATIVE_ARCHITECTURES
 import com.facebook.react.utils.PropertyUtils.SCOPED_USE_THIRD_PARTY_JSC
 import com.facebook.react.utils.PropertyUtils.USE_THIRD_PARTY_JSC
@@ -29,8 +27,6 @@ internal object ProjectUtils {
 
   const val HERMES_FALLBACK = true
 
-  const val HERMES_V1_ENABLED_FALLBACK = true
-
   internal fun Project.isNewArchEnabled(): Boolean = true
 
   internal val Project.isHermesEnabled: Boolean
@@ -73,23 +69,6 @@ internal object ProjectUtils {
             (project.hasProperty(SCOPED_USE_THIRD_PARTY_JSC) &&
                 project.property(SCOPED_USE_THIRD_PARTY_JSC).toString().toBoolean())
 
-  internal val Project.isHermesV1Enabled: Boolean
-    get() =
-        if (
-            project.hasProperty(HERMES_V1_ENABLED) || project.hasProperty(SCOPED_HERMES_V1_ENABLED)
-        ) {
-          (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.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())
-        } else {
-          HERMES_V1_ENABLED_FALLBACK
-        }
-
   internal fun Project.needsCodegenFromPackageJson(rootProperty: DirectoryProperty): Boolean {
     val parsedPackageJson = readPackageJsonFile(this, rootProperty)
     return needsCodegenFromPackageJson(parsedPackageJson)

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

@@ -18,7 +18,10 @@ object PropertyUtils {
   const val HERMES_ENABLED = "hermesEnabled"
   const val SCOPED_HERMES_ENABLED = "react.hermesEnabled"
 
-  /** Public property that toggles Hermes V1 */
+  /**
+   * Deprecated property that used to toggle Hermes V1. Hermes V1 is now always enabled. Kept here
+   * so we can detect usage and warn users to remove it from their gradle.properties.
+   */
   const val HERMES_V1_ENABLED = "hermesV1Enabled"
   const val SCOPED_HERMES_V1_ENABLED = "react.hermesV1Enabled"
 
@@ -92,5 +95,4 @@ object PropertyUtils {
    * are stored in sdks/hermes-engine/version.properties
    */
   const val INTERNAL_HERMES_VERSION_NAME = "HERMES_VERSION_NAME"
-  const val INTERNAL_HERMES_V1_VERSION_NAME = "HERMES_V1_VERSION_NAME"
 }