Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Resolve merge conflicts of main to develop PR #496

Merged
merged 56 commits into from
Nov 6, 2023
Merged

Resolve merge conflicts of main to develop PR #496

Changes from all commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
0ef33d5
Merge pull request #443 from checkout/develop
okhan-okbay-cko Aug 15, 2023
734f477
Bump version to 4.2.0
okhan-okbay-cko Aug 15, 2023
24a4585
Merge pull request #446 from checkout/release/4.2.0
okhan-okbay-cko Aug 15, 2023
28c75b9
Update sample CocoaPods projects
okhan-okbay-cko Aug 15, 2023
9500d49
Move Checkout.podspec
okhan-okbay-cko Aug 15, 2023
93cfe9e
Merge pull request #447 from checkout/hotfix/checkout-podspec
okhan-okbay-cko Aug 15, 2023
d133fc3
Remove Carthage references from README
okhan-okbay-cko Jul 6, 2023
791e370
Merge pull request #448 from checkout/hotfix/remove-carthage-from-readme
okhan-okbay-cko Aug 15, 2023
79da0fe
Update pods on CI
okhan-okbay-cko Aug 15, 2023
130fbc6
Fix the recommended usage in README
okhan-okbay-cko Aug 15, 2023
2709ad9
Merge pull request #449 from checkout/update-samples-4.2.0
okhan-okbay-cko Aug 16, 2023
153cfa7
Rename PaymentViewController
okhan-okbay-cko Aug 25, 2023
cfccc83
Fix a failing test
okhan-okbay-cko Aug 25, 2023
6d5d939
Add CodeQL GitHub Actions workflow
cko-developer-portal[bot] Jul 18, 2023
6073333
Fix Checkout tests
okhan-okbay-cko Aug 25, 2023
65c2f97
Merge pull request #453 from checkout/hotfix/checkout-tests
okhan-okbay-cko Aug 25, 2023
26fde07
Merge pull request #451 from checkout/hotifx/rename-paymentviewcontro…
okhan-okbay-cko Aug 25, 2023
5566b26
Merge pull request #423 from checkout/autogenerated_codeql_file
okhan-okbay-cko Aug 25, 2023
a84f8f9
Bump version to 4.2.1
okhan-okbay-cko Aug 25, 2023
d226e9e
Merge pull request #454 from checkout/release/4.2.1
okhan-okbay-cko Aug 25, 2023
d965200
Update sample project versions to exact versions
okhan-okbay-cko Aug 25, 2023
0cf7550
Merge pull request #455 from checkout/update/sample-projects-4.2.1
okhan-okbay-cko Aug 25, 2023
11f9660
Merge pull request #456 from checkout/release/4.2.1
okhan-okbay-cko Aug 29, 2023
fc50507
Add workflow
okhan-okbay-cko Aug 30, 2023
0368ff4
Merge pull request #457 from checkout/feature/check-pr-workflow
okhan-okbay-cko Sep 1, 2023
c99d842
Remove PR checks from Bitrise in favour of GitHub Actions
okhan-okbay-cko Sep 1, 2023
63ff973
Merge pull request #461 from checkout/update/remove-pr-checks-bitrise
okhan-okbay-cko Sep 1, 2023
c210fe8
Add regression tests workflow
okhan-okbay-cko Sep 5, 2023
f904da8
Update snapshots
okhan-okbay-cko Sep 6, 2023
71ce7eb
PIMOB-XXXX: Using recommended resource_bundles in podspec to fix stat…
bartlomiejswierad-vodeno Sep 6, 2023
7640f00
Merge pull request #458 from checkout/feature/regression-tests-workflow
okhan-okbay-cko Sep 6, 2023
5fc48b0
Add checkout logo (#462)
okhan-okbay-cko Sep 7, 2023
c6e979f
Remove regression tests from bitrise.yml (#463)
okhan-okbay-cko Sep 7, 2023
05fb1a5
Add codeowners file (#464)
okhan-okbay-cko Sep 7, 2023
fb93e1c
PIMOB-2041 Add app store validation (#465)
okhan-okbay-cko Sep 8, 2023
e0110b4
Remove bitrise.yml since we now use GitHub Actions (#466)
okhan-okbay-cko Sep 8, 2023
f883251
Update README.md (#460)
ehab-al-cko Sep 8, 2023
394dbd8
Update README (#467)
okhan-okbay-cko Sep 8, 2023
6322b8c
Add workflows to publish Checkout and Frames pods (#468)
okhan-okbay-cko Sep 12, 2023
12fe09c
Add SwiftLint as a blocker pre-check for all the other checks (#469)
okhan-okbay-cko Sep 12, 2023
d98ffe8
Fix the fixable SwiftLint issues (#471)
okhan-okbay-cko Sep 12, 2023
404e12d
Move some folders around and update README (#473)
okhan-okbay-cko Sep 14, 2023
7cadfa7
Add lint edited files script (#475)
okhan-okbay-cko Sep 19, 2023
20f457d
Create deploy-github-pages.yml (#476)
okhan-okbay-cko Sep 19, 2023
b0e13ff
Add generate-jazzy-docs.yml (#474)
okhan-okbay-cko Sep 19, 2023
8dfe061
Add only docs diff (#478)
okhan-okbay-cko Sep 19, 2023
0ed94cc
Update jazzy docs (#477)
okhan-okbay-cko Sep 19, 2023
5c740f2
Remove docs from root folder (#479)
okhan-okbay-cko Sep 20, 2023
6bd6c6a
Update SnapshotTesting framework version (#480)
okhan-okbay-cko Sep 20, 2023
6ad010f
Trigger regression and validation workflows via labels (#481)
okhan-okbay-cko Sep 20, 2023
fcd995a
Update the PR template (#483)
okhan-okbay-cko Sep 20, 2023
8767e4d
Feature/partial readmes (#482)
okhan-okbay-cko Sep 21, 2023
a281035
Update jazzy docs (#484)
okhan-okbay-cko Sep 22, 2023
10c3cd6
Update README (#488)
okhan-okbay-cko Sep 26, 2023
afc7356
Merge branch 'main' into develop-premerge
okhan-okbay-cko Nov 3, 2023
586de64
Use local path to SPM package
okhan-okbay-cko Nov 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 21 additions & 24 deletions iOS Example Frame SPM/iOS Example Frame SPM.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,16 @@
0BB538AD28B637980060A8DE /* Factory+UITest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0BB538AC28B637980060A8DE /* Factory+UITest.swift */; };
0BD2ECBF28B65DA10041A942 /* FrameUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0BD2ECBE28B65DA10041A942 /* FrameUITests.swift */; };
0BD2ECC128B65EC20041A942 /* XCUIApplication+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0BD2ECC028B65EC20041A942 /* XCUIApplication+Extension.swift */; };
1629C0752AF04356001BD3D9 /* Frames in Frameworks */ = {isa = PBXBuildFile; productRef = 1629C0742AF04356001BD3D9 /* Frames */; };
1629C0772AF04359001BD3D9 /* Frames in Frameworks */ = {isa = PBXBuildFile; productRef = 1629C0762AF04359001BD3D9 /* Frames */; };
1629C0812AF562A5001BD3D9 /* Frames in Frameworks */ = {isa = PBXBuildFile; productRef = 1629C0802AF562A5001BD3D9 /* Frames */; };
1629C0842AF562D4001BD3D9 /* Frames in Frameworks */ = {isa = PBXBuildFile; productRef = 1629C0832AF562D4001BD3D9 /* Frames */; };
1629C0872AF56418001BD3D9 /* Frames in Frameworks */ = {isa = PBXBuildFile; productRef = 1629C0862AF56418001BD3D9 /* Frames */; };
1629C0892AF5641D001BD3D9 /* Frames in Frameworks */ = {isa = PBXBuildFile; productRef = 1629C0882AF5641D001BD3D9 /* Frames */; };
162CD88E2A6827E900027FEF /* XCUIElement+TestHelpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 162CD88D2A6827E900027FEF /* XCUIElement+TestHelpers.swift */; };
16857B742A65F15F005CAE39 /* CardTypeTokenCreationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 16857B732A65F15F005CAE39 /* CardTypeTokenCreationTests.swift */; };
16857B7E2A65F3F3005CAE39 /* XCUIApplication+TestHelpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 16857B7D2A65F3F3005CAE39 /* XCUIApplication+TestHelpers.swift */; };
168CEC952AC5C71700BB52B0 /* SecurityCodeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 168CEC942AC5C71700BB52B0 /* SecurityCodeViewController.swift */; };
16900D442AE6BA38009A7CE9 /* SecurityCodeComponentUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 16900D432AE6BA38009A7CE9 /* SecurityCodeComponentUITests.swift */; };
16900D702AEAD30D009A7CE9 /* XCUIElement+TestHelpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 16900D6F2AEAD30D009A7CE9 /* XCUIElement+TestHelpers.swift */; };
16900D772AF0417E009A7CE9 /* Frames in Frameworks */ = {isa = PBXBuildFile; productRef = 16900D762AF0417E009A7CE9 /* Frames */; };
169DF1482A7BFB1B00891DF0 /* CardSchemeFormatSnapshotTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 169DF1472A7BFB1B00891DF0 /* CardSchemeFormatSnapshotTests.swift */; };
16C3F8402A7927ED00690639 /* SnapshotTesting in Frameworks */ = {isa = PBXBuildFile; productRef = 16C3F83F2A7927ED00690639 /* SnapshotTesting */; };
16C3F8422A7956EA00690639 /* CardValidationSnapshotTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 16C3F8412A7956EA00690639 /* CardValidationSnapshotTests.swift */; };
Expand Down Expand Up @@ -128,6 +129,7 @@
0BCCBCEC28DC98F600041870 /* ro */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ro; path = ro.lproj/LaunchScreen.strings; sourceTree = "<group>"; };
0BD2ECBE28B65DA10041A942 /* FrameUITests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FrameUITests.swift; sourceTree = "<group>"; };
0BD2ECC028B65EC20041A942 /* XCUIApplication+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "XCUIApplication+Extension.swift"; sourceTree = "<group>"; };
1629C0852AF5640F001BD3D9 /* frames-ios */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = "frames-ios"; path = ..; sourceTree = "<group>"; };
162CD88D2A6827E900027FEF /* XCUIElement+TestHelpers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "XCUIElement+TestHelpers.swift"; sourceTree = "<group>"; };
16857B712A65F15F005CAE39 /* iOS Example Frame Regression Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "iOS Example Frame Regression Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
16857B732A65F15F005CAE39 /* CardTypeTokenCreationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CardTypeTokenCreationTests.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -210,7 +212,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
1629C0772AF04359001BD3D9 /* Frames in Frameworks */,
1629C0892AF5641D001BD3D9 /* Frames in Frameworks */,
16C3F8402A7927ED00690639 /* SnapshotTesting in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand All @@ -219,15 +221,16 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
1629C0752AF04356001BD3D9 /* Frames in Frameworks */,
1629C0872AF56418001BD3D9 /* Frames in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
E6646F8720CE6C0900D8353A /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
16900D772AF0417E009A7CE9 /* Frames in Frameworks */,
1629C0842AF562D4001BD3D9 /* Frames in Frameworks */,
1629C0812AF562A5001BD3D9 /* Frames in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -458,6 +461,7 @@
E6646F8120CE6C0900D8353A = {
isa = PBXGroup;
children = (
1629C0852AF5640F001BD3D9 /* frames-ios */,
CBA81CAA27ABDF21000DF192 /* iOS Example Frame */,
CB9412D82825714C00C889E8 /* iOS Example FrameUITests */,
16857B722A65F15F005CAE39 /* iOS Example Frame Regression Tests */,
Expand Down Expand Up @@ -487,7 +491,7 @@
name = "iOS Example Frame Regression Tests";
packageProductDependencies = (
16C3F83F2A7927ED00690639 /* SnapshotTesting */,
1629C0762AF04359001BD3D9 /* Frames */,
1629C0882AF5641D001BD3D9 /* Frames */,
);
productName = "iOS Example Frame Regression Tests";
productReference = 16857B712A65F15F005CAE39 /* iOS Example Frame Regression Tests.xctest */;
Expand All @@ -508,7 +512,7 @@
);
name = "iOS Example FrameUITests";
packageProductDependencies = (
1629C0742AF04356001BD3D9 /* Frames */,
1629C0862AF56418001BD3D9 /* Frames */,
);
productName = "iOS Example FrameUITests";
productReference = 16AE74C42A5C1EBB0031F794 /* iOS Example FrameUITests.xctest */;
Expand All @@ -528,7 +532,8 @@
);
name = "iOS Example Frame";
packageProductDependencies = (
16900D762AF0417E009A7CE9 /* Frames */,
1629C0802AF562A5001BD3D9 /* Frames */,
1629C0832AF562D4001BD3D9 /* Frames */,
);
productName = "iOS Example Frame";
productReference = 16AE74C32A5C1EBB0031F794 /* iOS Example Frame.app */;
Expand Down Expand Up @@ -577,7 +582,6 @@
mainGroup = E6646F8120CE6C0900D8353A;
packageReferences = (
16C3F83E2A7927ED00690639 /* XCRemoteSwiftPackageReference "swift-snapshot-testing" */,
16900D752AF0417E009A7CE9 /* XCRemoteSwiftPackageReference "frames-ios" */,
);
productRefGroup = E6646F8120CE6C0900D8353A;
projectDirPath = "";
Expand Down Expand Up @@ -1231,14 +1235,6 @@
/* End XCConfigurationList section */

/* Begin XCRemoteSwiftPackageReference section */
16900D752AF0417E009A7CE9 /* XCRemoteSwiftPackageReference "frames-ios" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/checkout/frames-ios";
requirement = {
branch = "update/security-code-component-updates";
kind = branch;
};
};
16C3F83E2A7927ED00690639 /* XCRemoteSwiftPackageReference "swift-snapshot-testing" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/pointfreeco/swift-snapshot-testing";
Expand All @@ -1250,19 +1246,20 @@
/* End XCRemoteSwiftPackageReference section */

/* Begin XCSwiftPackageProductDependency section */
1629C0742AF04356001BD3D9 /* Frames */ = {
1629C0802AF562A5001BD3D9 /* Frames */ = {
isa = XCSwiftPackageProductDependency;
productName = Frames;
};
1629C0832AF562D4001BD3D9 /* Frames */ = {
isa = XCSwiftPackageProductDependency;
package = 16900D752AF0417E009A7CE9 /* XCRemoteSwiftPackageReference "frames-ios" */;
productName = Frames;
};
1629C0762AF04359001BD3D9 /* Frames */ = {
1629C0862AF56418001BD3D9 /* Frames */ = {
isa = XCSwiftPackageProductDependency;
package = 16900D752AF0417E009A7CE9 /* XCRemoteSwiftPackageReference "frames-ios" */;
productName = Frames;
};
16900D762AF0417E009A7CE9 /* Frames */ = {
1629C0882AF5641D001BD3D9 /* Frames */ = {
isa = XCSwiftPackageProductDependency;
package = 16900D752AF0417E009A7CE9 /* XCRemoteSwiftPackageReference "frames-ios" */;
productName = Frames;
};
16C3F83F2A7927ED00690639 /* SnapshotTesting */ = {
Expand Down