status-im
/
status-react
mirror of https://github.com/status-im/status-react.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixes for RN upgrade 

Signed-off-by: Jakub Sokołowski <jakub@status.im>
This commit is contained in:
Jakub Sokołowski 2019-12-04 16:38:11 +01:00
parent da6542e8ef
commit e8b4ed4ca8
No known key found for this signature in database
GPG Key ID: 4EF064D0E6D63020
2 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
android/app/build.gradle
View File

@ -80,7 +80,6 @@ project.ext.react = [
nodeExecutableAndArgs: ["node", "--max-old-space-size=16384"], nodeExecutableAndArgs: ["node", "--max-old-space-size=16384"],
entryFile: "index.android.js", entryFile: "index.android.js",
enableHermes: true, // clean and rebuild if changing. NOTE: Hermes engine is required for Android 64-bit builds running on 64 devices, to guard against a hang in the UI thread after invoking status-go enableHermes: true, // clean and rebuild if changing. NOTE: Hermes engine is required for Android 64-bit builds running on 64 devices, to guard against a hang in the UI thread after invoking status-go
hermesCommand: "../../node_modules/hermes-engine/%OS-BIN%/hermes", // Can be removed once RN moves to a version which depends on hermes-engine instead of hermesvm
bundleInPr: true, bundleInPr: true,
inputExcludes: ["android/**", "ios/**", "react-native/**", "src/**", "test/**"] inputExcludes: ["android/**", "ios/**", "react-native/**", "src/**", "test/**"]
] ]

16
nix/mobile/android/maven-and-npm-deps/default.nix
View File

@ -154,21 +154,7 @@ let
substituteInPlace ${projectBuildDir}/node_modules/react-native/react.gradle \ substituteInPlace ${projectBuildDir}/node_modules/react-native/react.gradle \
--replace \ --replace \
'targetName.toLowerCase().contains("release")' \ 'targetName.toLowerCase().contains("release")' \
'!targetName.toLowerCase().contains("debug")' \ '!targetName.toLowerCase().contains("debug")'
--replace \
'commandLine(getHermesCommand(), "-emit-binary", "-out", jsBundleFile, jsBundleFile, *hermesFlags)' \
'def jsBundleFileIn = File.createTempFile("index.android",".tmp")
jsBundleFileIn.deleteOnExit()
ant.move(
file: jsBundleFile,
tofile: jsBundleFileIn
);
commandLine(getHermesCommand(), "-emit-binary", "-out", jsBundleFile, jsBundleFileIn, *hermesFlags)
' \
|| exit
# Remove legacy hermesvm folder (can be removed once we upgrade RN to a version which depends on newer hermes-engine package instead of hermesvm)
rm -r ${projectBuildDir}/node_modules/hermesvm
# Patch dependencies which are not yet ported to AndroidX # Patch dependencies which are not yet ported to AndroidX
npx jetify npx jetify