Skip to content

Commit 52c825a

Browse files
Merge pull request #890 from mendix/moo/MOO-1671-make-hermes-only-option
Enable Hermes by default
2 parents 0aa0683 + 12de028 commit 52c825a

File tree

7 files changed

+214
-147
lines changed

7 files changed

+214
-147
lines changed

android/app/build.gradle

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -55,19 +55,6 @@ apply plugin: "com.facebook.react"
5555
*/
5656
def enableProguardInReleaseBuilds = false
5757

58-
/**
59-
* The preferred build flavor of JavaScriptCore (JSC).
60-
*
61-
* For example, to use the international variant, you can use:
62-
* `def jscFlavor = 'org.webkit:android-jsc-intl:+'`
63-
*
64-
* The international variant includes ICU i18n library and necessary data
65-
* allowing to use e.g. `Date.toLocaleString` and `String.localeCompare` that
66-
* give correct results when using with locales other than en-US. Note that
67-
* this variant is about 6MiB larger per architecture than default.
68-
*/
69-
def jscFlavor = "org.webkit:android-jsc:+"
70-
7158
android {
7259
ndkVersion rootProject.ndkVersion
7360
buildToolsVersion rootProject.ext.buildToolsVersion
@@ -114,7 +101,6 @@ android {
114101
buildConfig true
115102
}
116103
packagingOptions {
117-
pickFirst "**/libjsc.so"
118104
pickFirst "**/libc++_shared.so"
119105
}
120106
}
@@ -128,13 +114,8 @@ dependencies {
128114
implementation "com.facebook.react:react-native:+" // From node_modules
129115

130116
// Javascript engine
131-
if (hermesEnabled.toBoolean()) {
132-
implementation("com.facebook.react:hermes-android")
133-
} else {
134-
implementation jscFlavor
135-
implementation "org.webkit:android-jsc:r174650"
136-
}
137-
117+
implementation("com.facebook.react:hermes-android")
118+
138119
implementation project(':react-native-localize')
139120
implementation project(":react-native-splash-screen")
140121
implementation project(":mendixnative-release")

android/gradle.properties

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,4 @@ android.enableJetifier=true
2121
org.gradle.configureondemand=true
2222
android.disableResourceValidation=true
2323
android.nonTransitiveRClass=true
24-
android.suppressUnsupportedCompileSdk=33
25-
26-
# Use this property to enable or disable the Hermes JS engine.
27-
# If set to false, you will be using JSC instead.
28-
hermesEnabled=false
24+
android.suppressUnsupportedCompileSdk=33

ios/Podfile

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,8 @@ def common_pods
4242
xcconfig_file = "./Config/config.xcconfig"
4343
xcconfig = Xcodeproj::Config.new(xcconfig_file)
4444

45-
hermes_enabled = xcconfig.attributes['HERMES_ENABLED'] || 'false'
46-
4745
use_react_native!(
4846
:path => config[:reactNativePath],
49-
# Hermes is configurable in Studio Pro via Navigation Profile
50-
:hermes_enabled => (hermes_enabled == 'YES'),
51-
:fabric_enabled => false,
5247
# An absolute path to your application root.
5348
:app_path => "#{Pod::Config.instance.installation_root}/.."
5449
)

0 commit comments

Comments
 (0)