@react-native/gradle-plugin 0.84.0-rc.0 → 0.84.0-rc.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native/gradle-plugin",
-  "version": "0.84.0-rc.0",
+  "version": "0.84.0-rc.2",
   "description": "Gradle Plugin for React Native",
   "license": "MIT",
   "repository": {
@@ -16,7 +16,7 @@
   ],
   "bugs": "https://github.com/facebook/react-native/issues",
   "engines": {
-    "node": ">= 22.11.0"
+    "node": ">= 20.19.4"
   },
   "scripts": {
     "build": "./gradlew build",

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

@@ -59,5 +59,5 @@ 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(false)
+  val hermesV1Enabled: Property<Boolean> = objects.property(Boolean::class.java).convention(true)
 }

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

@@ -113,7 +113,7 @@ internal object DependencyUtils {
   fun configureDependencies(
       project: Project,
       coordinates: Coordinates,
-      hermesV1Enabled: Boolean = false,
+      hermesV1Enabled: Boolean = true,
   ) {
     if (
         coordinates.versionString.isBlank() ||
@@ -149,7 +149,7 @@ internal object DependencyUtils {
 
   internal fun getDependencySubstitutions(
       coordinates: Coordinates,
-      hermesV1Enabled: Boolean = false,
+      hermesV1Enabled: Boolean = true,
   ): List<Triple<String, String, String>> {
     val dependencySubstitution = mutableListOf<Triple<String, String, String>>()
     val hermesVersion =

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

@@ -29,6 +29,8 @@ 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,14 +75,20 @@ internal object ProjectUtils {
 
   internal val Project.isHermesV1Enabled: Boolean
     get() =
-        (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())
+        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)

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

@@ -290,6 +290,8 @@ class DependencyUtilsTest {
     assertThat(forcedModules.any { it.toString() == "com.facebook.react:react-android:1.2.3" })
         .isTrue()
     assertThat(forcedModules.any { it.toString() == "com.facebook.hermes:hermes-android:4.5.6" })
+        .isFalse()
+    assertThat(forcedModules.any { it.toString() == "com.facebook.hermes:hermes-android:7.8.9" })
         .isTrue()
   }
 
@@ -325,10 +327,14 @@ class DependencyUtilsTest {
     assertThat(appForcedModules.any { it.toString() == "com.facebook.react:react-android:1.2.3" })
         .isTrue()
     assertThat(appForcedModules.any { it.toString() == "com.facebook.hermes:hermes-android:4.5.6" })
+        .isFalse()
+    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:4.5.6" })
+        .isFalse()
+    assertThat(libForcedModules.any { it.toString() == "com.facebook.hermes:hermes-android:7.8.9" })
         .isTrue()
   }
 
@@ -384,12 +390,20 @@ class DependencyUtilsTest {
     assertThat(
             appForcedModules.any { it.toString() == "io.github.test.hermes:hermes-android:4.5.6" }
         )
+        .isFalse()
+    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:4.5.6" }
         )
+        .isFalse()
+    assertThat(
+            libForcedModules.any { it.toString() == "io.github.test.hermes:hermes-android:7.8.9" }
+        )
         .isTrue()
   }
 
@@ -430,7 +444,7 @@ class DependencyUtilsTest {
   }
 
   @Test
-  fun getDependencySubstitutions_withDefaultGroup_substitutesCorrectly_withClassicHermes() {
+  fun getDependencySubstitutions_withDefaultGroup_substitutesCorrectly_withHermesV1() {
     val dependencySubstitutions =
         getDependencySubstitutions(DependencyUtils.Coordinates("0.42.0", "0.42.0", "0.43.0"))
 
@@ -442,7 +456,7 @@ class DependencyUtilsTest {
         )
         .isEqualTo(dependencySubstitutions[0].third)
     assertThat("com.facebook.react:hermes-engine").isEqualTo(dependencySubstitutions[1].first)
-    assertThat("com.facebook.hermes:hermes-android:0.42.0")
+    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."
@@ -451,7 +465,7 @@ class DependencyUtilsTest {
   }
 
   @Test
-  fun getDependencySubstitutions_withDefaultGroup_substitutesCorrectly_withHermesV1() {
+  fun getDependencySubstitutions_withDefaultGroupAndFallback_substitutesCorrectly_withClassicHermes() {
     val dependencySubstitutions =
         getDependencySubstitutions(
             DependencyUtils.Coordinates("0.42.0", "0.42.0", "0.43.0"),
@@ -475,7 +489,7 @@ class DependencyUtilsTest {
   }
 
   @Test
-  fun getDependencySubstitutions_withCustomGroup_substitutesCorrectly_withClassicHermes() {
+  fun getDependencySubstitutions_withCustomGroup_substitutesCorrectly_withHermesV1() {
     val dependencySubstitutions =
         getDependencySubstitutions(
             DependencyUtils.Coordinates(
@@ -494,14 +508,14 @@ class DependencyUtilsTest {
         )
         .isEqualTo(dependencySubstitutions[0].third)
     assertThat("com.facebook.react:hermes-engine").isEqualTo(dependencySubstitutions[1].first)
-    assertThat("io.github.test.hermes:hermes-android:0.42.0")
+    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:hermes-android").isEqualTo(dependencySubstitutions[2].first)
-    assertThat("io.github.test.hermes:hermes-android:0.42.0")
+    assertThat("io.github.test.hermes:hermes-android:0.43.0")
         .isEqualTo(dependencySubstitutions[2].second)
     assertThat("The hermes-android artifact was moved to com.facebook.hermes publishing group.")
         .isEqualTo(dependencySubstitutions[2].third)
@@ -510,14 +524,14 @@ class DependencyUtilsTest {
     assertThat("The react-android dependency was modified to use the correct Maven group.")
         .isEqualTo(dependencySubstitutions[3].third)
     assertThat("com.facebook.react:hermes-android").isEqualTo(dependencySubstitutions[4].first)
-    assertThat("io.github.test.hermes:hermes-android:0.42.0")
+    assertThat("io.github.test.hermes:hermes-android:0.43.0")
         .isEqualTo(dependencySubstitutions[4].second)
     assertThat("The hermes-android dependency was modified to use the correct Maven group.")
         .isEqualTo(dependencySubstitutions[4].third)
   }
 
   @Test
-  fun getDependencySubstitutions_withCustomGroup_substitutesCorrectly_withHermesV1() {
+  fun getDependencySubstitutions_withCustomGroupAndFallbackToClassicHermes_substitutesCorrectly_withClassicHermes() {
     val dependencySubstitutions =
         getDependencySubstitutions(
             DependencyUtils.Coordinates(
@@ -527,7 +541,7 @@ class DependencyUtilsTest {
                 "io.github.test",
                 "io.github.test.hermes",
             ),
-            hermesV1Enabled = true,
+            hermesV1Enabled = false,
         )
 
     assertThat("com.facebook.react:react-native").isEqualTo(dependencySubstitutions[0].first)
@@ -537,14 +551,14 @@ class DependencyUtilsTest {
         )
         .isEqualTo(dependencySubstitutions[0].third)
     assertThat("com.facebook.react:hermes-engine").isEqualTo(dependencySubstitutions[1].first)
-    assertThat("io.github.test.hermes:hermes-android:0.43.0")
+    assertThat("io.github.test.hermes:hermes-android:0.42.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:hermes-android").isEqualTo(dependencySubstitutions[2].first)
-    assertThat("io.github.test.hermes:hermes-android:0.43.0")
+    assertThat("io.github.test.hermes:hermes-android:0.42.0")
         .isEqualTo(dependencySubstitutions[2].second)
     assertThat("The hermes-android artifact was moved to com.facebook.hermes publishing group.")
         .isEqualTo(dependencySubstitutions[2].third)
@@ -553,7 +567,7 @@ class DependencyUtilsTest {
     assertThat("The react-android dependency was modified to use the correct Maven group.")
         .isEqualTo(dependencySubstitutions[3].third)
     assertThat("com.facebook.react:hermes-android").isEqualTo(dependencySubstitutions[4].first)
-    assertThat("io.github.test.hermes:hermes-android:0.43.0")
+    assertThat("io.github.test.hermes:hermes-android:0.42.0")
         .isEqualTo(dependencySubstitutions[4].second)
     assertThat("The hermes-android dependency was modified to use the correct Maven group.")
         .isEqualTo(dependencySubstitutions[4].third)

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

@@ -117,8 +117,8 @@ class ProjectUtilsTest {
   }
 
   @Test
-  fun isHermesV1Enabled_returnsFalseByDefault() {
-    assertThat(createProject().isHermesV1Enabled).isFalse()
+  fun isHermesV1Enabled_returnsTrueByDefault() {
+    assertThat(createProject().isHermesV1Enabled).isTrue()
   }
 
   @Test