From 2cbc84788b0d6452d44881670bda4107cc46441a Mon Sep 17 00:00:00 2001 From: Drew Riffle Date: Mon, 14 Nov 2022 09:48:18 -0500 Subject: [PATCH 1/2] Minor fixes for running in iOS --- ios/Podfile | 13 ++++++++++++- ios/Podfile.lock | 2 +- package.json | 1 + yarn.lock | 5 +++++ 4 files changed, 19 insertions(+), 2 deletions(-) diff --git a/ios/Podfile b/ios/Podfile index f79989f24..2cdad9458 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -32,7 +32,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/ios/Podfile.lock b/ios/Podfile.lock index ce82bc1ee..4b84ff04c 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -964,6 +964,6 @@ SPEC CHECKSUMS: Yoga: d6b6a80659aa3e91aaba01d0012e7edcbedcbecd YogaKit: f782866e155069a2cca2517aafea43200b01fd5a -PODFILE CHECKSUM: 41ceffffc9d980905088ee2d58794d4bf9ec0876 +PODFILE CHECKSUM: 3248a260d69e1c304574a9ae50be35142b5cdfdd COCOAPODS: 1.11.3 diff --git a/package.json b/package.json index 885a8d796..29db237c9 100644 --- a/package.json +++ b/package.json @@ -70,6 +70,7 @@ "https-browserify": "1.0.0", "i18next": "21.6.4", "intl": "1.2.5", + "ios-deploy": "^1.11.4", "lodash.clonedeep": "4.5.0", "lodash.debounce": "4.0.8", "lodash.isequal": "4.5.0", diff --git a/yarn.lock b/yarn.lock index ebb464c55..1365a254c 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" From c5d7a7336634b8fea508929ca4b3f29c4f200283 Mon Sep 17 00:00:00 2001 From: Drew Riffle Date: Sat, 19 Nov 2022 11:06:38 -0500 Subject: [PATCH 2/2] Moved ios-deploy to devDependencies --- ios/BitPayApp.xcodeproj/project.pbxproj | 22 ++++++++++++---------- package.json | 2 +- 2 files changed, 13 insertions(+), 11 deletions(-) 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/package.json b/package.json index 29db237c9..8230094a0 100644 --- a/package.json +++ b/package.json @@ -70,7 +70,6 @@ "https-browserify": "1.0.0", "i18next": "21.6.4", "intl": "1.2.5", - "ios-deploy": "^1.11.4", "lodash.clonedeep": "4.5.0", "lodash.debounce": "4.0.8", "lodash.isequal": "4.5.0", @@ -191,6 +190,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",