Skip to content

Commit

Permalink
Merge pull request #511 from checkout/update/include-package-revisions
Browse files Browse the repository at this point in the history
Include Package.resolved into git as per Apple recommendation
  • Loading branch information
okhan-okbay-cko authored Feb 7, 2024
2 parents 5ca1a1d + 3ec82ad commit e1fb756
Show file tree
Hide file tree
Showing 5 changed files with 100 additions and 4 deletions.
5 changes: 2 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -132,8 +132,7 @@ iOSInjectionProject/
### SwiftPM ###
Packages
xcuserdata
Package.resolved
*/Package.resolved
## */Package.resolved
IDEWorkspaceChecks.plist


Expand All @@ -148,7 +147,7 @@ contents.xcworkspacedata
/*.gcno

### Xcode Patch ###
*.xcodeproj/project.workspace/xcshareddata/swiftpm/Package.resolved
## *.xcodeproj/project.workspace/xcshareddata/swiftpm/Package.resolved
*.xcodeproj/*
!*.xcodeproj/project.pbxproj
*/IDEWorkspaceChecks.plist
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"pins" : [
{
"identity" : "checkout-event-logger-ios-framework",
"kind" : "remoteSourceControl",
"location" : "https://github.com/checkout/checkout-event-logger-ios-framework.git",
"state" : {
"revision" : "a914d754b4ffb1843730e8e1f8e7e60c4bf81cf9",
"version" : "1.2.4"
}
},
{
"identity" : "frames-ios",
"kind" : "remoteSourceControl",
"location" : "https://github.com/checkout/frames-ios",
"state" : {
"revision" : "24a4585e5b7da1cc4b062e5aeadc63f1c9024db4",
"version" : "4.2.0"
}
},
{
"identity" : "phonenumberkit",
"kind" : "remoteSourceControl",
"location" : "https://github.com/marmelroy/PhoneNumberKit.git",
"state" : {
"revision" : "6edd6e38a30aec087cb97f7377edf876c29a427e",
"version" : "3.5.9"
}
}
],
"version" : 2
}
23 changes: 23 additions & 0 deletions Package.resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"pins" : [
{
"identity" : "checkout-event-logger-ios-framework",
"kind" : "remoteSourceControl",
"location" : "https://github.com/checkout/checkout-event-logger-ios-framework.git",
"state" : {
"revision" : "a914d754b4ffb1843730e8e1f8e7e60c4bf81cf9",
"version" : "1.2.4"
}
},
{
"identity" : "phonenumberkit",
"kind" : "remoteSourceControl",
"location" : "https://github.com/marmelroy/PhoneNumberKit.git",
"state" : {
"revision" : "6edd6e38a30aec087cb97f7377edf876c29a427e",
"version" : "3.5.9"
}
}
],
"version" : 2
}
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ final class ExpiryDateEdgeCaseTests: XCTestCase {
}

let previousMonthDate = Calendar.current.date(byAdding: .month, value: -1, to: Date())!
let previousMonth = String(Calendar.current.component(.month, from: previousMonthDate))
var previousMonth = String(Calendar.current.component(.month, from: previousMonthDate))
previousMonth = previousMonth.count == 1 ? "0" + previousMonth : previousMonth
let currentYear = String(Calendar.current.component(.year, from: Date())).suffix(2)

let expiryTextField = app.otherElements[AccessibilityIdentifiers.PaymentForm.cardExpiry]
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
{
"pins" : [
{
"identity" : "checkout-event-logger-ios-framework",
"kind" : "remoteSourceControl",
"location" : "https://github.com/checkout/checkout-event-logger-ios-framework.git",
"state" : {
"revision" : "a914d754b4ffb1843730e8e1f8e7e60c4bf81cf9",
"version" : "1.2.4"
}
},
{
"identity" : "frames-ios",
"kind" : "remoteSourceControl",
"location" : "https://github.com/checkout/frames-ios",
"state" : {
"revision" : "347e873ff9702d5783709bed5d4b6b28adfca3ab",
"version" : "4.3.1"
}
},
{
"identity" : "phonenumberkit",
"kind" : "remoteSourceControl",
"location" : "https://github.com/marmelroy/PhoneNumberKit.git",
"state" : {
"revision" : "6edd6e38a30aec087cb97f7377edf876c29a427e",
"version" : "3.5.9"
}
},
{
"identity" : "swift-snapshot-testing",
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/swift-snapshot-testing",
"state" : {
"revision" : "26ed3a2b4a2df47917ca9b790a57f91285b923fb",
"version" : "1.12.0"
}
}
],
"version" : 2
}

0 comments on commit e1fb756

Please sign in to comment.