diff --git a/ios/BitPayApp.xcodeproj/project.pbxproj b/ios/BitPayApp.xcodeproj/project.pbxproj index 88c7b328e..4568de0a2 100644 --- a/ios/BitPayApp.xcodeproj/project.pbxproj +++ b/ios/BitPayApp.xcodeproj/project.pbxproj @@ -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", @@ -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", @@ -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", @@ -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; @@ -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", @@ -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"; diff --git a/ios/Podfile b/ios/Podfile index 8a15539f3..cd3dd8380 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -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 \ No newline at end of file diff --git a/package.json b/package.json index 461336483..f6e22d4eb 100644 --- a/package.json +++ b/package.json @@ -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", diff --git a/yarn.lock b/yarn.lock index ff7740d6b..b9d30bbd6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -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"