Skip to content

Commit 8a2cc53

Browse files
ehab-al-ckoehab-al-cko
committed
Fix some old issues
1 parent 22ba0ab commit 8a2cc53

File tree

11 files changed

+49
-40
lines changed

11 files changed

+49
-40
lines changed

‎.github/workflows/run-regression-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
run-regression-tests:
1515
if: (github.event_name == 'workflow_dispatch') || (contains(github.event.pull_request.labels.*.name, 'Run Regression Tests'))
1616
name: Run Regression Tests
17-
runs-on: macos-15-xl
17+
runs-on: macos-15-xlarge
1818

1919
steps:
2020
- name: Checkout

‎.github/workflows/validate-for-app-store.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
if: (github.event_name == 'workflow_dispatch') || contains(github.event.pull_request.labels.*.name, 'Validate For App Store')
1616
name: Validate For App Store
1717
environment: AppStoreValidation
18-
runs-on: macos-latest
18+
runs-on: macos-15-xlarge
1919

2020
steps:
2121
- name: Checkout repository

‎Checkout.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Pod::Spec.new do |s|
1313
s.author = { "Checkout.com Integration" => "[email protected]" }
1414
s.source = { :git => "https://github.com/checkout/frames-ios.git", :tag => s.version }
1515

16-
s.ios.deployment_target = '12.0'
16+
s.ios.deployment_target = '13.0'
1717
s.swift_version = "5.7"
1818

1919
s.source_files = 'Checkout/Source/**/*.swift'

‎Frames.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Pod::Spec.new do |s|
1010
s.swift_version = "5.0"
1111
s.license = "MIT"
1212
s.author = { "Checkout.com Integration" => "[email protected]" }
13-
s.platform = :ios, "12.0"
13+
s.platform = :ios, "13.0"
1414
s.source = { :git => "https://github.com/checkout/frames-ios.git", :tag => s.version }
1515

1616
s.source_files = 'Source/**/*.swift'

‎Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ let package = Package(
66
defaultLocalization: "en",
77
platforms: [
88
.macOS(.v10_12),
9-
.iOS(.v12)
9+
.iOS(.v13)
1010
],
1111
products: [
1212
.library(

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
## Requirements
1414

15-
- iOS 12.0+
15+
- iOS 13.0+
1616
- Xcode 12.4+
1717
- Swift 5.3+
1818

‎Source/UI/PaymentForm/ViewModel/DefaultPaymentViewModel.swift

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,9 @@ extension DefaultPaymentViewModel: PaymentViewControllerDelegate {
182182
checkoutAPIService.createToken(.card(card)) { [weak self] result in
183183
self?.logTokenResult(result)
184184
self?.isLoading = false
185-
self?.cardTokenRequested?(result)
185+
DispatchQueue.main.async { [weak self] in
186+
self?.cardTokenRequested?(result)
187+
}
186188
}
187189
}
188190

‎iOS Example Frame SPM/iOS Example Frame SPM.xcodeproj/project.pbxproj

Lines changed: 32 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
16900D442AE6BA38009A7CE9 /* SecurityCodeComponentUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 16900D432AE6BA38009A7CE9 /* SecurityCodeComponentUITests.swift */; };
3535
16900D702AEAD30D009A7CE9 /* XCUIElement+TestHelpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 16900D6F2AEAD30D009A7CE9 /* XCUIElement+TestHelpers.swift */; };
3636
169DF1482A7BFB1B00891DF0 /* CardSchemeFormatSnapshotTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 169DF1472A7BFB1B00891DF0 /* CardSchemeFormatSnapshotTests.swift */; };
37-
16BA563F2B8FA6CE000775F9 /* Frames in Frameworks */ = {isa = PBXBuildFile; productRef = 16BA563E2B8FA6CE000775F9 /* Frames */; };
3837
16C3F8402A7927ED00690639 /* SnapshotTesting in Frameworks */ = {isa = PBXBuildFile; productRef = 16C3F83F2A7927ED00690639 /* SnapshotTesting */; };
3938
16C3F8422A7956EA00690639 /* CardValidationSnapshotTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 16C3F8412A7956EA00690639 /* CardValidationSnapshotTests.swift */; };
4039
16E0AD482A8455F0003C9DDC /* Helper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 16E0AD472A8455F0003C9DDC /* Helper.swift */; };
@@ -43,7 +42,9 @@
4342
16E91A432A7042AD00DC0D98 /* CardValidationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 16E91A422A7042AD00DC0D98 /* CardValidationTests.swift */; };
4443
16E91A452A70453B00DC0D98 /* TestCard.swift in Sources */ = {isa = PBXBuildFile; fileRef = 16E91A442A70453B00DC0D98 /* TestCard.swift */; };
4544
16E91A482A704AC300DC0D98 /* StaticTexts.swift in Sources */ = {isa = PBXBuildFile; fileRef = 16E91A472A704AC300DC0D98 /* StaticTexts.swift */; };
45+
950F88612DE74DAB0041D2E7 /* Frames in Frameworks */ = {isa = PBXBuildFile; productRef = 950F88602DE74DAB0041D2E7 /* Frames */; };
4646
955B092B291CEF0F00DEEAF5 /* ApplePayCreator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 955B092A291CEF0F00DEEAF5 /* ApplePayCreator.swift */; };
47+
958E51052DE74B3E0003F4B0 /* Frames in Frameworks */ = {isa = PBXBuildFile; productRef = 958E51042DE74B3E0003F4B0 /* Frames */; };
4748
95C8C10D28AD5FEE00B8D3D0 /* UIViewControllerExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95C8C0B528AD5FEE00B8D3D0 /* UIViewControllerExtension.swift */; };
4849
95C8C10E28AD5FEE00B8D3D0 /* UIViewExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95C8C0B628AD5FEE00B8D3D0 /* UIViewExtension.swift */; };
4950
95C8C10F28AD5FEE00B8D3D0 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95C8C0B728AD5FEE00B8D3D0 /* AppDelegate.swift */; };
@@ -228,8 +229,9 @@
228229
isa = PBXFrameworksBuildPhase;
229230
buildActionMask = 2147483647;
230231
files = (
231-
16BA563F2B8FA6CE000775F9 /* Frames in Frameworks */,
232+
958E51052DE74B3E0003F4B0 /* Frames in Frameworks */,
232233
1629C08C2AF90379001BD3D9 /* Frames in Frameworks */,
234+
950F88612DE74DAB0041D2E7 /* Frames in Frameworks */,
233235
);
234236
runOnlyForDeploymentPostprocessing = 0;
235237
};
@@ -531,7 +533,8 @@
531533
name = "iOS Example Frame";
532534
packageProductDependencies = (
533535
1629C08B2AF90379001BD3D9 /* Frames */,
534-
16BA563E2B8FA6CE000775F9 /* Frames */,
536+
958E51042DE74B3E0003F4B0 /* Frames */,
537+
950F88602DE74DAB0041D2E7 /* Frames */,
535538
);
536539
productName = "iOS Example Frame";
537540
productReference = 16AE74C32A5C1EBB0031F794 /* iOS Example Frame.app */;
@@ -580,7 +583,7 @@
580583
mainGroup = E6646F8120CE6C0900D8353A;
581584
packageReferences = (
582585
16C3F83E2A7927ED00690639 /* XCRemoteSwiftPackageReference "swift-snapshot-testing" */,
583-
16BA563D2B8FA6CE000775F9 /* XCRemoteSwiftPackageReference "frames-ios" */,
586+
950F885F2DE74DAB0041D2E7 /* XCRemoteSwiftPackageReference "frames-ios" */,
584587
);
585588
productRefGroup = E6646F8120CE6C0900D8353A;
586589
projectDirPath = "";
@@ -853,7 +856,7 @@
853856
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = E32XBQK4Q5;
854857
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386;
855858
INFOPLIST_FILE = "../iOS Example Frame/iOS Example Frame/Info.plist";
856-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
859+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
857860
LD_RUNPATH_SEARCH_PATHS = (
858861
"$(inherited)",
859862
"@executable_path/Frameworks",
@@ -878,7 +881,7 @@
878881
CODE_SIGN_STYLE = Automatic;
879882
CURRENT_PROJECT_VERSION = 1;
880883
GENERATE_INFOPLIST_FILE = YES;
881-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
884+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
882885
MARKETING_VERSION = 1.0;
883886
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
884887
MTL_FAST_MATH = YES;
@@ -903,7 +906,7 @@
903906
CURRENT_PROJECT_VERSION = 1;
904907
DEVELOPMENT_TEAM = E32XBQK4Q5;
905908
GENERATE_INFOPLIST_FILE = YES;
906-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
909+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
907910
MARKETING_VERSION = 1.0;
908911
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
909912
MTL_FAST_MATH = YES;
@@ -927,7 +930,7 @@
927930
CURRENT_PROJECT_VERSION = 1;
928931
DEVELOPMENT_TEAM = E32XBQK4Q5;
929932
GENERATE_INFOPLIST_FILE = YES;
930-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
933+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
931934
MARKETING_VERSION = 1.0;
932935
MTL_FAST_MATH = YES;
933936
PRODUCT_BUNDLE_IDENTIFIER = "com.checkout.iOS-Example-Frame-Regression-Tests";
@@ -950,7 +953,7 @@
950953
CURRENT_PROJECT_VERSION = 1;
951954
DEVELOPMENT_TEAM = E32XBQK4Q5;
952955
GENERATE_INFOPLIST_FILE = YES;
953-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
956+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
954957
MARKETING_VERSION = 1.0;
955958
MTL_FAST_MATH = YES;
956959
PRODUCT_BUNDLE_IDENTIFIER = "com.checkout.iOS-Example-Frame-Regression-Tests";
@@ -973,7 +976,7 @@
973976
CODE_SIGN_STYLE = Automatic;
974977
CURRENT_PROJECT_VERSION = 1;
975978
GENERATE_INFOPLIST_FILE = YES;
976-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
979+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
977980
MARKETING_VERSION = 1.0;
978981
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
979982
MTL_FAST_MATH = YES;
@@ -998,7 +1001,7 @@
9981001
CODE_SIGN_STYLE = Automatic;
9991002
CURRENT_PROJECT_VERSION = 1;
10001003
GENERATE_INFOPLIST_FILE = YES;
1001-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
1004+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
10021005
MARKETING_VERSION = 1.0;
10031006
MTL_FAST_MATH = YES;
10041007
PRODUCT_BUNDLE_IDENTIFIER = "cko.iOS-Example-FrameUITests";
@@ -1143,7 +1146,7 @@
11431146
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = E32XBQK4Q5;
11441147
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386;
11451148
INFOPLIST_FILE = "../iOS Example Frame/iOS Example Frame/Info.plist";
1146-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
1149+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
11471150
LD_RUNPATH_SEARCH_PATHS = (
11481151
"$(inherited)",
11491152
"@executable_path/Frameworks",
@@ -1171,7 +1174,7 @@
11711174
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = E32XBQK4Q5;
11721175
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386;
11731176
INFOPLIST_FILE = "../iOS Example Frame/iOS Example Frame/Info.plist";
1174-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
1177+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
11751178
LD_RUNPATH_SEARCH_PATHS = (
11761179
"$(inherited)",
11771180
"@executable_path/Frameworks",
@@ -1234,20 +1237,20 @@
12341237
/* End XCConfigurationList section */
12351238

12361239
/* Begin XCRemoteSwiftPackageReference section */
1237-
16BA563D2B8FA6CE000775F9 /* XCRemoteSwiftPackageReference "frames-ios" */ = {
1240+
16C3F83E2A7927ED00690639 /* XCRemoteSwiftPackageReference "swift-snapshot-testing" */ = {
12381241
isa = XCRemoteSwiftPackageReference;
1239-
repositoryURL = "https://github.com/checkout/frames-ios";
1242+
repositoryURL = "https://github.com/pointfreeco/swift-snapshot-testing";
12401243
requirement = {
12411244
kind = exactVersion;
1242-
version = 4.3.7;
1245+
version = 1.12.0;
12431246
};
12441247
};
1245-
16C3F83E2A7927ED00690639 /* XCRemoteSwiftPackageReference "swift-snapshot-testing" */ = {
1248+
950F885F2DE74DAB0041D2E7 /* XCRemoteSwiftPackageReference "frames-ios" */ = {
12461249
isa = XCRemoteSwiftPackageReference;
1247-
repositoryURL = "https://github.com/pointfreeco/swift-snapshot-testing";
1250+
repositoryURL = "https://github.com/checkout/frames-ios";
12481251
requirement = {
1249-
kind = exactVersion;
1250-
version = 1.12.0;
1252+
branch = update/spm_dependacies;
1253+
kind = branch;
12511254
};
12521255
};
12531256
/* End XCRemoteSwiftPackageReference section */
@@ -1265,16 +1268,20 @@
12651268
isa = XCSwiftPackageProductDependency;
12661269
productName = Frames;
12671270
};
1268-
16BA563E2B8FA6CE000775F9 /* Frames */ = {
1269-
isa = XCSwiftPackageProductDependency;
1270-
package = 16BA563D2B8FA6CE000775F9 /* XCRemoteSwiftPackageReference "frames-ios" */;
1271-
productName = Frames;
1272-
};
12731271
16C3F83F2A7927ED00690639 /* SnapshotTesting */ = {
12741272
isa = XCSwiftPackageProductDependency;
12751273
package = 16C3F83E2A7927ED00690639 /* XCRemoteSwiftPackageReference "swift-snapshot-testing" */;
12761274
productName = SnapshotTesting;
12771275
};
1276+
950F88602DE74DAB0041D2E7 /* Frames */ = {
1277+
isa = XCSwiftPackageProductDependency;
1278+
package = 950F885F2DE74DAB0041D2E7 /* XCRemoteSwiftPackageReference "frames-ios" */;
1279+
productName = Frames;
1280+
};
1281+
958E51042DE74B3E0003F4B0 /* Frames */ = {
1282+
isa = XCSwiftPackageProductDependency;
1283+
productName = Frames;
1284+
};
12781285
/* End XCSwiftPackageProductDependency section */
12791286
};
12801287
rootObject = E6646F8220CE6C0900D8353A /* Project object */;

‎iOS Example Frame/Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Uncomment the next line to define a global platform for your project
2-
platform :ios, '12.0'
2+
platform :ios, '13.0'
33

44
target 'iOS Example Frame' do
55
# Comment the next line if you don't want to use dynamic frameworks

‎iOS Example Frame/Podfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ EXTERNAL SOURCES:
3737

3838
CHECKOUT OPTIONS:
3939
Frames:
40-
:commit: abd8ac5eef5d4cef14edf27f510b3822f88ba6b8
40+
:commit: 22ba0ab903c3c93c8fa7751fef1434e4497d1c6c
4141
:git: https://github.com/checkout/frames-ios.git
4242

4343
SPEC CHECKSUMS:
@@ -48,6 +48,6 @@ SPEC CHECKSUMS:
4848
PhoneNumberKit: a74155066daa6450475f6a029068eb919fb00d5d
4949
Risk: a0732fef94dfddfa76ca70dbe0e5fe0f05557ec1
5050

51-
PODFILE CHECKSUM: ace7c2297222b685e25c13409c9256bb81439883
51+
PODFILE CHECKSUM: fd9165f567ac3a0a1e4318b9754bbf378aa18ac1
5252

5353
COCOAPODS: 1.16.2

‎iOS Example Frame/iOS Example Frame.xcodeproj/project.pbxproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 53;
6+
objectVersion = 54;
77
objects = {
88

99
/* Begin PBXBuildFile section */
@@ -648,7 +648,7 @@
648648
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
649649
GCC_WARN_UNUSED_FUNCTION = YES;
650650
GCC_WARN_UNUSED_VARIABLE = YES;
651-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
651+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
652652
MTL_ENABLE_DEBUG_INFO = YES;
653653
ONLY_ACTIVE_ARCH = YES;
654654
SDKROOT = iphoneos;
@@ -704,7 +704,7 @@
704704
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
705705
GCC_WARN_UNUSED_FUNCTION = YES;
706706
GCC_WARN_UNUSED_VARIABLE = YES;
707-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
707+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
708708
MTL_ENABLE_DEBUG_INFO = NO;
709709
SDKROOT = iphoneos;
710710
SWIFT_COMPILATION_MODE = wholemodule;
@@ -723,7 +723,7 @@
723723
DEVELOPMENT_TEAM = E32XBQK4Q5;
724724
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386;
725725
INFOPLIST_FILE = "iOS Example Frame/Info.plist";
726-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
726+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
727727
LD_RUNPATH_SEARCH_PATHS = (
728728
"$(inherited)",
729729
"@executable_path/Frameworks",
@@ -746,7 +746,7 @@
746746
DEVELOPMENT_TEAM = E32XBQK4Q5;
747747
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386;
748748
INFOPLIST_FILE = "iOS Example Frame/Info.plist";
749-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
749+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
750750
LD_RUNPATH_SEARCH_PATHS = (
751751
"$(inherited)",
752752
"@executable_path/Frameworks",

0 commit comments

Comments
 (0)