Skip to content

Commit 78bce17

Browse files
okhan-okbay-ckookhan-okbay-cko
authored
Merge pull request #524 from checkout/release/4.3.3
Merge release/4.3.3 into main
2 parents 5693ee1 + df72184 commit 78bce17

File tree

20 files changed

+98
-144
lines changed

20 files changed

+98
-144
lines changed

‎.github/CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,15 @@ All notable changes to this project will be documented in this file.
55

66
#### 4.x Releases
77

8+
## [4.3.3](https://github.com/checkout/frames-ios/releases/tag/4.3.3)
9+
10+
Released on 2024-04-04
11+
12+
Updates:
13+
14+
- Included a Correlation ID enhancement in our logging.
15+
16+
817
## [4.3.2](https://github.com/checkout/frames-ios/releases/tag/4.3.2)
918

1019
Released on 2024-03-01

‎.github/workflows/codeql-analysis.yml

Lines changed: 26 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,17 @@ concurrency:
1919
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
2020
cancel-in-progress: true
2121

22+
env:
23+
destination: "platform=iOS Simulator,name=iPhone 15 Pro,OS=latest"
24+
configuration: "Debug"
25+
noIndex: "COMPILER_INDEX_STORE_ENABLE=NO"
26+
noSigning: "CODE_SIGNING_ALLOWED=NO"
27+
versionXcode: "15.2"
28+
2229
jobs:
2330
analyze:
2431
name: Analyze
25-
runs-on: [ macos-latest ]
32+
runs-on: [ macos-13-large ]
2633
permissions:
2734
actions: read
2835
contents: read
@@ -45,24 +52,37 @@ jobs:
4552
with:
4653
languages: ${{ matrix.language }}
4754
queries: security-and-quality
48-
55+
56+
- name: Select Xcode
57+
run: |
58+
sudo xcode-select -switch /Applications/Xcode_${versionXcode}.app
59+
60+
- name: Log xcodebuild Version
61+
run: |
62+
xcodebuild -version
63+
64+
4965
- name: Build Frames
5066
run: |
51-
xcodebuild -scheme Frames -destination "platform=iOS Simulator,name=iPhone 14 Pro,OS=latest"
67+
xcodebuild -scheme Frames -destination "${destination}" "${noIndex}" "${noSigning}" | xcpretty
68+
69+
- name: Build CheckoutTests
70+
run: |
71+
xcodebuild build -scheme CheckoutTests -destination "${destination}" "${noIndex}" "${noSigning}" | xcpretty
5272
5373
- name: Build FramesTests
5474
run: |
55-
xcodebuild -scheme FramesTests -destination "platform=iOS Simulator,name=iPhone 14 Pro,OS=latest" test
75+
xcodebuild build -scheme FramesTests -destination "${destination}" "${noIndex}" "${noSigning}" | xcpretty
5676
5777
- name: Build iOS Example Frame SPM
5878
run: |
5979
cd iOS\ Example\ Frame\ SPM
60-
xcodebuild build -scheme iOS\ Example\ Frame -destination "platform=iOS Simulator,name=iPhone 14 Pro,OS=latest"
80+
xcodebuild build -scheme iOS\ Example\ Frame -destination "${destination}" "${noIndex}" "${noSigning}" | xcpretty
6181
6282
- name: Build UITest
6383
run: |
6484
cd iOS\ Example\ Frame\ SPM
65-
xcodebuild -scheme UITest -destination "platform=iOS Simulator,name=iPhone 14 Pro,OS=latest"
85+
xcodebuild -scheme UITest -destination "${destination}" "${noIndex}" "${noSigning}" | xcpretty
6686
6787
# Perform analysis on the code
6888
- name: Analyze code with CodeQL

‎.github/workflows/publish-Checkout.podspec.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ jobs:
99
steps:
1010
- uses: actions/checkout@v4
1111

12-
- name: Check current branch
13-
run: |
14-
if [[ "${GITHUB_REF#refs/heads/}" != "main" && "${GITHUB_REF#refs/heads/}" != release/* ]]; then
15-
echo "This workflow is expected to run on the main or release branch only."
16-
exit 1
17-
fi
12+
# - name: Check current branch
13+
# run: |
14+
# if [[ "${GITHUB_REF#refs/heads/}" != "main" && "${GITHUB_REF#refs/heads/}" != release/* ]]; then
15+
# echo "This workflow is expected to run on the main or release branch only."
16+
# exit 1
17+
# fi
1818

1919
- name: Publish Checkout.podspec
2020
run: |

‎.github/workflows/publish-Frames.podspec.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ jobs:
99
steps:
1010
- uses: actions/checkout@v4
1111

12-
- name: Check current branch
13-
run: |
14-
if [[ "${GITHUB_REF#refs/heads/}" != "main" && "${GITHUB_REF#refs/heads/}" != release/* ]]; then
15-
echo "This workflow is expected to run on the main or release branch only."
16-
exit 1
17-
fi
12+
# - name: Check current branch
13+
# run: |
14+
# if [[ "${GITHUB_REF#refs/heads/}" != "main" && "${GITHUB_REF#refs/heads/}" != release/* ]]; then
15+
# echo "This workflow is expected to run on the main or release branch only."
16+
# exit 1
17+
# fi
1818

1919
- name: Publish Frames.podspec
2020
run: |

‎.swiftpm/xcode/xcshareddata/xcschemes/CheckoutTests.xcscheme

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<BuildActionEntries>
99
<BuildActionEntry
1010
buildForTesting = "YES"
11-
buildForRunning = "NO"
11+
buildForRunning = "YES"
1212
buildForProfiling = "NO"
1313
buildForArchiving = "NO"
1414
buildForAnalyzing = "NO">
@@ -53,6 +53,15 @@
5353
savedToolIdentifier = ""
5454
useCustomWorkingDirectory = "NO"
5555
debugDocumentVersioning = "YES">
56+
<MacroExpansion>
57+
<BuildableReference
58+
BuildableIdentifier = "primary"
59+
BlueprintIdentifier = "CheckoutTests"
60+
BuildableName = "CheckoutTests"
61+
BlueprintName = "CheckoutTests"
62+
ReferencedContainer = "container:">
63+
</BuildableReference>
64+
</MacroExpansion>
5665
</ProfileAction>
5766
<AnalyzeAction
5867
buildConfiguration = "Debug">

‎.swiftpm/xcode/xcshareddata/xcschemes/FramesTests.xcscheme

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,22 @@
55
<BuildAction
66
parallelizeBuildables = "YES"
77
buildImplicitDependencies = "YES">
8+
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForTesting = "YES"
11+
buildForRunning = "YES"
12+
buildForProfiling = "NO"
13+
buildForArchiving = "NO"
14+
buildForAnalyzing = "NO">
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "FramesTests"
18+
BuildableName = "FramesTests"
19+
BlueprintName = "FramesTests"
20+
ReferencedContainer = "container:">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
</BuildActionEntries>
824
</BuildAction>
925
<TestAction
1026
buildConfiguration = "Debug"
@@ -42,6 +58,15 @@
4258
savedToolIdentifier = ""
4359
useCustomWorkingDirectory = "NO"
4460
debugDocumentVersioning = "YES">
61+
<MacroExpansion>
62+
<BuildableReference
63+
BuildableIdentifier = "primary"
64+
BlueprintIdentifier = "FramesTests"
65+
BuildableName = "FramesTests"
66+
BlueprintName = "FramesTests"
67+
ReferencedContainer = "container:">
68+
</BuildableReference>
69+
</MacroExpansion>
4570
</ProfileAction>
4671
<AnalyzeAction
4772
buildConfiguration = "Debug">

‎Checkout.podspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = 'Checkout'
3-
s.version = '4.3.2'
3+
s.version = '4.3.3'
44
s.summary = 'Checkout SDK for iOS'
55

66
s.description = <<-DESC
@@ -20,6 +20,6 @@ Pod::Spec.new do |s|
2020
s.exclude_files = "Checkout/Samples/**"
2121

2222
s.dependency 'CheckoutEventLoggerKit', '~> 1.2.4'
23-
s.dependency 'Risk', '2.0.1'
23+
s.dependency 'Risk', '2.0.3'
2424

2525
end

‎Checkout/Samples/CocoapodsSample/Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ target 'CheckoutCocoapodsSample' do
55
use_frameworks!
66

77
# Pods for CheckoutSDKCocoapodsSample
8-
pod 'Checkout', '4.3.2'
8+
pod 'Checkout', '4.3.3'
99

1010
end

‎Checkout/Samples/SPMSample/CheckoutSPMSample.xcodeproj/project.pbxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -512,7 +512,7 @@
512512
repositoryURL = "https://github.com/checkout/frames-ios";
513513
requirement = {
514514
kind = exactVersion;
515-
version = 4.3.2;
515+
version = 4.3.3;
516516
};
517517
};
518518
/* End XCRemoteSwiftPackageReference section */

‎Checkout/Samples/SPMSample/CheckoutSPMSample.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

Lines changed: 0 additions & 50 deletions
This file was deleted.

‎Checkout/Source/Tokenisation/CheckoutAPIService.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ final public class CheckoutAPIService: CheckoutAPIProtocol {
5959
riskEnvironment = .sandbox
6060
}
6161

62-
let riskConfig = RiskConfig(publicKey: publicKey, environment: riskEnvironment, framesMode: true)
62+
let riskConfig = RiskConfig(publicKey: publicKey, environment: riskEnvironment, framesMode: true, correlationId: logManager.correlationID)
6363
let riskSDK = Risk.init(config: riskConfig)
6464

6565
logManager.setup(

‎Checkout/Source/Validation/Constants.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public enum Constants {
2525
}
2626

2727
enum Product {
28-
static let version = "4.3.2"
28+
static let version = "4.3.3"
2929
static let name = "checkout-ios-sdk"
3030
static let userAgent = "checkout-sdk-ios/\(version)"
3131
}

‎CheckoutTests/Integration/CheckoutAPIServiceIntegrationTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ final class CheckoutAPIServiceIntegrationTests: XCTestCase {
6666

6767
// details associated with default apple pay token
6868
let expectedApplePayDetails = ApplePayDetails(
69-
expiryDate: try! CardValidator(environment: .sandbox).validate(expiryMonth: 3, expiryYear: 24).get(),
69+
expiryDate: .init(month: 3, year: 2024),
7070
bin: "537426",
7171
last4: "7789"
7272
)

‎Frames.podspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "Frames"
3-
s.version = "4.3.2"
3+
s.version = "4.3.3"
44
s.summary = "Checkout API Client, Payment Form UI and Utilities in Swift"
55
s.description = <<-DESC
66
Checkout API Client and Payment Form Utilities in Swift.
@@ -21,6 +21,6 @@ Pod::Spec.new do |s|
2121

2222
s.dependency 'PhoneNumberKit'
2323
s.dependency 'CheckoutEventLoggerKit', '~> 1.2.4'
24-
s.dependency 'Checkout', '4.3.2'
24+
s.dependency 'Checkout', '4.3.3'
2525

2626
end

‎Package.resolved

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ let package = Package(
2020
exact: "3.5.9"),
2121
.package(
2222
url: "https://github.com/checkout/checkout-risk-sdk-ios.git",
23-
exact: "2.0.1"),
23+
exact: "2.0.3"),
2424
.package(
2525
url: "https://github.com/checkout/checkout-event-logger-ios-framework.git",
2626
from: "1.2.4"

‎Source/Core/Constants/Constants.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
enum Constants {
99

1010
static let productName = "frames-ios-sdk"
11-
static let version = "4.3.2"
11+
static let version = "4.3.3"
1212
static let userAgent = "checkout-sdk-frames-ios/\(version)"
1313

1414
enum Logging {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1239,7 +1239,7 @@
12391239
repositoryURL = "https://github.com/checkout/frames-ios";
12401240
requirement = {
12411241
kind = exactVersion;
1242-
version = 4.3.2;
1242+
version = 4.3.3;
12431243
};
12441244
};
12451245
16C3F83E2A7927ED00690639 /* XCRemoteSwiftPackageReference "swift-snapshot-testing" */ = {

0 commit comments

Comments
 (0)