Fix android builds (#1080)

* fix android builds * more webview removal * more fixes * use frozen lockfile in ci * fix * fix linter errors
MetaMask · Sep 12, 2019 · c3459fe · c3459fe
1 parent 561eb01
commit c3459fe
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 11 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -19,7 +19,7 @@ aliases:
 
   - &install-node-dependencies
       |
-        rm -rf node_modules/websocket/.git && yarn install --network-timeout 300000
+        rm -rf node_modules/websocket/.git && yarn install --network-timeout 300000 --frozen-lockfile
 
 defaults: &defaults
   working_directory: ~/MetaMask

diff --git a/app/components/UI/DrawerView/index.js b/app/components/UI/DrawerView/index.js
@@ -38,7 +38,7 @@ import Engine from '../../../core/Engine';
 import { setTokensTransaction } from '../../../actions/transaction';
 import findFirstIncomingTransaction from '../../../util/accountSecurity';
 import ActionModal from '../ActionModal';
-import { getVersion, getBuildNumber, getSystemName, getAPILevel, getSystemVersion } from 'react-native-device-info';
+import { getVersion, getBuildNumber, getSystemName, getApiLevel, getSystemVersion } from 'react-native-device-info';
 import Logger from '../../../util/Logger';
 import DeviceSize from '../../../util/DeviceSize';
 import OnboardingWizard from '../OnboardingWizard';
@@ -598,7 +598,7 @@ class DrawerView extends PureComponent {
 		const appVersion = getVersion();
 		const buildNumber = getBuildNumber();
 		const systemName = getSystemName();
-		const systemVersion = systemName === 'Android' ? getAPILevel() : getSystemVersion();
+		const systemVersion = systemName === 'Android' ? getApiLevel() : getSystemVersion();
 		this.goToBrowserUrl(
 			`https://docs.google.com/forms/d/e/${formId}/viewform?entry.649573346=${systemName}+${systemVersion}+MM+${appVersion}+(${buildNumber})`,
 			strings('drawer.feedback')

diff --git a/package.json b/package.json
@@ -96,12 +96,12 @@
     "react-native-aes-crypto": "github:brunobar79/react-native-aes#495bf43f119f6ee5998e7e42b9cb02bb39a5a524",
     "react-native-animated-fox": "github:brunobar79/react-native-animated-fox#813096236bd765da465647c31b2d392e1d114d3f",
     "react-native-background-timer": "2.1.1",
-    "react-native-branch": "github:brunobar79/react-native-branch-deep-linking-attribution#0d4839c068928ab38205c0473607915716990ab7",
+    "react-native-branch": "github:brunobar79/react-native-branch-deep-linking-attribution#6abb7e34a8f77f624013bb148aed87f50e72bf8f",
     "react-native-browser-polyfill": "0.1.2",
     "react-native-button": "github:brunobar79/react-native-button#fd79f4d6c8ced4086ba6e3021b6ed6d4a3e19cf7",
     "react-native-camera": "2.10.0",
     "react-native-crypto": "2.1.2",
-    "react-native-device-info": "github:react-native-community/react-native-device-info#a3cff963641280326b0b1205f1f6b56a537355e3",
+    "react-native-device-info": "3.0.0",
     "react-native-elevated-view": "0.0.6",
     "react-native-emoji": "1.3.1",
     "react-native-fabric": "0.5.2",

diff --git a/scripts/postinstall.sh b/scripts/postinstall.sh
@@ -140,10 +140,11 @@ fi
 
 echo "14. Remove UIWebview deps"
 rm -rf node_modules/Libraries/React.xcodeproj/React/Views/RCTWebView.h
-rm -rf node_modules/Libraries/React.xcodeproj/React/Views/RCTWebView.h
 rm -rf node_modules/Libraries/React.xcodeproj/React/Views/RCTWebView.m
 rm -rf node_modules/Libraries/React.xcodeproj/React/Views/RCTWebViewManager.h
 rm -rf node_modules/Libraries/React.xcodeproj/React/Views/RCTWebViewManager.m
 
 echo "15. Remove Branch examples"
 rm -rf node_modules/react-native-branch/examples/
+rm -rf node_modules/react-native-branch/native-tests/
+
diff --git a/yarn.lock b/yarn.lock
@@ -9397,9 +9397,9 @@ [email protected]:
   resolved "https://registry.yarnpkg.com/react-native-background-timer/-/react-native-background-timer-2.1.1.tgz#9a2489681ab2f8033c213c73272e9d4c47572cd5"
   integrity sha512-cuXIIv+dcG8a8qkTD8pMzeqOEZCO+UGKglZWIe1osve+yJslmCowYQff+bI9xa7NOt2w+Vtd4L3d9JonlSqODg==
 
-"react-native-branch@github:brunobar79/react-native-branch-deep-linking-attribution#0d4839c068928ab38205c0473607915716990ab7":
+"react-native-branch@github:brunobar79/react-native-branch-deep-linking-attribution#6abb7e34a8f77f624013bb148aed87f50e72bf8f":
   version "3.1.1"
-  resolved "https://codeload.github.com/brunobar79/react-native-branch-deep-linking-attribution/tar.gz/0d4839c068928ab38205c0473607915716990ab7"
+  resolved "https://codeload.github.com/brunobar79/react-native-branch-deep-linking-attribution/tar.gz/6abb7e34a8f77f624013bb148aed87f50e72bf8f"
 
 [email protected]:
   version "0.1.2"
@@ -9444,9 +9444,10 @@ [email protected]:
     pbkdf2 "3.0.8"
     public-encrypt "^4.0.0"
 
-"react-native-device-info@github:react-native-community/react-native-device-info#a3cff963641280326b0b1205f1f6b56a537355e3":
-  version "2.3.2"
-  resolved "https://codeload.github.com/react-native-community/react-native-device-info/tar.gz/a3cff963641280326b0b1205f1f6b56a537355e3"
+[email protected]:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/react-native-device-info/-/react-native-device-info-3.0.0.tgz#3eb6c4c9427e337268074e6a3e27230d1d0c4178"
+  integrity sha512-GdCIp6SBiOhxhkWcUcFy7RIn9elaJ4DC8UEcs7KBC3bwfZyx/jHwqQc7jk6IFYiI3/+7/rnJletVy8DkSkVOUw==
 
 [email protected]:
   version "0.0.6"