update v8 to 7.5.1 and react native to 0.61.5 (keybase#21998)

Ast-x64 · Jan 12, 2020 · 2851ead · 2851ead
1 parent 2d042ad
commit 2851ead
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/shared/android/build.gradle b/shared/android/build.gradle
@@ -55,9 +55,12 @@ allprojects {
         if (enableV8) {
             maven {
                 // Replace AAR from original RN with AAR from react-native-v8
-                // prebuilt libv8.so
                 url("$rootDir/../node_modules/react-native-v8/dist")
             }
+            maven {
+                // prebuilt libv8.so
+                url("$rootDir/../node_modules/v8-android-nointl/dist")
+            }
         } else {
             maven {
                 url("$rootDir/../node_modules/react-native/android")

diff --git a/shared/package.json b/shared/package.json
@@ -280,14 +280,15 @@
     "prettier": "1.19.1",
     "randexp": "0.5.3",
     "react-hot-loader": "4.12.14",
-    "react-native-v8": "git://github.com/keybase/react-native-v8#nojima/61-5",
+    "react-native-v8": "git://github.com/keybase/react-native-v8#rn0.61.5",
     "react-test-renderer": "16.9.0",
     "redux-logger": "3.0.6",
     "rimraf": "2.6.3",
     "style-loader": "1.0.0",
     "terser-webpack-plugin": "2.1.0",
     "tls": "git://github.com/keybase/nullModule",
     "typescript": "3.7.4",
+    "v8-android-nointl": "git://github.com/keybase/v8-android-nointl#v7.5.1",
     "webpack": "4.41.0",
     "webpack-cli": "3.3.9",
     "webpack-dashboard": "3.2.0",

diff --git a/shared/yarn.lock b/shared/yarn.lock
@@ -11059,9 +11059,9 @@ [email protected]:
     unimodules-sensors-interface "~4.0.0"
     unimodules-task-manager-interface "~4.0.0"
 
-"react-native-v8@git://github.com/keybase/react-native-v8#nojima/61-5":
+"react-native-v8@git://github.com/keybase/react-native-v8#rn0.61.5":
   version "0.60.5-patch.0"
-  resolved "git://github.com/keybase/react-native-v8#f298f974cb5d3e25bea2e1ac046ef4a080a43f07"
+  resolved "git://github.com/keybase/react-native-v8#b4f8732b62850c7033292d458a1c868da809aa91"
   dependencies:
     v8-android "^7.5.1"
 
@@ -13584,6 +13584,10 @@ uuid@^3.0.1, uuid@^3.3.2:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
   integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==
 
+"v8-android-nointl@git://github.com/keybase/v8-android-nointl#v7.5.1":
+  version "7.5.1"
+  resolved "git://github.com/keybase/v8-android-nointl#09802382bfbd12902e69f3dc3232b00a0531c07c"
+
 v8-android@^7.5.1:
   version "7.5.1"
   resolved "https://registry.yarnpkg.com/v8-android/-/v8-android-7.5.1.tgz#490288785381826d6c96323cecfb3fdbf2200424"