Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 2 additions & 21 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -55,19 +55,6 @@ apply plugin: "com.facebook.react"
*/
def enableProguardInReleaseBuilds = false

/**
* The preferred build flavor of JavaScriptCore (JSC).
*
* For example, to use the international variant, you can use:
* `def jscFlavor = 'org.webkit:android-jsc-intl:+'`
*
* The international variant includes ICU i18n library and necessary data
* allowing to use e.g. `Date.toLocaleString` and `String.localeCompare` that
* give correct results when using with locales other than en-US. Note that
* this variant is about 6MiB larger per architecture than default.
*/
def jscFlavor = "org.webkit:android-jsc:+"

android {
ndkVersion rootProject.ndkVersion
buildToolsVersion rootProject.ext.buildToolsVersion
Expand Down Expand Up @@ -114,7 +101,6 @@ android {
buildConfig true
}
packagingOptions {
pickFirst "**/libjsc.so"
pickFirst "**/libc++_shared.so"
}
}
Expand All @@ -128,13 +114,8 @@ dependencies {
implementation "com.facebook.react:react-native:+" // From node_modules

// Javascript engine
if (hermesEnabled.toBoolean()) {
implementation("com.facebook.react:hermes-android")
} else {
implementation jscFlavor
implementation "org.webkit:android-jsc:r174650"
}

implementation("com.facebook.react:hermes-android")

implementation project(':react-native-localize')
implementation project(":react-native-splash-screen")
implementation project(":mendixnative-release")
Expand Down
6 changes: 1 addition & 5 deletions android/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,4 @@ android.enableJetifier=true
org.gradle.configureondemand=true
android.disableResourceValidation=true
android.nonTransitiveRClass=true
android.suppressUnsupportedCompileSdk=33

# Use this property to enable or disable the Hermes JS engine.
# If set to false, you will be using JSC instead.
hermesEnabled=false
android.suppressUnsupportedCompileSdk=33
5 changes: 0 additions & 5 deletions ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,8 @@ def common_pods
xcconfig_file = "./Config/config.xcconfig"
xcconfig = Xcodeproj::Config.new(xcconfig_file)

hermes_enabled = xcconfig.attributes['HERMES_ENABLED'] || 'false'

use_react_native!(
:path => config[:reactNativePath],
# Hermes is configurable in Studio Pro via Navigation Profile
:hermes_enabled => (hermes_enabled == 'YES'),
:fabric_enabled => false,
# An absolute path to your application root.
:app_path => "#{Pod::Config.instance.installation_root}/.."
)
Expand Down
Loading
Loading