Skip to content

Commit

Permalink
Merge pull request #496 from checkout/develop-premerge
Browse files Browse the repository at this point in the history 
Resolve merge conflicts of main to develop PR
  • Loading branch information
@okhan-okbay-cko
okhan-okbay-cko authored Nov 6, 2023
2 parents aba7b3f + 586de64 commit f1c4997
Showing 1 changed file with 21 additions and 24 deletions.
45 changes: 21 additions & 24 deletions iOS Example Frame SPM/iOS Example Frame SPM.xcodeproj/project.pbxproj
View file
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

0 comments on commit f1c4997

Please sign in to comment.