diff --git a/android/app/build.gradle b/android/app/build.gradle index d5cb5b2a44a17bad2762784d1274a89e0d1f8e85..9e9465975b71eb1ea4c6eda676f25fe441a5455a 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -113,6 +113,11 @@ android { vectorDrawables.useSupportLibrary = true } + packagingOptions { + pickFirst '**/libjsc.so' + pickFirst '**/libc++_shared.so' + } + signingConfigs { release { if (project.hasProperty('KEYSTORE')) { @@ -166,6 +171,7 @@ android { } dependencies { + implementation "org.webkit:android-jsc:r241213" implementation project(':react-native-firebase') implementation project(':react-native-webview') implementation project(':react-native-orientation-locker') diff --git a/android/build.gradle b/android/build.gradle index 574e19623987e20c583395600b159f49b52e0df2..eb8c903a46da3697f38f5898579a7c0f3885c3c3 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -36,6 +36,10 @@ allprojects { // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm url "$rootDir/../node_modules/react-native/android" } + maven { + // Local Maven repo containing AARs with JSC library built for Android + url "$rootDir/../node_modules/jsc-android/dist" + } } } diff --git a/package.json b/package.json index c85241121671da0d427590e57e4abae1e84593a7..da0d41c6e606c5a5a1be85599757dd516bf7fc30 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "ejson": "^2.1.2", "js-base64": "^2.5.1", "js-sha256": "^0.9.0", - "jsc-android": "241213.1.0", + "jsc-android": "^241213.2.0", "lodash": "^4.17.11", "markdown-it-flowdock": "^0.3.7", "moment": "^2.24.0", diff --git a/yarn.lock b/yarn.lock index 4929a2f0763c1e2e190e1de10b878e83351dfee5..fb5bb0996e7f552fd12fd6cbc19c7305b5700218 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8524,10 +8524,10 @@ jsbn@~0.1.0: resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM= -jsc-android@241213.1.0: - version "241213.1.0" - resolved "https://registry.yarnpkg.com/jsc-android/-/jsc-android-241213.1.0.tgz#8f940d7c7f6bebf14eda32bef42a76182e336452" - integrity sha512-AH8NYyMNLNhcUEF97QbMxPNLNW+oiSBlvm1rsMNzgJ1d5TQzdh/AOJGsxeeESp3m9YIWGLCgUvGTVoVLs0p68A== +jsc-android@^241213.2.0: + version "241213.2.0" + resolved "https://registry.yarnpkg.com/jsc-android/-/jsc-android-241213.2.0.tgz#a43b78e4dace997be533e7cb812d9714878b069f" + integrity sha512-nfddejB9jxFSG+Uewf+zwATFi8F2CZEEgoHLoOj13egiBDoC7zMoxK1c5/Ycf3AGmGuwCgjpn3LWe0f4tKYbjw== jsdom@^11.5.1: version "11.12.0"