From c1082740a6601249fd2287eedad9223adcb89f9a Mon Sep 17 00:00:00 2001 From: Ehab Al Date: Tue, 3 Jun 2025 14:45:43 +0100 Subject: [PATCH 1/9] Update changelog (cherry picked from commit 0e36bc0628296584f92582ff7734a818d37a7279) --- .github/CHANGELOG.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md index 61bf5f9b..7fb9fd45 100644 --- a/.github/CHANGELOG.md +++ b/.github/CHANGELOG.md @@ -5,6 +5,16 @@ All notable changes to this project will be documented in this file. #### 4.x Releases +## [4.3.8](https://github.com/checkout/frames-ios/releases/tag/4.3.8) + +Released on 2025-06-03 + +Updates: + +- Update minimum version to iOS 13+ +- Update Risk SDK from min version 3.0.2 +- Update PhoneNumberKit from min version 4.0+ +- Fixed issues ## [4.3.7](https://github.com/checkout/frames-ios/releases/tag/4.3.7) From 235566212b5ec22b769f2d11dd75671533634a08 Mon Sep 17 00:00:00 2001 From: Ehab Al Date: Tue, 3 Jun 2025 14:48:33 +0100 Subject: [PATCH 2/9] bump version to 4.3.8 (cherry picked from commit f86f31c152ca1cb3d33bdd30ae0782e45db28140) --- Checkout.podspec | 2 +- Checkout/Samples/CocoapodsSample/Podfile | 2 +- Checkout/Source/Validation/Constants.swift | 2 +- Frames.podspec | 4 ++-- Source/Core/Constants/Constants.swift | 2 +- iOS Example Frame/Podfile.lock | 6 +++--- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Checkout.podspec b/Checkout.podspec index 9791ce24..0f67541a 100644 --- a/Checkout.podspec +++ b/Checkout.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'Checkout' - s.version = '4.3.7' + s.version = '4.3.8' s.summary = 'Checkout SDK for iOS' s.description = <<-DESC diff --git a/Checkout/Samples/CocoapodsSample/Podfile b/Checkout/Samples/CocoapodsSample/Podfile index 1aab611b..bf531c33 100644 --- a/Checkout/Samples/CocoapodsSample/Podfile +++ b/Checkout/Samples/CocoapodsSample/Podfile @@ -5,5 +5,5 @@ target 'CheckoutCocoapodsSample' do use_frameworks! # Pods for CheckoutSDKCocoapodsSample - pod 'Checkout', '4.3.7' + pod 'Checkout', '4.3.8' end diff --git a/Checkout/Source/Validation/Constants.swift b/Checkout/Source/Validation/Constants.swift index 6ea6dbf5..e5f676bf 100644 --- a/Checkout/Source/Validation/Constants.swift +++ b/Checkout/Source/Validation/Constants.swift @@ -25,7 +25,7 @@ public enum Constants { } enum Product { - static let version = "4.3.7" + static let version = "4.3.8" static let name = "checkout-ios-sdk" static let userAgent = "checkout-sdk-ios/\(version)" } diff --git a/Frames.podspec b/Frames.podspec index d701738f..d0010ab6 100644 --- a/Frames.podspec +++ b/Frames.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "Frames" - s.version = "4.3.7" + s.version = "4.3.8" s.summary = "Checkout API Client, Payment Form UI and Utilities in Swift" s.description = <<-DESC Checkout API Client and Payment Form Utilities in Swift. @@ -21,6 +21,6 @@ Pod::Spec.new do |s| s.dependency 'PhoneNumberKit', '~> 4.0' s.dependency 'CheckoutEventLoggerKit', '~> 1.2.4' - s.dependency 'Checkout', '4.3.7' + s.dependency 'Checkout', '4.3.8' end diff --git a/Source/Core/Constants/Constants.swift b/Source/Core/Constants/Constants.swift index 85e5a8f5..2c317b4f 100644 --- a/Source/Core/Constants/Constants.swift +++ b/Source/Core/Constants/Constants.swift @@ -8,7 +8,7 @@ enum Constants { static let productName = "frames-ios-sdk" - static let version = "4.3.7" + static let version = "4.3.8" static let userAgent = "checkout-sdk-frames-ios/\(version)" enum Logging { diff --git a/iOS Example Frame/Podfile.lock b/iOS Example Frame/Podfile.lock index a0fcf32a..3e7c2481 100644 --- a/iOS Example Frame/Podfile.lock +++ b/iOS Example Frame/Podfile.lock @@ -1,11 +1,11 @@ PODS: - - Checkout (4.3.7): + - Checkout (4.3.8): - CheckoutEventLoggerKit (~> 1.2.4) - Risk (= 3.0.2) - CheckoutEventLoggerKit (1.2.4) - FingerprintPro (2.2.0) - - Frames (4.3.7): - - Checkout (= 4.3.7) + - Frames (4.3.8): + - Checkout (= 4.3.8) - CheckoutEventLoggerKit (~> 1.2.4) - PhoneNumberKit (~> 4.0) - PhoneNumberKit (4.0.1): From 4cf6baf93fd1156da2623892ae2db6912b55329f Mon Sep 17 00:00:00 2001 From: Ehab Al Date: Tue, 3 Jun 2025 14:54:24 +0100 Subject: [PATCH 3/9] Update SPM (cherry picked from commit 047d57f6a26538a84fa1596c495a6c0f9bee2e3c) --- .../iOS Example Frame SPM.xcodeproj/project.pbxproj | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/iOS Example Frame SPM/iOS Example Frame SPM.xcodeproj/project.pbxproj b/iOS Example Frame SPM/iOS Example Frame SPM.xcodeproj/project.pbxproj index c17045e8..a8340de4 100644 --- a/iOS Example Frame SPM/iOS Example Frame SPM.xcodeproj/project.pbxproj +++ b/iOS Example Frame SPM/iOS Example Frame SPM.xcodeproj/project.pbxproj @@ -41,7 +41,6 @@ 16E91A432A7042AD00DC0D98 /* CardValidationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 16E91A422A7042AD00DC0D98 /* CardValidationTests.swift */; }; 16E91A452A70453B00DC0D98 /* TestCard.swift in Sources */ = {isa = PBXBuildFile; fileRef = 16E91A442A70453B00DC0D98 /* TestCard.swift */; }; 16E91A482A704AC300DC0D98 /* StaticTexts.swift in Sources */ = {isa = PBXBuildFile; fileRef = 16E91A472A704AC300DC0D98 /* StaticTexts.swift */; }; - 950F88642DE884BE0041D2E7 /* Frames in Frameworks */ = {isa = PBXBuildFile; productRef = 950F88632DE884BE0041D2E7 /* Frames */; }; 955B092B291CEF0F00DEEAF5 /* ApplePayCreator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 955B092A291CEF0F00DEEAF5 /* ApplePayCreator.swift */; }; 95C8C10D28AD5FEE00B8D3D0 /* UIViewControllerExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95C8C0B528AD5FEE00B8D3D0 /* UIViewControllerExtension.swift */; }; 95C8C10E28AD5FEE00B8D3D0 /* UIViewExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95C8C0B628AD5FEE00B8D3D0 /* UIViewExtension.swift */; }; @@ -227,7 +226,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 950F88642DE884BE0041D2E7 /* Frames in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1245,7 +1243,7 @@ isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/checkout/frames-ios"; requirement = { - branch = update/spm_dependacies; + branch = main; kind = branch; }; }; From 5157200f47c76290b6d0fb55e725c94439e88240 Mon Sep 17 00:00:00 2001 From: Ehab Al Date: Tue, 3 Jun 2025 17:13:15 +0100 Subject: [PATCH 4/9] Update pod version to newVersion/4.3.8 (cherry picked from commit 88e2b5138d6469f4698f5b16e83223c2cdb2632e) --- .../project.pbxproj | 12 +++---- Checkout/Samples/CocoapodsSample/Podfile | 4 +-- Checkout/Samples/CocoapodsSample/Podfile.lock | 30 +++++++++++++---- .../project.pbxproj | 16 ++++++---- iOS Example Frame/Podfile | 3 +- iOS Example Frame/Podfile.lock | 32 +++++++++++-------- 6 files changed, 62 insertions(+), 35 deletions(-) diff --git a/Checkout/Samples/CocoapodsSample/CheckoutCocoapodsSample.xcodeproj/project.pbxproj b/Checkout/Samples/CocoapodsSample/CheckoutCocoapodsSample.xcodeproj/project.pbxproj index 3d1fcde5..744d59e5 100644 --- a/Checkout/Samples/CocoapodsSample/CheckoutCocoapodsSample.xcodeproj/project.pbxproj +++ b/Checkout/Samples/CocoapodsSample/CheckoutCocoapodsSample.xcodeproj/project.pbxproj @@ -472,7 +472,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; @@ -527,7 +527,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; SDKROOT = iphoneos; @@ -554,7 +554,7 @@ INFOPLIST_KEY_UIMainStoryboardFile = Main; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -586,7 +586,7 @@ INFOPLIST_KEY_UIMainStoryboardFile = Main; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -608,7 +608,7 @@ CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = E32XBQK4Q5; GENERATE_INFOPLIST_FILE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -632,7 +632,7 @@ CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = E32XBQK4Q5; GENERATE_INFOPLIST_FILE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", diff --git a/Checkout/Samples/CocoapodsSample/Podfile b/Checkout/Samples/CocoapodsSample/Podfile index bf531c33..f74c02c3 100644 --- a/Checkout/Samples/CocoapodsSample/Podfile +++ b/Checkout/Samples/CocoapodsSample/Podfile @@ -1,9 +1,9 @@ -platform :ios, '12.0' +platform :ios, '13.0' install! 'cocoapods', :share_schemes_for_development_pods => true target 'CheckoutCocoapodsSample' do use_frameworks! # Pods for CheckoutSDKCocoapodsSample - pod 'Checkout', '4.3.8' + pod 'Checkout', :git => 'https://github.com/checkout/frames-ios.git', :branch => 'newVersion/4.3.8' end diff --git a/Checkout/Samples/CocoapodsSample/Podfile.lock b/Checkout/Samples/CocoapodsSample/Podfile.lock index bd1a547c..4612efd9 100644 --- a/Checkout/Samples/CocoapodsSample/Podfile.lock +++ b/Checkout/Samples/CocoapodsSample/Podfile.lock @@ -1,20 +1,38 @@ PODS: - - Checkout (4.2.0): + - Checkout (4.3.8): - CheckoutEventLoggerKit (~> 1.2.4) + - Risk (~> 3.0.2) - CheckoutEventLoggerKit (1.2.4) + - FingerprintPro (2.7.0) + - Risk (3.0.4): + - CheckoutEventLoggerKit (~> 1.2.4) + - FingerprintPro (~> 2.7.0) DEPENDENCIES: - - Checkout (~> 4.0) + - Checkout (from `https://github.com/checkout/frames-ios.git`, branch `newVersion/4.3.8`) SPEC REPOS: trunk: - - Checkout - CheckoutEventLoggerKit + - FingerprintPro + - Risk + +EXTERNAL SOURCES: + Checkout: + :branch: newVersion/4.3.8 + :git: https://github.com/checkout/frames-ios.git + +CHECKOUT OPTIONS: + Checkout: + :commit: 700863771ce9b3af1c42a9d020cec9120b2ee96b + :git: https://github.com/checkout/frames-ios.git SPEC CHECKSUMS: - Checkout: 7015595d6318c822cd81c3d73bf780507f99f60c + Checkout: 609314d0c54a079d4c0ddfcfa7011367a12f225a CheckoutEventLoggerKit: b780dec46295a34942780ea6230d0d5fd08aa05a + FingerprintPro: 0c7dbd28fc83751ca64b06328e2fb22bbc7ed118 + Risk: 6c0fdbf826f741b028ec9158198404ce267d0d3e -PODFILE CHECKSUM: 4ba1f8758ad74e15c9805de325a88bc4f977165e +PODFILE CHECKSUM: 4ee6ae5b7c361a07bee18adca7c5eab132fe3e40 -COCOAPODS: 1.12.1 +COCOAPODS: 1.16.2 diff --git a/iOS Example Frame SPM/iOS Example Frame SPM.xcodeproj/project.pbxproj b/iOS Example Frame SPM/iOS Example Frame SPM.xcodeproj/project.pbxproj index a8340de4..324bf470 100644 --- a/iOS Example Frame SPM/iOS Example Frame SPM.xcodeproj/project.pbxproj +++ b/iOS Example Frame SPM/iOS Example Frame SPM.xcodeproj/project.pbxproj @@ -42,6 +42,7 @@ 16E91A452A70453B00DC0D98 /* TestCard.swift in Sources */ = {isa = PBXBuildFile; fileRef = 16E91A442A70453B00DC0D98 /* TestCard.swift */; }; 16E91A482A704AC300DC0D98 /* StaticTexts.swift in Sources */ = {isa = PBXBuildFile; fileRef = 16E91A472A704AC300DC0D98 /* StaticTexts.swift */; }; 955B092B291CEF0F00DEEAF5 /* ApplePayCreator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 955B092A291CEF0F00DEEAF5 /* ApplePayCreator.swift */; }; + 955DD85E2DEF369C00E57DA5 /* Frames in Frameworks */ = {isa = PBXBuildFile; productRef = 955DD85D2DEF369C00E57DA5 /* Frames */; }; 95C8C10D28AD5FEE00B8D3D0 /* UIViewControllerExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95C8C0B528AD5FEE00B8D3D0 /* UIViewControllerExtension.swift */; }; 95C8C10E28AD5FEE00B8D3D0 /* UIViewExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95C8C0B628AD5FEE00B8D3D0 /* UIViewExtension.swift */; }; 95C8C10F28AD5FEE00B8D3D0 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95C8C0B728AD5FEE00B8D3D0 /* AppDelegate.swift */; }; @@ -226,6 +227,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 955DD85E2DEF369C00E57DA5 /* Frames in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -528,7 +530,7 @@ packageProductDependencies = ( 1629C08B2AF90379001BD3D9 /* Frames */, 958E51042DE74B3E0003F4B0 /* Frames */, - 950F88632DE884BE0041D2E7 /* Frames */, + 955DD85D2DEF369C00E57DA5 /* Frames */, ); productName = "iOS Example Frame"; productReference = 16AE74C32A5C1EBB0031F794 /* iOS Example Frame.app */; @@ -577,7 +579,7 @@ mainGroup = E6646F8120CE6C0900D8353A; packageReferences = ( 16C3F83E2A7927ED00690639 /* XCRemoteSwiftPackageReference "swift-snapshot-testing" */, - 950F88622DE884BE0041D2E7 /* XCRemoteSwiftPackageReference "frames-ios" */, + 955DD85C2DEF369C00E57DA5 /* XCRemoteSwiftPackageReference "frames-ios" */, ); productRefGroup = E6646F8120CE6C0900D8353A; projectDirPath = ""; @@ -1239,12 +1241,12 @@ version = 1.12.0; }; }; - 950F88622DE884BE0041D2E7 /* XCRemoteSwiftPackageReference "frames-ios" */ = { + 955DD85C2DEF369C00E57DA5 /* XCRemoteSwiftPackageReference "frames-ios" */ = { isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/checkout/frames-ios"; requirement = { - branch = main; - kind = branch; + kind = exactVersion; + version = 4.3.8; }; }; /* End XCRemoteSwiftPackageReference section */ @@ -1267,9 +1269,9 @@ package = 16C3F83E2A7927ED00690639 /* XCRemoteSwiftPackageReference "swift-snapshot-testing" */; productName = SnapshotTesting; }; - 950F88632DE884BE0041D2E7 /* Frames */ = { + 955DD85D2DEF369C00E57DA5 /* Frames */ = { isa = XCSwiftPackageProductDependency; - package = 950F88622DE884BE0041D2E7 /* XCRemoteSwiftPackageReference "frames-ios" */; + package = 955DD85C2DEF369C00E57DA5 /* XCRemoteSwiftPackageReference "frames-ios" */; productName = Frames; }; 958E51042DE74B3E0003F4B0 /* Frames */ = { diff --git a/iOS Example Frame/Podfile b/iOS Example Frame/Podfile index 95e34304..eaa98e5d 100644 --- a/iOS Example Frame/Podfile +++ b/iOS Example Frame/Podfile @@ -6,7 +6,8 @@ target 'iOS Example Frame' do use_frameworks! # Pods for iOS Example Custom - pod 'Frames', :git => 'https://github.com/checkout/frames-ios.git', :branch => 'update/spm_dependacies' + pod 'Frames', :git => 'https://github.com/checkout/frames-ios.git', :branch => 'newVersion/4.3.8' + pod 'Checkout', :git => 'https://github.com/checkout/frames-ios.git', :branch => 'newVersion/4.3.8' end post_install do |installer| diff --git a/iOS Example Frame/Podfile.lock b/iOS Example Frame/Podfile.lock index 3e7c2481..71d6e81f 100644 --- a/iOS Example Frame/Podfile.lock +++ b/iOS Example Frame/Podfile.lock @@ -1,9 +1,9 @@ PODS: - Checkout (4.3.8): - CheckoutEventLoggerKit (~> 1.2.4) - - Risk (= 3.0.2) + - Risk (~> 3.0.2) - CheckoutEventLoggerKit (1.2.4) - - FingerprintPro (2.2.0) + - FingerprintPro (2.7.0) - Frames (4.3.8): - Checkout (= 4.3.8) - CheckoutEventLoggerKit (~> 1.2.4) @@ -14,39 +14,45 @@ PODS: - PhoneNumberKit/PhoneNumberKitCore (4.0.1) - PhoneNumberKit/UIKit (4.0.1): - PhoneNumberKit/PhoneNumberKitCore - - Risk (3.0.2): + - Risk (3.0.4): - CheckoutEventLoggerKit (~> 1.2.4) - - FingerprintPro (= 2.2.0) + - FingerprintPro (~> 2.7.0) DEPENDENCIES: - - Frames (from `https://github.com/checkout/frames-ios.git`, branch `update/spm_dependacies`) + - Checkout (from `https://github.com/checkout/frames-ios.git`, branch `newVersion/4.3.8`) + - Frames (from `https://github.com/checkout/frames-ios.git`, branch `newVersion/4.3.8`) SPEC REPOS: trunk: - - Checkout - CheckoutEventLoggerKit - FingerprintPro - PhoneNumberKit - Risk EXTERNAL SOURCES: + Checkout: + :branch: newVersion/4.3.8 + :git: https://github.com/checkout/frames-ios.git Frames: - :branch: update/spm_dependacies + :branch: newVersion/4.3.8 :git: https://github.com/checkout/frames-ios.git CHECKOUT OPTIONS: + Checkout: + :commit: d0060ff5ff443678ae668dcd1974f09741444649 + :git: https://github.com/checkout/frames-ios.git Frames: - :commit: 22ba0ab903c3c93c8fa7751fef1434e4497d1c6c + :commit: d0060ff5ff443678ae668dcd1974f09741444649 :git: https://github.com/checkout/frames-ios.git SPEC CHECKSUMS: - Checkout: 5d909e76355e8cfefa32c7520de50fa54185adf2 + Checkout: 609314d0c54a079d4c0ddfcfa7011367a12f225a CheckoutEventLoggerKit: b780dec46295a34942780ea6230d0d5fd08aa05a - FingerprintPro: 72e35dc0315b75ba36eafaaed996dbb2f35f7326 - Frames: a448616a3b6079ddb82a57e638f3ec324f6640bd + FingerprintPro: 0c7dbd28fc83751ca64b06328e2fb22bbc7ed118 + Frames: 7cad5e39665bf9d610dcf44b3ff42f6b051ca268 PhoneNumberKit: a74155066daa6450475f6a029068eb919fb00d5d - Risk: a0732fef94dfddfa76ca70dbe0e5fe0f05557ec1 + Risk: 6c0fdbf826f741b028ec9158198404ce267d0d3e -PODFILE CHECKSUM: af187378f7f557970453534618a82fb7efd4e1c2 +PODFILE CHECKSUM: 276c36f26dba23419747ce57db0b0a2eb120245d COCOAPODS: 1.16.2 From 5ecaa7b96af802193d4c1a2e25a4d699f083427f Mon Sep 17 00:00:00 2001 From: Ehab Al Date: Wed, 4 Jun 2025 12:52:37 +0100 Subject: [PATCH 5/9] Update all GHA to depend commit hash and avoid versions --- .github/workflows/codeql-analysis.yml | 4 ++-- .github/workflows/deploy-github-pages.yml | 8 ++++---- .github/workflows/generate-jazzy-docs.yml | 2 +- .github/workflows/run-regression-tests.yml | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 4544cb8e..9a0586f4 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -48,7 +48,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@v2 + uses: github/codeql-action/init@bc02a25f6449997c5e9d5a368879b28f56ae19a1 with: languages: ${{ matrix.language }} queries: security-and-quality @@ -86,4 +86,4 @@ jobs: # Perform analysis on the code - name: Analyze code with CodeQL - uses: github/codeql-action/analyze@v2 + uses: github/codeql-action/analyze@bc02a25f6449997c5e9d5a368879b28f56ae19a1 diff --git a/.github/workflows/deploy-github-pages.yml b/.github/workflows/deploy-github-pages.yml index ec34be38..2eb41789 100644 --- a/.github/workflows/deploy-github-pages.yml +++ b/.github/workflows/deploy-github-pages.yml @@ -29,14 +29,14 @@ jobs: - name: Checkout uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - name: Setup Pages - uses: actions/configure-pages@v3 + uses: actions/configure-pages@983d7736d9b0ae728b81ab479565c72886d7745b - name: Build with Jekyll - uses: actions/jekyll-build-pages@v1 + uses: actions/jekyll-build-pages@44a6e6beabd48582f863aeeb6cb2151cc1716697 with: source: ./.github/docs destination: ./_site - name: Upload artifact - uses: actions/upload-pages-artifact@v2 + uses: actions/upload-pages-artifact@56afc609e74202658d3ffba0e8f6dda462b719fa # Deployment job deploy: @@ -48,4 +48,4 @@ jobs: steps: - name: Deploy to GitHub Pages id: deployment - uses: actions/deploy-pages@v2 + uses: actions/deploy-pages@d6db90164ac5ed86f2b6aed7e0febac5b3c0c03e diff --git a/.github/workflows/generate-jazzy-docs.yml b/.github/workflows/generate-jazzy-docs.yml index 25b2f973..66cc6b1d 100644 --- a/.github/workflows/generate-jazzy-docs.yml +++ b/.github/workflows/generate-jazzy-docs.yml @@ -45,7 +45,7 @@ jobs: run: sh .github/scripts/buildDocs.sh - name: Upload Generated Jazzy Docs - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 with: name: Jazzy Docs path: ".github/docs" diff --git a/.github/workflows/run-regression-tests.yml b/.github/workflows/run-regression-tests.yml index 48bb4951..8a65fa07 100644 --- a/.github/workflows/run-regression-tests.yml +++ b/.github/workflows/run-regression-tests.yml @@ -38,14 +38,14 @@ jobs: # - name: Upload Artifacts # if: always() -# uses: actions/upload-artifact@v3 +# uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # with: # name: Test Results and Logs # path: "~/Library/Developer/Xcode/DerivedData/*/Logs/Test/" # - name: Upload Generated Screenshots # if: always() -# uses: actions/upload-artifact@v3 +# uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # with: # name: Test Results and Logs # path: "iOS\ Example\ Frame\ SPM/iOS\ Example\ Frame\ Regression\ Tests/__Snapshots__" From b742cbe3177ab5246feb7739f052086b0b0e7752 Mon Sep 17 00:00:00 2001 From: Ehab Al Date: Wed, 4 Jun 2025 13:38:02 +0100 Subject: [PATCH 6/9] Update pod source to be a certain version --- Checkout/Samples/CocoapodsSample/Podfile | 2 +- iOS Example Frame/Podfile | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Checkout/Samples/CocoapodsSample/Podfile b/Checkout/Samples/CocoapodsSample/Podfile index f74c02c3..d24cd452 100644 --- a/Checkout/Samples/CocoapodsSample/Podfile +++ b/Checkout/Samples/CocoapodsSample/Podfile @@ -5,5 +5,5 @@ target 'CheckoutCocoapodsSample' do use_frameworks! # Pods for CheckoutSDKCocoapodsSample - pod 'Checkout', :git => 'https://github.com/checkout/frames-ios.git', :branch => 'newVersion/4.3.8' + pod 'Checkout', '4.3.8' end diff --git a/iOS Example Frame/Podfile b/iOS Example Frame/Podfile index eaa98e5d..7f51e005 100644 --- a/iOS Example Frame/Podfile +++ b/iOS Example Frame/Podfile @@ -6,8 +6,7 @@ target 'iOS Example Frame' do use_frameworks! # Pods for iOS Example Custom - pod 'Frames', :git => 'https://github.com/checkout/frames-ios.git', :branch => 'newVersion/4.3.8' - pod 'Checkout', :git => 'https://github.com/checkout/frames-ios.git', :branch => 'newVersion/4.3.8' + pod 'Frames', '4.3.8' end post_install do |installer| From 57bac9525597c28a1ae376aad68bd164aa2641be Mon Sep 17 00:00:00 2001 From: Ehab Al Date: Wed, 4 Jun 2025 13:42:12 +0100 Subject: [PATCH 7/9] Update all to macos 15 xlarge --- .github/workflows/publish-Checkout.podspec.yml | 4 ++-- .github/workflows/publish-Frames.podspec.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/publish-Checkout.podspec.yml b/.github/workflows/publish-Checkout.podspec.yml index 508b5642..a174e9a4 100644 --- a/.github/workflows/publish-Checkout.podspec.yml +++ b/.github/workflows/publish-Checkout.podspec.yml @@ -5,7 +5,7 @@ on: workflow_dispatch jobs: publish: environment: CocoaPodsRelease - runs-on: macos-12-xl + runs-on: macos-15-xlarge steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 @@ -19,6 +19,6 @@ jobs: - name: Publish Checkout.podspec run: | gem install cocoapods - pod trunk push Checkout.podspec --allow-warnings + pod trunk push Checkout.podspec --allow-warnings --verbose env: COCOAPODS_TRUNK_TOKEN: ${{ secrets.COCOAPODS_TRUNK_TOKEN }} diff --git a/.github/workflows/publish-Frames.podspec.yml b/.github/workflows/publish-Frames.podspec.yml index 70b49ff8..cbacd484 100644 --- a/.github/workflows/publish-Frames.podspec.yml +++ b/.github/workflows/publish-Frames.podspec.yml @@ -5,7 +5,7 @@ on: workflow_dispatch jobs: publish: environment: CocoaPodsRelease - runs-on: macos-12-xl + runs-on: macos-15-xlarge steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 @@ -19,6 +19,6 @@ jobs: - name: Publish Frames.podspec run: | gem install cocoapods - pod trunk push Frames.podspec --allow-warnings + pod trunk push --synchronous Frames.podspec --allow-warnings --verbose env: COCOAPODS_TRUNK_TOKEN: ${{ secrets.COCOAPODS_TRUNK_TOKEN }} From d53369c1f24394da20b77a3e3ddfade3a17aa1cb Mon Sep 17 00:00:00 2001 From: Ehab Al Date: Wed, 4 Jun 2025 13:56:04 +0100 Subject: [PATCH 8/9] Pod register machine --- .github/workflows/publish-Checkout.podspec.yml | 1 + .github/workflows/publish-Frames.podspec.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/publish-Checkout.podspec.yml b/.github/workflows/publish-Checkout.podspec.yml index a174e9a4..50667630 100644 --- a/.github/workflows/publish-Checkout.podspec.yml +++ b/.github/workflows/publish-Checkout.podspec.yml @@ -19,6 +19,7 @@ jobs: - name: Publish Checkout.podspec run: | gem install cocoapods + pod trunk register mobilesdkteam@checkout.com pod trunk push Checkout.podspec --allow-warnings --verbose env: COCOAPODS_TRUNK_TOKEN: ${{ secrets.COCOAPODS_TRUNK_TOKEN }} diff --git a/.github/workflows/publish-Frames.podspec.yml b/.github/workflows/publish-Frames.podspec.yml index cbacd484..3c555a6c 100644 --- a/.github/workflows/publish-Frames.podspec.yml +++ b/.github/workflows/publish-Frames.podspec.yml @@ -19,6 +19,7 @@ jobs: - name: Publish Frames.podspec run: | gem install cocoapods + pod trunk register mobilesdkteam@checkout.com pod trunk push --synchronous Frames.podspec --allow-warnings --verbose env: COCOAPODS_TRUNK_TOKEN: ${{ secrets.COCOAPODS_TRUNK_TOKEN }} From 9db9d7613593fcc0a86bafc2361fb11473b9a69b Mon Sep 17 00:00:00 2001 From: Ehab Al Date: Wed, 4 Jun 2025 16:33:41 +0100 Subject: [PATCH 9/9] Update podfiles --- Checkout/Samples/CocoapodsSample/Podfile.lock | 15 +++--------- iOS Example Frame/Podfile.lock | 23 ++++--------------- 2 files changed, 7 insertions(+), 31 deletions(-) diff --git a/Checkout/Samples/CocoapodsSample/Podfile.lock b/Checkout/Samples/CocoapodsSample/Podfile.lock index 4612efd9..54fa568e 100644 --- a/Checkout/Samples/CocoapodsSample/Podfile.lock +++ b/Checkout/Samples/CocoapodsSample/Podfile.lock @@ -9,30 +9,21 @@ PODS: - FingerprintPro (~> 2.7.0) DEPENDENCIES: - - Checkout (from `https://github.com/checkout/frames-ios.git`, branch `newVersion/4.3.8`) + - Checkout (= 4.3.8) SPEC REPOS: trunk: + - Checkout - CheckoutEventLoggerKit - FingerprintPro - Risk -EXTERNAL SOURCES: - Checkout: - :branch: newVersion/4.3.8 - :git: https://github.com/checkout/frames-ios.git - -CHECKOUT OPTIONS: - Checkout: - :commit: 700863771ce9b3af1c42a9d020cec9120b2ee96b - :git: https://github.com/checkout/frames-ios.git - SPEC CHECKSUMS: Checkout: 609314d0c54a079d4c0ddfcfa7011367a12f225a CheckoutEventLoggerKit: b780dec46295a34942780ea6230d0d5fd08aa05a FingerprintPro: 0c7dbd28fc83751ca64b06328e2fb22bbc7ed118 Risk: 6c0fdbf826f741b028ec9158198404ce267d0d3e -PODFILE CHECKSUM: 4ee6ae5b7c361a07bee18adca7c5eab132fe3e40 +PODFILE CHECKSUM: 9b0372a870e3437a2232753690edfe8385c4d6e0 COCOAPODS: 1.16.2 diff --git a/iOS Example Frame/Podfile.lock b/iOS Example Frame/Podfile.lock index 71d6e81f..c9401087 100644 --- a/iOS Example Frame/Podfile.lock +++ b/iOS Example Frame/Podfile.lock @@ -19,32 +19,17 @@ PODS: - FingerprintPro (~> 2.7.0) DEPENDENCIES: - - Checkout (from `https://github.com/checkout/frames-ios.git`, branch `newVersion/4.3.8`) - - Frames (from `https://github.com/checkout/frames-ios.git`, branch `newVersion/4.3.8`) + - Frames (= 4.3.8) SPEC REPOS: trunk: + - Checkout - CheckoutEventLoggerKit - FingerprintPro + - Frames - PhoneNumberKit - Risk -EXTERNAL SOURCES: - Checkout: - :branch: newVersion/4.3.8 - :git: https://github.com/checkout/frames-ios.git - Frames: - :branch: newVersion/4.3.8 - :git: https://github.com/checkout/frames-ios.git - -CHECKOUT OPTIONS: - Checkout: - :commit: d0060ff5ff443678ae668dcd1974f09741444649 - :git: https://github.com/checkout/frames-ios.git - Frames: - :commit: d0060ff5ff443678ae668dcd1974f09741444649 - :git: https://github.com/checkout/frames-ios.git - SPEC CHECKSUMS: Checkout: 609314d0c54a079d4c0ddfcfa7011367a12f225a CheckoutEventLoggerKit: b780dec46295a34942780ea6230d0d5fd08aa05a @@ -53,6 +38,6 @@ SPEC CHECKSUMS: PhoneNumberKit: a74155066daa6450475f6a029068eb919fb00d5d Risk: 6c0fdbf826f741b028ec9158198404ce267d0d3e -PODFILE CHECKSUM: 276c36f26dba23419747ce57db0b0a2eb120245d +PODFILE CHECKSUM: d9265d982988f39d7b723f95d839da2ec8d13da3 COCOAPODS: 1.16.2