Skip to content

Commit

Permalink
Ditch jsc-android for default react-native jsc
Browse files Browse the repository at this point in the history
- same performance, smaller apk size and no more mispackaged .so files
  • Loading branch information
experiment322 committed Mar 8, 2019
1 parent 4ce84fc commit 9fa536d
Show file tree
Hide file tree
Showing 5 changed files with 65 additions and 90 deletions.
10 changes: 0 additions & 10 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -142,16 +142,6 @@ android {
}
}
}

packagingOptions {
pickFirst '**/libjsc.so'
}
}

configurations.all {
resolutionStrategy {
force 'org.webkit:android-jsc:r241213'
}
}

dependencies {
Expand Down
4 changes: 0 additions & 4 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,6 @@ 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"
}
}
}

Expand Down
109 changes: 52 additions & 57 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
},
"dependencies": {
"is-url": "^1.2.4",
"jsc-android": "^241213.0.0",
"lodash": "^4.17.11",
"prop-types": "^15.7.2",
"react": "16.6.3",
Expand Down
31 changes: 13 additions & 18 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -983,10 +983,10 @@ ansi-regex@^3.0.0:
resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=

ansi-regex@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.0.0.tgz#70de791edf021404c3fd615aa89118ae0432e5a9"
integrity sha512-iB5Dda8t/UqpPI/IjsejXu5jOGDrzn41wJyljwPH65VCIbk6+1BzFIMJGFwTNrYXT1CrD+B4l19U7awiQ8rk7w==
ansi-regex@^4.0.0, ansi-regex@^4.1.0:
version "4.1.0"
resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997"
integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==

ansi-styles@^2.2.1:
version "2.2.1"
Expand Down Expand Up @@ -3926,11 +3926,6 @@ jsbn@~0.1.0:
resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=

jsc-android@^241213.0.0:
version "241213.0.0"
resolved "https://registry.yarnpkg.com/jsc-android/-/jsc-android-241213.0.0.tgz#e41dd68ca48ecf6cb8cd75d3ed14a79cde259a26"
integrity sha512-rqc+FUOfXT1XNFI59J+7ByCvdKqw+0QCLm7fOJifbCxRV+UYjkFUMDHMfvEMSLaJhKMlhOwNAy8k9gyT+o60dg==

jsdom@^11.5.1:
version "11.12.0"
resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-11.12.0.tgz#1a80d40ddd378a1de59656e9e6dc5a3ba8657bc8"
Expand Down Expand Up @@ -6454,13 +6449,13 @@ string-width@^1.0.1:
strip-ansi "^4.0.0"

string-width@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.0.0.tgz#5a1690a57cc78211fffd9bf24bbe24d090604eb1"
integrity sha512-rr8CUxBbvOZDUvc5lNIJ+OC1nPVpz+Siw9VBtUjB9b6jZehZLFt0JMCZzShFHIsI8cbhm0EsNIfWJMFV3cu3Ew==
version "3.1.0"
resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961"
integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==
dependencies:
emoji-regex "^7.0.1"
is-fullwidth-code-point "^2.0.0"
strip-ansi "^5.0.0"
strip-ansi "^5.1.0"

string_decoder@~1.1.1:
version "1.1.1"
Expand All @@ -6483,12 +6478,12 @@ strip-ansi@^4.0.0:
dependencies:
ansi-regex "^3.0.0"

strip-ansi@^5.0.0:
version "5.0.0"
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.0.0.tgz#f78f68b5d0866c20b2c9b8c61b5298508dc8756f"
integrity sha512-Uu7gQyZI7J7gn5qLn1Np3G9vcYGTVqB+lFTytnDJv83dd8T22aGH451P3jueT2/QemInJDfxHB5Tde5OzgG1Ow==
strip-ansi@^5.0.0, strip-ansi@^5.1.0:
version "5.1.0"
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.1.0.tgz#55aaa54e33b4c0649a7338a43437b1887d153ec4"
integrity sha512-TjxrkPONqO2Z8QDCpeE2j6n0M6EwxzyDgzEeGp+FbdvaJAt//ClYi6W5my+3ROlC/hZX2KACUwDfK49Ka5eDvg==
dependencies:
ansi-regex "^4.0.0"
ansi-regex "^4.1.0"

strip-bom@^3.0.0:
version "3.0.0"
Expand Down

0 comments on commit 9fa536d

Please sign in to comment.