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

Bump braintree_ios to 5.25.0 #448

Merged
merged 4 commits into from
Apr 11, 2024
Merged

Bump braintree_ios to 5.25.0 #448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a914488
update podspec and Package.swift 5.25.0
KunJeongPark Apr 11, 2024
658e5ca
Changelog entry
KunJeongPark Apr 11, 2024
c0f1b0b
remove BraintreeDropIn.xcodeproj/project.xcworkspace/xcshareddata/IDE…
KunJeongPark Apr 11, 2024
b65dcf5
workspace swift package resolve
KunJeongPark Apr 11, 2024
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
14 changes: 7 additions & 7 deletions BraintreeDropIn.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@ Pod::Spec.new do |s|
s.source_files = "Sources/BraintreeDropIn/**/*.{h,m}"
s.public_header_files = "Sources/BraintreeDropIn/Public/BraintreeDropIn/*.h"
s.frameworks = "UIKit"
s.dependency "Braintree/ApplePay", "~> 5.23"
s.dependency "Braintree/Card", "~> 5.23"
s.dependency "Braintree/Core", "~> 5.23"
s.dependency "Braintree/UnionPay", "~> 5.23"
s.dependency "Braintree/PayPal", "~> 5.23"
s.dependency "Braintree/ThreeDSecure", "~> 5.23"
s.dependency "Braintree/Venmo", "~> 5.23"
s.dependency "Braintree/ApplePay", "~> 5.25"
s.dependency "Braintree/Card", "~> 5.25"
s.dependency "Braintree/Core", "~> 5.25"
s.dependency "Braintree/UnionPay", "~> 5.25"
s.dependency "Braintree/PayPal", "~> 5.25"
s.dependency "Braintree/ThreeDSecure", "~> 5.25"
s.dependency "Braintree/Venmo", "~> 5.25"
s.resource_bundles = {
"BraintreeDropIn-Localization" => ["Sources/BraintreeDropIn/Resources/*.lproj"],
"BraintreeDropIn_PrivacyInfo" => ["Sources/BraintreeDropIn/PrivacyInfo.xcprivacy"]
Expand Down
42 changes: 20 additions & 22 deletions BraintreeDropIn.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,23 @@
{
"object": {
"pins": [
{
"package": "Braintree",
"repositoryURL": "https://github.com/braintree/braintree_ios",
"state": {
"branch": null,
"revision": "3924f5ea0295087081e7e637fbf1333361e7054b",
"version": "5.23.0"
}
},
{
"package": "InAppSettingsKit",
"repositoryURL": "https://github.com/futuretap/InAppSettingsKit.git",
"state": {
"branch": null,
"revision": "71e03ebad8462618f96c575c86d2e9220f880676",
"version": "3.3.2"
}
"pins" : [
{
"identity" : "braintree_ios",
"kind" : "remoteSourceControl",
"location" : "https://github.com/braintree/braintree_ios",
"state" : {
"revision" : "619e78a9ab9423be4871baf406546c22573086cf",
"version" : "5.25.0"
}
]
},
"version": 1
},
{
"identity" : "inappsettingskit",
"kind" : "remoteSourceControl",
"location" : "https://github.com/futuretap/InAppSettingsKit.git",
"state" : {
"revision" : "71e03ebad8462618f96c575c86d2e9220f880676",
"version" : "3.3.2"
}
}
],
"version" : 2
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we do some digging and just make sure there aren't any issues moving this to version 2?

Copy link
Contributor Author

@KunJeongPark KunJeongPark Apr 11, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, that's what I am looking up. They are also missing the "object" key that was there before.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I found this post: https://forums.swift.org/t/using-swiftpm-5-6-and-supporting-older-versions/55708

Copy link
Contributor Author

@KunJeongPark KunJeongPark Apr 11, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Apparently, version 2 is not compatible with Swift versions prior to 5.6.
It is recommended by a few people here is to add Package.resolved to .gitignore file
It is also mentioned that we could "force" v1.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We want to leave it so that we are all using the same version as far as adding it to the .gitignore. Lets run a test on 15.0 which is our minimally supported Xcode version in the SDK. If that looks good we can apply this change as is.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

SPMTest looks good with Xcode 15.0 pointing to this branch.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for triple checking! ❤️

}
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
## unreleased
* Require Xcode 15.0+ and Swift 5.9+ (per [App Store requirements](https://developer.apple.com/news/?id=khzvxn8a))
* [Meets Apple's new Privacy Update requirements](https://developer.apple.com/news/?id=3d8a9yyh)
* Require `braintree_ios` 5.25.0

## 9.11.0 (2024-02-06)
* Add Slovak language support
Expand Down
24 changes: 11 additions & 13 deletions Package.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
{
"object": {
"pins": [
{
"package": "Braintree",
"repositoryURL": "https://github.com/braintree/braintree_ios",
"state": {
"branch": null,
"revision": "3924f5ea0295087081e7e637fbf1333361e7054b",
"version": "5.23.0"
}
"pins" : [
{
"identity" : "braintree_ios",
"kind" : "remoteSourceControl",
"location" : "https://github.com/braintree/braintree_ios",
"state" : {
"revision" : "619e78a9ab9423be4871baf406546c22573086cf",
"version" : "5.25.0"
}
]
},
"version": 1
}
],
"version" : 2
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same question here on just triple checking this won't causes issues moving from v1 to v2

}
2 changes: 1 addition & 1 deletion Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ let package = Package(
)
],
dependencies: [
.package(name: "Braintree", url: "https://github.com/braintree/braintree_ios", from: "5.23.0")
.package(name: "Braintree", url: "https://github.com/braintree/braintree_ios", from: "5.25.0")
],
targets: [
// Targets are the basic building blocks of a package. A target can define a module or a test suite.
Expand Down
Loading