Skip to content

Commit 0ecaed3

Browse files
committed
Enable hermesV1Enabled=true by default on Android
1 parent 32c3d2f commit 0ecaed3

4 files changed

Lines changed: 10 additions & 4 deletions

File tree

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@ react.internal.useHermesStable=false
2626
react.internal.useHermesNightly=true
2727

2828
# Controls whether to use Hermes 1.0. Clean and rebuild when changing.
29-
hermesV1Enabled=false
29+
hermesV1Enabled=true

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,5 +59,5 @@ abstract class PrivateReactExtension @Inject constructor(project: Project) {
5959
val codegenDir: DirectoryProperty =
6060
objects.directoryProperty().convention(root.dir("node_modules/@react-native/codegen"))
6161

62-
val hermesV1Enabled: Property<Boolean> = objects.property(Boolean::class.java).convention(false)
62+
val hermesV1Enabled: Property<Boolean> = objects.property(Boolean::class.java).convention(true)
6363
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ internal object DependencyUtils {
113113
fun configureDependencies(
114114
project: Project,
115115
coordinates: Coordinates,
116-
hermesV1Enabled: Boolean = false,
116+
hermesV1Enabled: Boolean = true,
117117
) {
118118
if (
119119
coordinates.versionString.isBlank() ||
@@ -149,7 +149,7 @@ internal object DependencyUtils {
149149

150150
internal fun getDependencySubstitutions(
151151
coordinates: Coordinates,
152-
hermesV1Enabled: Boolean = false,
152+
hermesV1Enabled: Boolean = true,
153153
): List<Triple<String, String, String>> {
154154
val dependencySubstitution = mutableListOf<Triple<String, String, String>>()
155155
val hermesVersion =

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ internal object ProjectUtils {
2929

3030
const val HERMES_FALLBACK = true
3131

32+
const val HERMES_V1_ENABLED_FALLBACK = true
33+
3234
internal fun Project.isNewArchEnabled(): Boolean = true
3335

3436
internal val Project.isHermesEnabled: Boolean
@@ -73,6 +75,7 @@ internal object ProjectUtils {
7375

7476
internal val Project.isHermesV1Enabled: Boolean
7577
get() =
78+
if (project.hasProperty(HERMES_V1_ENABLED) || project.hasProperty(SCOPED_HERMES_V1_ENABLED)) {
7679
(project.hasProperty(HERMES_V1_ENABLED) &&
7780
project.property(HERMES_V1_ENABLED).toString().toBoolean()) ||
7881
(project.hasProperty(SCOPED_HERMES_V1_ENABLED) &&
@@ -81,6 +84,9 @@ internal object ProjectUtils {
8184
project.extraProperties.get(HERMES_V1_ENABLED).toString().toBoolean()) ||
8285
(project.extraProperties.has(SCOPED_HERMES_V1_ENABLED) &&
8386
project.extraProperties.get(SCOPED_HERMES_V1_ENABLED).toString().toBoolean())
87+
} else {
88+
HERMES_V1_ENABLED_FALLBACK
89+
}
8490

8591
internal fun Project.needsCodegenFromPackageJson(rootProperty: DirectoryProperty): Boolean {
8692
val parsedPackageJson = readPackageJsonFile(this, rootProperty)

0 commit comments

Comments
 (0)