From 1b6d9b51fafc2470b77462b51b7ed3e75fe51087 Mon Sep 17 00:00:00 2001 From: Ehab Al Date: Thu, 4 Apr 2024 14:06:35 +0100 Subject: [PATCH 1/3] Update version to 4.3.3 --- .github/CHANGELOG.md | 9 +++++++++ Checkout.podspec | 2 +- .../CheckoutSPMSample.xcodeproj/project.pbxproj | 4 ++-- Checkout/Source/Validation/Constants.swift | 2 +- Frames.podspec | 4 ++-- Source/Core/Constants/Constants.swift | 2 +- .../iOS Example Frame SPM.xcodeproj/project.pbxproj | 4 ++-- iOS Example Frame/Podfile | 3 +-- 8 files changed, 19 insertions(+), 11 deletions(-) diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md index 3af817b4a..bf3c5e6f1 100644 --- a/.github/CHANGELOG.md +++ b/.github/CHANGELOG.md @@ -5,6 +5,15 @@ All notable changes to this project will be documented in this file. #### 4.x Releases +## [4.3.3](https://github.com/checkout/frames-ios/releases/tag/4.3.3) + +Released on 2024-04-04 + +Updates: + +- Included a Correlation ID enhancement in our logging. + + ## [4.3.2](https://github.com/checkout/frames-ios/releases/tag/4.3.2) Released on 2024-03-01 diff --git a/Checkout.podspec b/Checkout.podspec index 46c376e75..13772a9f7 100644 --- a/Checkout.podspec +++ b/Checkout.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'Checkout' - s.version = '4.3.2' + s.version = '4.3.3' s.summary = 'Checkout SDK for iOS' s.description = <<-DESC diff --git a/Checkout/Samples/SPMSample/CheckoutSPMSample.xcodeproj/project.pbxproj b/Checkout/Samples/SPMSample/CheckoutSPMSample.xcodeproj/project.pbxproj index 13f3f1714..81a6379a6 100644 --- a/Checkout/Samples/SPMSample/CheckoutSPMSample.xcodeproj/project.pbxproj +++ b/Checkout/Samples/SPMSample/CheckoutSPMSample.xcodeproj/project.pbxproj @@ -511,8 +511,8 @@ isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/checkout/frames-ios"; requirement = { - branch = "feature/pass-correlation-id-to-risk-sdk"; - kind = branch; + kind = exactVersion; + version = 4.3.3; }; }; /* End XCRemoteSwiftPackageReference section */ diff --git a/Checkout/Source/Validation/Constants.swift b/Checkout/Source/Validation/Constants.swift index 6c3e0115d..ac849f358 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.2" + static let version = "4.3.3" static let name = "checkout-ios-sdk" static let userAgent = "checkout-sdk-ios/\(version)" } diff --git a/Frames.podspec b/Frames.podspec index f768fa388..aee1ca4a5 100644 --- a/Frames.podspec +++ b/Frames.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "Frames" - s.version = "4.3.2" + s.version = "4.3.3" 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' s.dependency 'CheckoutEventLoggerKit', '~> 1.2.4' - s.dependency 'Checkout', '4.3.2' + s.dependency 'Checkout', '4.3.3' end diff --git a/Source/Core/Constants/Constants.swift b/Source/Core/Constants/Constants.swift index 775c2a5a0..f2a8858da 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.2" + static let version = "4.3.3" static let userAgent = "checkout-sdk-frames-ios/\(version)" enum Logging { 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 e0f82c2da..a302857bb 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 @@ -1238,8 +1238,8 @@ isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/checkout/frames-ios"; requirement = { - branch = "feature/pass-correlation-id-to-risk-sdk"; - kind = branch; + kind = exactVersion; + version = 4.3.3; }; }; 16C3F83E2A7927ED00690639 /* XCRemoteSwiftPackageReference "swift-snapshot-testing" */ = { diff --git a/iOS Example Frame/Podfile b/iOS Example Frame/Podfile index 0fd7aef6f..a5de57a55 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', '4.3.2' - pod 'Frames', :git => 'https://github.com/checkout/frames-ios', :branch => 'feature/pass-correlation-id-to-risk-sdk' + pod 'Frames', '4.3.3' end From 80003fbde97a01f168c3390ea24a7b28d39484ac Mon Sep 17 00:00:00 2001 From: Okhan Okbay Date: Thu, 4 Apr 2024 15:52:49 +0100 Subject: [PATCH 2/3] Remove branch check before pod release --- .github/workflows/publish-Checkout.podspec.yml | 12 ++++++------ .github/workflows/publish-Frames.podspec.yml | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/publish-Checkout.podspec.yml b/.github/workflows/publish-Checkout.podspec.yml index 05f276bc0..569d73b4a 100644 --- a/.github/workflows/publish-Checkout.podspec.yml +++ b/.github/workflows/publish-Checkout.podspec.yml @@ -9,12 +9,12 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Check current branch - run: | - if [[ "${GITHUB_REF#refs/heads/}" != "main" && "${GITHUB_REF#refs/heads/}" != release/* ]]; then - echo "This workflow is expected to run on the main or release branch only." - exit 1 - fi +# - name: Check current branch +# run: | +# if [[ "${GITHUB_REF#refs/heads/}" != "main" && "${GITHUB_REF#refs/heads/}" != release/* ]]; then +# echo "This workflow is expected to run on the main or release branch only." +# exit 1 +# fi - name: Publish Checkout.podspec run: | diff --git a/.github/workflows/publish-Frames.podspec.yml b/.github/workflows/publish-Frames.podspec.yml index f02157861..dce62f046 100644 --- a/.github/workflows/publish-Frames.podspec.yml +++ b/.github/workflows/publish-Frames.podspec.yml @@ -9,12 +9,12 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Check current branch - run: | - if [[ "${GITHUB_REF#refs/heads/}" != "main" && "${GITHUB_REF#refs/heads/}" != release/* ]]; then - echo "This workflow is expected to run on the main or release branch only." - exit 1 - fi +# - name: Check current branch +# run: | +# if [[ "${GITHUB_REF#refs/heads/}" != "main" && "${GITHUB_REF#refs/heads/}" != release/* ]]; then +# echo "This workflow is expected to run on the main or release branch only." +# exit 1 +# fi - name: Publish Frames.podspec run: | From 9b8b06768cb34594ec810c02aa16522f7037d24c Mon Sep 17 00:00:00 2001 From: Okhan Okbay Date: Thu, 4 Apr 2024 16:17:15 +0100 Subject: [PATCH 3/3] Update sample project version --- Checkout/Samples/CocoapodsSample/Podfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Checkout/Samples/CocoapodsSample/Podfile b/Checkout/Samples/CocoapodsSample/Podfile index 12e61fca2..fd249bf19 100644 --- a/Checkout/Samples/CocoapodsSample/Podfile +++ b/Checkout/Samples/CocoapodsSample/Podfile @@ -5,7 +5,6 @@ target 'CheckoutCocoapodsSample' do use_frameworks! # Pods for CheckoutSDKCocoapodsSample - # pod 'Checkout', '4.3.2' - pod 'Frames', :git => 'https://github.com/checkout/frames-ios', :branch => 'feature/pass-correlation-id-to-risk-sdk' + pod 'Checkout', '4.3.3' end