Android 64 bits build working (#692)

* android 64 bits build working * make patching conditional * bump version on iOS
MetaMask · May 31, 2019 · c87156d · c87156d
1 parent 34fec6f
commit c87156d
Show file tree

Hide file tree

Showing 36 changed files with 2,378 additions and 205 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -174,14 +174,14 @@ android {
         applicationId "io.metamask"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 8
-        versionName "0.1.7"
+        versionCode 9
+        versionName "0.1.8"
         multiDexEnabled true
         testBuildType System.getProperty('testBuildType', 'debug')
         missingDimensionStrategy "minReactNative", "minReactNative46"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         ndk {
-            abiFilters "armeabi-v7a", "x86"
+            abiFilters "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
         }
         dexOptions {
             javaMaxHeapSize "2048M"

diff --git a/android/app/src/main/assets/index.android.bundle b/android/app/src/main/assets/index.android.bundle
diff --git a/...s/drawable-hdpi/node_modules_reactnavigationstack_src_views_assets_backicon.png b/...s/drawable-hdpi/node_modules_reactnavigationstack_src_views_assets_backicon.png
diff --git a/android/app/src/main/res/drawable-mdpi/app_images_bg.png b/android/app/src/main/res/drawable-mdpi/app_images_bg.png
diff --git a/android/app/src/main/res/drawable-mdpi/app_images_ethlogo.png b/android/app/src/main/res/drawable-mdpi/app_images_ethlogo.png
diff --git a/android/app/src/main/res/drawable-mdpi/app_images_fox.png b/android/app/src/main/res/drawable-mdpi/app_images_fox.png
diff --git a/android/app/src/main/res/drawable-mdpi/app_images_foxbadge.png b/android/app/src/main/res/drawable-mdpi/app_images_foxbadge.png
diff --git a/android/app/src/main/res/drawable-mdpi/app_images_frame.png b/android/app/src/main/res/drawable-mdpi/app_images_frame.png
diff --git a/android/app/src/main/res/drawable-mdpi/app_images_lock.png b/android/app/src/main/res/drawable-mdpi/app_images_lock.png
diff --git a/android/app/src/main/res/drawable-mdpi/app_images_metamaskname.png b/android/app/src/main/res/drawable-mdpi/app_images_metamaskname.png
diff --git a/android/app/src/main/res/drawable-mdpi/app_images_opensealogoflatcoloredblue.png b/android/app/src/main/res/drawable-mdpi/app_images_opensealogoflatcoloredblue.png
diff --git a/android/app/src/main/res/drawable-mdpi/app_images_selectedwalleticon.png b/android/app/src/main/res/drawable-mdpi/app_images_selectedwalleticon.png
diff --git a/android/app/src/main/res/drawable-mdpi/app_images_syncicon.png b/android/app/src/main/res/drawable-mdpi/app_images_syncicon.png
diff --git a/android/app/src/main/res/drawable-mdpi/app_images_walleticon.png b/android/app/src/main/res/drawable-mdpi/app_images_walleticon.png
diff --git a/...drawable-mdpi/node_modules_reactnativeflashmessage_src_icons_fm_icon_danger.png b/...drawable-mdpi/node_modules_reactnativeflashmessage_src_icons_fm_icon_danger.png
diff --git a/...s/drawable-mdpi/node_modules_reactnativeflashmessage_src_icons_fm_icon_info.png b/...s/drawable-mdpi/node_modules_reactnativeflashmessage_src_icons_fm_icon_info.png
diff --git a/...rawable-mdpi/node_modules_reactnativeflashmessage_src_icons_fm_icon_success.png b/...rawable-mdpi/node_modules_reactnativeflashmessage_src_icons_fm_icon_success.png
diff --git a/...rawable-mdpi/node_modules_reactnativeflashmessage_src_icons_fm_icon_warning.png b/...rawable-mdpi/node_modules_reactnativeflashmessage_src_icons_fm_icon_warning.png
diff --git a/...s/drawable-mdpi/node_modules_reactnavigationstack_src_views_assets_backicon.png b/...s/drawable-mdpi/node_modules_reactnavigationstack_src_views_assets_backicon.png
diff --git a/...awable-mdpi/node_modules_reactnavigationstack_src_views_assets_backiconmask.png b/...awable-mdpi/node_modules_reactnavigationstack_src_views_assets_backiconmask.png
diff --git a/...rawable-xhdpi/node_modules_reactnativeflashmessage_src_icons_fm_icon_danger.png b/...rawable-xhdpi/node_modules_reactnativeflashmessage_src_icons_fm_icon_danger.png
diff --git a/.../drawable-xhdpi/node_modules_reactnativeflashmessage_src_icons_fm_icon_info.png b/.../drawable-xhdpi/node_modules_reactnativeflashmessage_src_icons_fm_icon_info.png
diff --git a/...awable-xhdpi/node_modules_reactnativeflashmessage_src_icons_fm_icon_success.png b/...awable-xhdpi/node_modules_reactnativeflashmessage_src_icons_fm_icon_success.png
diff --git a/...awable-xhdpi/node_modules_reactnativeflashmessage_src_icons_fm_icon_warning.png b/...awable-xhdpi/node_modules_reactnativeflashmessage_src_icons_fm_icon_warning.png
diff --git a/.../drawable-xhdpi/node_modules_reactnavigationstack_src_views_assets_backicon.png b/.../drawable-xhdpi/node_modules_reactnavigationstack_src_views_assets_backicon.png
diff --git a/...awable-xxhdpi/node_modules_reactnativeflashmessage_src_icons_fm_icon_danger.png b/...awable-xxhdpi/node_modules_reactnativeflashmessage_src_icons_fm_icon_danger.png
diff --git a/...drawable-xxhdpi/node_modules_reactnativeflashmessage_src_icons_fm_icon_info.png b/...drawable-xxhdpi/node_modules_reactnativeflashmessage_src_icons_fm_icon_info.png
diff --git a/...wable-xxhdpi/node_modules_reactnativeflashmessage_src_icons_fm_icon_success.png b/...wable-xxhdpi/node_modules_reactnativeflashmessage_src_icons_fm_icon_success.png
diff --git a/...wable-xxhdpi/node_modules_reactnativeflashmessage_src_icons_fm_icon_warning.png b/...wable-xxhdpi/node_modules_reactnativeflashmessage_src_icons_fm_icon_warning.png
diff --git a/...drawable-xxhdpi/node_modules_reactnavigationstack_src_views_assets_backicon.png b/...drawable-xxhdpi/node_modules_reactnavigationstack_src_views_assets_backicon.png
diff --git a/...rawable-xxxhdpi/node_modules_reactnavigationstack_src_views_assets_backicon.png b/...rawable-xxxhdpi/node_modules_reactnavigationstack_src_views_assets_backicon.png
diff --git a/ios/MetaMask.xcodeproj/project.pbxproj b/ios/MetaMask.xcodeproj/project.pbxproj
@@ -5,6 +5,7 @@
 	};
 	objectVersion = 46;
 	objects = {
+
 /* Begin PBXBuildFile section */
 		00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302AC1ABCB8CE00DB3ED1 /* libRCTActionSheet.a */; };
 		00C302E81ABCBA2D00DB3ED1 /* libRCTImage.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302C01ABCB91800DB3ED1 /* libRCTImage.a */; };
@@ -61,6 +62,7 @@
 		887E75FB64A54509A08D6C50 /* Roboto-LightItalic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = E020F42F788744B3BCE17F05 /* Roboto-LightItalic.ttf */; };
 		900DAC87A8AB4C8092EA3682 /* libRNRandomBytes.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8ABF9E3C7C334558A19A8C88 /* libRNRandomBytes.a */; };
 		9916CE03947044A781F61544 /* libRNI18n.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 138ABBB9E0B74423B1FEB949 /* libRNI18n.a */; };
+		9AC52F22A86F4412BDE0EE7B /* FontAwesome5_Solid.ttf in Resources */ = {isa = PBXBuildFile; fileRef = A98DB430A7DA47EFB97EDF8B /* FontAwesome5_Solid.ttf */; };
 		9F715EBC29F64D1C8170F284 /* libRNViewShot.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 29A7A9B265664A939A064628 /* libRNViewShot.a */; };
 		AB0011D0A1224FD09AB255D3 /* libRCTAes.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BCC003A069E4228AE707B9A /* libRCTAes.a */; };
 		ADBDB9381DFEBF1600ED6528 /* libRCTBlob.a in Frameworks */ = {isa = PBXBuildFile; fileRef = ADBDB9271DFEBF0700ED6528 /* libRCTBlob.a */; };
@@ -72,15 +74,14 @@
 		CD13D926E1E84D9ABFE672C0 /* Roboto-BlackItalic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 3E2492C67CF345CABD7B8601 /* Roboto-BlackItalic.ttf */; };
 		CFF4EF3E169746F79CF0D9EE /* libRNShare.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 204D40F66C724C47BF4D4911 /* libRNShare.a */; };
 		DC6A024F56DD43E1A83B47B1 /* Roboto-MediumItalic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = D5FF0FF1DFB74B3C8BB99E09 /* Roboto-MediumItalic.ttf */; };
+		DF4F8A5FCCCD40749BDD2E61 /* FontAwesome5_Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = EBC2B6371CD846D28B9FAADF /* FontAwesome5_Regular.ttf */; };
 		EF65C42EA15B4774B1947A12 /* Roboto-Medium.ttf in Resources */ = {isa = PBXBuildFile; fileRef = C752564A28B44392AEE16BD5 /* Roboto-Medium.ttf */; };
 		F0C672CC75F549ABBA1CF52A /* MaterialIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = F562CA6B28AA4A67AA29B61C /* MaterialIcons.ttf */; };
+		F28A5A2E8839405D98BA5D91 /* FontAwesome5_Brands.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 57C103F40F394637B5A886FC /* FontAwesome5_Brands.ttf */; };
 		F34655B90A524BB3B87EAB00 /* SimpleLineIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 4444176409EB42CB93AB03C5 /* SimpleLineIcons.ttf */; };
 		F5C5F10C32974C2D94FEA3F3 /* EvilIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = BF485CDA047B4D52852B87F5 /* EvilIcons.ttf */; };
 		F719B7ED64E3484FB94EE77B /* Foundation.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 42C6DDE3B80F47AFA9C9D4F5 /* Foundation.ttf */; };
 		FD9BDCD5059C483EAE9C0160 /* libRNVectorIcons.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 70BCC86172F14AB2BF4DDA97 /* libRNVectorIcons.a */; };
-		F28A5A2E8839405D98BA5D91 /* FontAwesome5_Brands.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 57C103F40F394637B5A886FC /* FontAwesome5_Brands.ttf */; };
-		DF4F8A5FCCCD40749BDD2E61 /* FontAwesome5_Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = EBC2B6371CD846D28B9FAADF /* FontAwesome5_Regular.ttf */; };
-		9AC52F22A86F4412BDE0EE7B /* FontAwesome5_Solid.ttf in Resources */ = {isa = PBXBuildFile; fileRef = A98DB430A7DA47EFB97EDF8B /* FontAwesome5_Solid.ttf */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -668,6 +669,7 @@
 		500343D7D81046209C481A89 /* RNRandomBytes.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNRandomBytes.xcodeproj; path = "../node_modules/react-native-randombytes/RNRandomBytes.xcodeproj"; sourceTree = "<group>"; };
 		520898DD99AF4BABB996F00E /* RNKeychain.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNKeychain.xcodeproj; path = "../node_modules/react-native-keychain/RNKeychain.xcodeproj"; sourceTree = "<group>"; };
 		52F790B15AC44E6189F7E6D2 /* libRNI18n-tvOS.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = "libRNI18n-tvOS.a"; sourceTree = "<group>"; };
+		57C103F40F394637B5A886FC /* FontAwesome5_Brands.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = FontAwesome5_Brands.ttf; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Brands.ttf"; sourceTree = "<group>"; };
 		5D7956F8525C4A45A2A555C3 /* Roboto-Italic.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Roboto-Italic.ttf"; path = "../app/fonts/Roboto-Italic.ttf"; sourceTree = "<group>"; };
 		5E32A09A7BDC431FA403BA73 /* FontAwesome.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = FontAwesome.ttf; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome.ttf"; sourceTree = "<group>"; };
 		5E91572D1DD0AC6500FF2AA8 /* RCTAnimation.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTAnimation.xcodeproj; path = "../node_modules/react-native/Libraries/NativeAnimation/RCTAnimation.xcodeproj"; sourceTree = "<group>"; };
@@ -692,6 +694,7 @@
 		A0BF502ED6414A349ED12B36 /* RNCamera.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNCamera.xcodeproj; path = "../node_modules/react-native-camera/ios/RNCamera.xcodeproj"; sourceTree = "<group>"; };
 		A498EA4CD2F8488DB666B94C /* Entypo.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Entypo.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Entypo.ttf"; sourceTree = "<group>"; };
 		A783D1CD7D27456796FE2E1B /* Roboto-Bold.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Roboto-Bold.ttf"; path = "../app/fonts/Roboto-Bold.ttf"; sourceTree = "<group>"; };
+		A98DB430A7DA47EFB97EDF8B /* FontAwesome5_Solid.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = FontAwesome5_Solid.ttf; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Solid.ttf"; sourceTree = "<group>"; };
 		AD8264BE4AF541519D268411 /* libreact-native-branch.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = "libreact-native-branch.a"; sourceTree = "<group>"; };
 		ADBDB91F1DFEBF0600ED6528 /* RCTBlob.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTBlob.xcodeproj; path = "../node_modules/react-native/Libraries/Blob/RCTBlob.xcodeproj"; sourceTree = "<group>"; };
 		B5FBB03E6A864791BD8CF6C2 /* RCTAes.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RCTAes.xcodeproj; path = "../node_modules/react-native-aes-crypto/ios/RCTAes.xcodeproj"; sourceTree = "<group>"; };
@@ -712,13 +715,11 @@
 		E020F42F788744B3BCE17F05 /* Roboto-LightItalic.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Roboto-LightItalic.ttf"; path = "../app/fonts/Roboto-LightItalic.ttf"; sourceTree = "<group>"; };
 		E34F71B40BF74968A8800F3A /* RNVectorIcons.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNVectorIcons.xcodeproj; path = "../node_modules/react-native-vector-icons/RNVectorIcons.xcodeproj"; sourceTree = "<group>"; };
 		E9629905BA1940ADA4189921 /* Feather.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Feather.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Feather.ttf"; sourceTree = "<group>"; };
+		EBC2B6371CD846D28B9FAADF /* FontAwesome5_Regular.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = FontAwesome5_Regular.ttf; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Regular.ttf"; sourceTree = "<group>"; };
 		F42ED3125EBF460CA78D606A /* RNWeb3Webview.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNWeb3Webview.xcodeproj; path = "../node_modules/react-native-web3-webview/ios/RNWeb3Webview.xcodeproj"; sourceTree = "<group>"; };
 		F562CA6B28AA4A67AA29B61C /* MaterialIcons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = MaterialIcons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/MaterialIcons.ttf"; sourceTree = "<group>"; };
 		F9DFF7AC557B46B6BEFAA1C1 /* libRNShakeEvent.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNShakeEvent.a; sourceTree = "<group>"; };
 		FE3C9A2458A1416290DEDAD4 /* branch.json */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = branch.json; path = ../branch.json; sourceTree = "<group>"; };
-		57C103F40F394637B5A886FC /* FontAwesome5_Brands.ttf */ = {isa = PBXFileReference; name = "FontAwesome5_Brands.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Brands.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
-		EBC2B6371CD846D28B9FAADF /* FontAwesome5_Regular.ttf */ = {isa = PBXFileReference; name = "FontAwesome5_Regular.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Regular.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
-		A98DB430A7DA47EFB97EDF8B /* FontAwesome5_Solid.ttf */ = {isa = PBXFileReference; name = "FontAwesome5_Solid.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Solid.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */

diff --git a/ios/MetaMask/Info.plist b/ios/MetaMask/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.1.7</string>
+	<string>0.1.8</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -70,7 +70,7 @@
 	<key>NSFaceIDUsageDescription</key>
 	<string>$(PRODUCT_NAME) needs to authenticate</string>
 	<key>NSLocationWhenInUseUsageDescription</key>
-	<string/>
+	<string></string>
 	<key>UIAppFonts</key>
 	<array>
 		<string>Entypo.ttf</string>