Skip to content

Commit

Permalink
feat: Update Android JavaScriptCore
Browse files Browse the repository at this point in the history
The FSI18n package makes use of some newer JS features that do not exist in the default JSC included with React Native.
  • Loading branch information
nathan-sankbeil authored and skyeckstrom committed Sep 12, 2018
1 parent bbadd96 commit 47bc20f
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 2 deletions.
10 changes: 10 additions & 0 deletions packages/flagship/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,16 @@ repositories {

}

configurations.all {
resolutionStrategy {
eachDependency { DependencyResolveDetails details ->
if (details.requested.name == 'android-jsc') {
details.useTarget group: details.requested.group, name: 'android-jsc-intl', version: 'r224109'
}
}
}
}

dependencies {
compile 'com.google.android.gms:play-services-base:15.+'
compile 'com.google.android.gms:play-services-gcm:15.+'
Expand Down
6 changes: 5 additions & 1 deletion packages/flagship/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,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"
}
maven {
url 'https://maven.google.com/'
name 'Google'
Expand All @@ -33,7 +37,7 @@ allprojects {

ext {
buildToolsVersion = "26.0.3"
minSdkVersion = 16
minSdkVersion = 21
compileSdkVersion = 26
targetSdkVersion = 26
supportLibVersion = "26.1.0"
Expand Down
1 change: 1 addition & 0 deletions packages/flagship/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"dependencies": {
"fs-extra": "^7.0.0",
"glob": "^7.1.2",
"jsc-android": "224109.x.x",
"node-suspect": "^0.1.1",
"react": "^16.3.2",
"react-native": "^0.55.4",
Expand Down
4 changes: 3 additions & 1 deletion packages/fstestproject/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
"@brandingbrand/fssalesforce": "^0.1.0",
"@brandingbrand/fsturnto": "^0.1.0",
"@brandingbrand/fsups": "^0.1.0",
"jsc-android": "224109.x.x",
"react": "^16.3.2",
"react-native": "^0.55.4",
"react-native-i18n": "^2.0.15"
Expand All @@ -46,7 +47,8 @@
"react-native*",
"**/fsapp",
"**/fsapp/react-native*",
"**/fsapp/react-native*/**"
"**/fsapp/react-native*/**",
"jsc-android"
]
}
}
2 changes: 2 additions & 0 deletions packages/pirateship/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
"@brandingbrand/fsweb": "^0.1.0",
"@brandingbrand/react-native-leanplum": "^0.1.1",
"credit-card-type": "^7.0.0",
"jsc-android": "224109.x.x",
"lodash-es": "^4.17.10",
"react": "^16.3.2",
"react-native": "^0.55.4",
Expand Down Expand Up @@ -75,6 +76,7 @@
"**/fsapp",
"**/fsapp/react-native*",
"**/fsapp/react-native*/**",
"jsc-android",
"**/fsshopify",
"**/fsshopify/react-native*",
"**/fsshopify/react-native*/**"
Expand Down
4 changes: 4 additions & 0 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7167,6 +7167,10 @@ jsbn@~0.1.0:
version "0.1.1"
resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"

[email protected]:
version "224109.1.0"
resolved "https://registry.yarnpkg.com/jsc-android/-/jsc-android-224109.1.0.tgz#9749ec92f1e284b3c09befe7c47cc6e60b1f0cdf"

jsdom@^11.5.1:
version "11.11.0"
resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-11.11.0.tgz#df486efad41aee96c59ad7a190e2449c7eb1110e"
Expand Down

0 comments on commit 47bc20f

Please sign in to comment.