From 9e69e39b2c5d566588e4cd2418a2e5f0815a547e Mon Sep 17 00:00:00 2001 From: Raphael Randschau Date: Thu, 14 Sep 2023 10:59:08 -0700 Subject: [PATCH 1/4] update Stripe cocoapod dependency fixes issues compiling under XCode 11.4, see https://stackoverflow.com/questions/60841771/stripe-ios-sdk-incompatible-block-pointer-types-sending for reference --- ios/Podfile.lock | 10 +++++----- ios/RocketRides.xcodeproj/project.pbxproj | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 806b6d1..20039dc 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -1,9 +1,9 @@ PODS: - Alamofire (4.9.1) - - Stripe (18.2.0) + - Stripe (19.4.1) DEPENDENCIES: - - Alamofire + - Alamofire (~> 4) - Stripe SPEC REPOS: @@ -13,8 +13,8 @@ SPEC REPOS: SPEC CHECKSUMS: Alamofire: 85e8a02c69d6020a0d734f6054870d7ecb75cf18 - Stripe: a468d5f39703807e840fdfed39572ffad0aaf053 + Stripe: 5914399ac5878056b985d56b409cb4bb1e7fc7e8 -PODFILE CHECKSUM: df01c2ba3d529638d327c083cdf54b9821b82a0c +PODFILE CHECKSUM: d4b967991b9cdc57a63d72f7bc5231f5aea5a175 -COCOAPODS: 1.8.4 +COCOAPODS: 1.12.1 diff --git a/ios/RocketRides.xcodeproj/project.pbxproj b/ios/RocketRides.xcodeproj/project.pbxproj index 924adbc..2513ef2 100644 --- a/ios/RocketRides.xcodeproj/project.pbxproj +++ b/ios/RocketRides.xcodeproj/project.pbxproj @@ -410,6 +410,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 10.0; MTL_ENABLE_DEBUG_INFO = NO; + ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; SWIFT_VERSION = 3.0; From a8bd2b34e10b0c10f4365f2be62298a7653331bc Mon Sep 17 00:00:00 2001 From: Raphael Randschau Date: Thu, 14 Sep 2023 10:59:50 -0700 Subject: [PATCH 2/4] only compile for active architecture on iOS simulator fixes issues where on arm64 (M1 laptop) the compilation fails because it also tries to build x86_64 --- ios/Podfile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ios/Podfile b/ios/Podfile index 9474aeb..e5805cb 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -6,3 +6,9 @@ target 'RocketRides' do pod 'Alamofire', '~> 4' pod 'Stripe' end + +post_install do |installer| + installer.pods_project.build_configurations.each do |config| + config.build_settings["EXCLUDED_ARCHS[sdk=iphonesimulator*]"] = "arm64" + end +end From 7bc1296115488de280ae41cfb2551a0827d42ad8 Mon Sep 17 00:00:00 2001 From: Raphael Randschau Date: Tue, 19 Sep 2023 09:00:27 -0700 Subject: [PATCH 3/4] remove hardcoded arm64 architecture `uname -m` will return x86_64 on intel laptops and arm64 on M1 laptops --- ios/Podfile | 2 +- ios/Podfile.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ios/Podfile b/ios/Podfile index e5805cb..bde38f3 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -9,6 +9,6 @@ end post_install do |installer| installer.pods_project.build_configurations.each do |config| - config.build_settings["EXCLUDED_ARCHS[sdk=iphonesimulator*]"] = "arm64" + config.build_settings["EXCLUDED_ARCHS[sdk=iphonesimulator*]"] = %x[uname -m].strip end end diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 20039dc..e8b1919 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -15,6 +15,6 @@ SPEC CHECKSUMS: Alamofire: 85e8a02c69d6020a0d734f6054870d7ecb75cf18 Stripe: 5914399ac5878056b985d56b409cb4bb1e7fc7e8 -PODFILE CHECKSUM: d4b967991b9cdc57a63d72f7bc5231f5aea5a175 +PODFILE CHECKSUM: 365bd17cd9e33f31385f679652b94d01f62a7f2a COCOAPODS: 1.12.1 From 7a1948ec323cfb8dfaaa33bdb83428b97f44ceb5 Mon Sep 17 00:00:00 2001 From: Raphael Randschau Date: Tue, 19 Sep 2023 09:27:01 -0700 Subject: [PATCH 4/4] Revert "remove hardcoded arm64 architecture" This reverts commit 7bc1296115488de280ae41cfb2551a0827d42ad8. newer iphones run arm64 as well, so that hardcoding is actually required to make compilation pass on intel laptops --- ios/Podfile | 2 +- ios/Podfile.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ios/Podfile b/ios/Podfile index bde38f3..e5805cb 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -9,6 +9,6 @@ end post_install do |installer| installer.pods_project.build_configurations.each do |config| - config.build_settings["EXCLUDED_ARCHS[sdk=iphonesimulator*]"] = %x[uname -m].strip + config.build_settings["EXCLUDED_ARCHS[sdk=iphonesimulator*]"] = "arm64" end end diff --git a/ios/Podfile.lock b/ios/Podfile.lock index e8b1919..20039dc 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -15,6 +15,6 @@ SPEC CHECKSUMS: Alamofire: 85e8a02c69d6020a0d734f6054870d7ecb75cf18 Stripe: 5914399ac5878056b985d56b409cb4bb1e7fc7e8 -PODFILE CHECKSUM: 365bd17cd9e33f31385f679652b94d01f62a7f2a +PODFILE CHECKSUM: d4b967991b9cdc57a63d72f7bc5231f5aea5a175 COCOAPODS: 1.12.1