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

Minor fixes for running in iOS #550

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Minor fixes for running in iOS #550

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2cbc847
Minor fixes for running in iOS
drewriffle Nov 14, 2022
c5d7a73
Moved ios-deploy to devDependencies
drewriffle Nov 19, 2022
2bbd51b
Updates lock files
drewriffle Nov 26, 2022
8375cd2
Merge remote-tracking branch 'upstream/master'
drewriffle Jan 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
22 changes: 12 additions & 10 deletions ios/BitPayApp.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,7 +513,7 @@
"$(inherited)",
);
INFOPLIST_FILE = BitPayAppTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down Expand Up @@ -542,7 +542,7 @@
CLANG_ENABLE_MODULES = YES;
COPY_PHASE_STRIP = NO;
INFOPLIST_FILE = BitPayAppTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down Expand Up @@ -570,14 +570,14 @@
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = "${PROJECT_DIR}/${PROJECT_NAME}/BitPayApp${CONFIGURATION}.entitlements";
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = 884JRH5R93;
DEVELOPMENT_TEAM = "";
ENABLE_BITCODE = NO;
INFOPLIST_FILE = BitPayApp/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 14.4;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -590,7 +590,7 @@
);
PRODUCT_BUNDLE_IDENTIFIER = com.bitpay.wallet;
PRODUCT_NAME = BitPayApp;
PROVISIONING_PROFILE_SPECIFIER = "BitPay Development Profile (ApplePay)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OBJC_BRIDGING_HEADER = "BitPayApp-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 5.0;
Expand All @@ -607,11 +607,13 @@
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = BitPayApp/BitPayAppRelease.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = 884JRH5R93;
DEVELOPMENT_TEAM = "";
INFOPLIST_FILE = BitPayApp/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 14.4;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -624,7 +626,7 @@
);
PRODUCT_BUNDLE_IDENTIFIER = com.bitpay.wallet;
PRODUCT_NAME = BitPayApp;
PROVISIONING_PROFILE_SPECIFIER = "BitPay Development Profile (ApplePay)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OBJC_BRIDGING_HEADER = "BitPayApp-Bridging-Header.h";
SWIFT_VERSION = 5.0;
VERSIONING_SYSTEM = "apple-generic";
Expand Down
13 changes: 12 additions & 1 deletion ios/Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,18 @@ target 'BitPayApp' do
use_flipper!({'Flipper' => '0.162.0'})

post_install do |installer|
installer.pods_project.targets.each do |target|
target.build_configurations.each do |config|
config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '11.0'
config.build_settings['ONLY_ACTIVE_ARCH'] = 'NO'
end
if target.name == 'RCT-Folly'
target.build_configurations.each do |config|
config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '9.0'
end
end
react_native_post_install(installer)
flipper_post_install(installer)
end
end
end
end
1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,7 @@
"dotenv": "16.0.1",
"eslint": "7.32.0",
"i18next-parser": "5.4.0",
"ios-deploy": "^1.11.4",
"jest": "28.1.1",
"jest-cli": "^28.1.1",
"jest-styled-components": "^7.0.8",
Expand Down
5 changes: 5 additions & 0 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8037,6 +8037,11 @@ invariant@2.2.4, invariant@^2.2.3, invariant@^2.2.4:
dependencies:
loose-envify "^1.0.0"

ios-deploy@^1.11.4:
version "1.11.4"
resolved "https://registry.yarnpkg.com/ios-deploy/-/ios-deploy-1.11.4.tgz#d1813b11c9f292d757be33fa63399b510a64980a"
integrity sha512-NZ96/s7klyWySKTI8rTU+vXEIxIMrv6K+7j5VMcqUVShaAUdDX+Ov4nVdSStYOAGFVpl8q56SpAwjEDIvBrswQ==

ip@^1.1.5:
version "1.1.5"
resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a"
Expand Down