Unverified Commit 00528910 authored by Tarik Gul's avatar Tarik Gul Committed by GitHub

fix: rebuild iOS structure to build in master (#725)

* fix: QRcode not showing up

* fix: cleanup installing flipper pods

* fix: testing

* fix: autolink error

* fix: exclude arm64 arch from build

* fix: update react-native and @types

* fix: sanity-check re-build

* fix: types for react-native

* fix: detox testing(16.xx.x all uncompatible with xcode 12, iOS 14.4)
parent a1e019ad
Pipeline #124755 failed with stages
in 2 minutes and 42 seconds
This diff is collapsed.
platform :ios, '9.0'
platform :ios, '10.0'
require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'
require_relative '../node_modules/react-native/scripts/react_native_pods'
def add_flipper_pods!(versions = {})
versions['Flipper'] ||= '~> 0.37.0'
......@@ -39,6 +40,9 @@ def flipper_post_install(installer)
end
end
end
installer.pods_project.build_configurations.each do |config|
config.build_settings["EXCLUDED_ARCHS[sdk=iphonesimulator*]"] = "arm64"
end
file_name = Dir.glob("*.xcodeproj")[0]
app_project = Xcodeproj::Project.open(file_name)
app_project.native_targets.each do |target|
......@@ -80,14 +84,13 @@ target 'NativeSigner' do
pod 'React-jsi', :path => '../node_modules/react-native/ReactCommon/jsi'
pod 'React-jsiexecutor', :path => '../node_modules/react-native/ReactCommon/jsiexecutor'
pod 'React-jsinspector', :path => '../node_modules/react-native/ReactCommon/jsinspector'
pod 'ReactCommon/callinvoker', :path => "../node_modules/react-native/ReactCommon"
pod 'React-callinvoker', :path => "../node_modules/react-native/ReactCommon/callinvoker"
pod 'ReactCommon/turbomodule/core', :path => "../node_modules/react-native/ReactCommon"
pod 'DoubleConversion', :podspec => '../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec'
pod 'glog', :podspec => '../node_modules/react-native/third-party-podspecs/glog.podspec'
pod 'Folly', :podspec => '../node_modules/react-native/third-party-podspecs/Folly.podspec'
pod 'Yoga', :path => '../node_modules/react-native/ReactCommon/yoga', :modular_headers => true
pod 'RNVectorIcons', :path => '../node_modules/react-native-vector-icons'
target 'NativeSignerTests' do
inherit! :complete
......@@ -99,7 +102,7 @@ target 'NativeSigner' do
#
# Note that if you have use_frameworks! enabled, Flipper will not work and
# you should disable these next few lines.
add_flipper_pods!
add_flipper_pods!({ 'Flipper-Folly' => '2.3.0' })
post_install do |installer|
flipper_post_install(installer)
end
......
This diff is collapsed.
......@@ -17,7 +17,7 @@
import '../shim';
import 'utils/iconLoader';
import * as React from 'react';
import { StatusBar, StyleSheet, View, YellowBox } from 'react-native';
import { StatusBar, StyleSheet, View, LogBox } from 'react-native';
import { NavigationContainer } from '@react-navigation/native';
import { MenuProvider } from 'react-native-popup-menu';
import { SafeAreaProvider } from 'react-native-safe-area-context';
......@@ -50,7 +50,7 @@ export default function App(props: AppProps): React.ReactElement {
if (global.inTest) {
console.disableYellowBox = true;
} else if (__DEV__) {
YellowBox.ignoreWarnings([
LogBox.ignoreLogs([
'Warning: componentWillReceiveProps',
'Warning: componentWillMount',
'Warning: componentWillUpdate',
......
......@@ -77,7 +77,8 @@
},
"include": [
"test/**/*",
"src/**/*"
"src/**/*",
"jest.config.js"
],
"exclude": [
"./node_modules",
......
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment