mirror of
https://github.com/facebook/react-native.git
synced 2025-11-01 09:14:26 +00:00
Update template/android and RN Tester to use hermes-engine from the react-native NPM package. (#33467)
Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/33467 We can now change the `hermes-engine` dependency to be consumed by the `react-native` NPM package and not anymore from the standalone `hermes-engine`. This will allow for a better stability as the `hermes-engine` and the `react-native` were built from source at the same instant in time. Changelog: [Android] [Changed] - Update template/android and RN Tester to use `hermes-engine` from the `react-native` NPM package. Reviewed By: hramos Differential Revision: D34213795 fbshipit-source-id: 29e54b37db0103f72e9983976ef9147fe69116e7
This commit is contained in:
committed by
Facebook GitHub Bot
parent
743d0706e2
commit
4d91f40fbd
@@ -226,11 +226,12 @@ dependencies {
|
||||
// Build React Native from source
|
||||
implementation project(':ReactAndroid')
|
||||
|
||||
implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
|
||||
// Consume Hermes as built from source only for the Hermes variant.
|
||||
hermesImplementation(project(":ReactAndroid:hermes-engine")) {
|
||||
exclude group:'com.facebook.fbjni'
|
||||
}
|
||||
|
||||
def hermesPath = '$projectDir/../../../../../node_modules/hermes-engine/android/'
|
||||
hermesDebugImplementation files(hermesPath + "hermes-debug.aar")
|
||||
hermesReleaseImplementation files(hermesPath + "hermes-release.aar")
|
||||
implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
|
||||
|
||||
debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}") {
|
||||
exclude group:'com.facebook.fbjni'
|
||||
|
||||
@@ -271,9 +271,10 @@ dependencies {
|
||||
}
|
||||
|
||||
if (enableHermes) {
|
||||
def hermesPath = "../../node_modules/hermes-engine/android/";
|
||||
debugImplementation files(hermesPath + "hermes-debug.aar")
|
||||
releaseImplementation files(hermesPath + "hermes-release.aar")
|
||||
//noinspection GradleDynamicVersion
|
||||
implementation("com.facebook.react:hermes-engine:+") { // From node_modules
|
||||
exclude group:'com.facebook.fbjni'
|
||||
}
|
||||
} else {
|
||||
implementation jscFlavor
|
||||
}
|
||||
@@ -286,7 +287,11 @@ if (isNewArchitectureEnabled()) {
|
||||
configurations.all {
|
||||
resolutionStrategy.dependencySubstitution {
|
||||
substitute(module("com.facebook.react:react-native"))
|
||||
.using(project(":ReactAndroid")).because("On New Architecture we're building React Native from source")
|
||||
.using(project(":ReactAndroid"))
|
||||
.because("On New Architecture we're building React Native from source")
|
||||
substitute(module("com.facebook.react:hermes-engine"))
|
||||
.using(project(":ReactAndroid:hermes-engine"))
|
||||
.because("On New Architecture we're building Hermes from source")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -6,4 +6,6 @@ includeBuild('../node_modules/react-native-gradle-plugin')
|
||||
if (settings.hasProperty("newArchEnabled") && settings.newArchEnabled == "true") {
|
||||
include(":ReactAndroid")
|
||||
project(":ReactAndroid").projectDir = file('../node_modules/react-native/ReactAndroid')
|
||||
include(":ReactAndroid:hermes-engine")
|
||||
project(":ReactAndroid:hermes-engine").projectDir = file('../node_modules/react-native/ReactAndroid/hermes-engine')
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user