Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update iOS Builds #1258

Merged
merged 3 commits into from
Jan 6, 2020
Merged

Update iOS Builds #1258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
37c8e84
optimize ios build params
brunobar79 Jan 6, 2020
7c5f7e0
disable parallelize builds
brunobar79 Jan 6, 2020
381f301
fix simulator name
brunobar79 Jan 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ jobs:
yarn global add detox-cli
- run: echo $IOS_ENV | tr "|" "\n" > .ios.env
- run: detox clean-framework-cache && detox build-framework-cache
- run: detox build --configuration ios.sim.release && detox test --configuration ios.sim.release --cleanup
- run: detox build --configuration ios.sim.release && detox test --configuration ios.sim.release --cleanup --workers 2
upload-coverage:
<<: *defaults
docker:
Expand Down
11 changes: 11 additions & 0 deletions ios/MetaMask.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2483,16 +2483,19 @@
baseConfigurationReference = 15FDD82721B7642B006B7C35 /* debug.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_OPTIMIZATION = time;
CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMask.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1;
DEAD_CODE_STRIPPING = NO;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = 48XVW22RCG;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)",
);
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUG=1",
"$(inherited)",
Expand Down Expand Up @@ -2530,12 +2533,14 @@
"$(SRCROOT)/../node_modules/react-native-sensors/ios/**",
);
INFOPLIST_FILE = MetaMask/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"\"$(SRCROOT)/MetaMask/System/Library/Frameworks\"",
"\"$(SRCROOT)/MetaMask\"",
);
LLVM_LTO = YES;
MARKETING_VERSION = 0.2.13;
OTHER_LDFLAGS = (
"$(inherited)",
Expand All @@ -2554,16 +2559,20 @@
baseConfigurationReference = 15FDD86021B76461006B7C35 /* release.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_OPTIMIZATION = time;
CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMask.entitlements;
CODE_SIGN_IDENTITY = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = 48XVW22RCG;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)",
);
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREPROCESSOR_DEFINITIONS = "DISABLE_MIXPANEL_AB_DESIGNER=1";
GCC_UNROLL_LOOPS = YES;
HEADER_SEARCH_PATHS = (
"$(inherited)",
"$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager",
Expand Down Expand Up @@ -2597,12 +2606,14 @@
"$(SRCROOT)/../node_modules/react-native-sensors/ios/**",
);
INFOPLIST_FILE = MetaMask/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"\"$(SRCROOT)/MetaMask/System/Library/Frameworks\"",
"\"$(SRCROOT)/MetaMask\"",
);
LLVM_LTO = YES;
MARKETING_VERSION = 0.2.13;
OTHER_LDFLAGS = (
"$(inherited)",
Expand Down
8 changes: 2 additions & 6 deletions ios/MetaMask.xcodeproj/xcshareddata/xcschemes/MetaMask.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,6 @@
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
Expand All @@ -52,8 +50,8 @@
ReferencedContainer = "container:MetaMask.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
<Testables>
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
Expand All @@ -75,8 +73,6 @@
ReferencedContainer = "container:MetaMask.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
Expand Down
2 changes: 1 addition & 1 deletion scripts/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ buildAndroid(){

buildIosSimulator(){
prebuild_ios
react-native run-ios --simulator "iPhone 11 Pro (13.3)"
react-native run-ios --simulator "iPhone 11 Pro"
}

buildIosDevice(){
Expand Down