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.

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

[Link] StripePaymentSheet depends on StripeLinkCore #2351

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 24.0.0 yyyy-mm-dd
Copy link
Contributor

Choose a reason for hiding this comment

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

leave this as x.x.x yyyy-mm-dd the release script will replace it with the right version/date

### PaymentSheet
* `StripePaymentSheet` now requires `StripeLinkCore`. See `MIGRATING.md` for more info.

## 23.5.0 2023-03-13
### Payments
* [Added] API bindings support for Cash App Pay. See the docs [here](https://stripe.com/docs/payments/cash-app-pay/accept-a-payment?platform=mobile).
Expand Down
1 change: 1 addition & 0 deletions Example/Non-Card Payment Examples/Project.swift
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ let project = Project(
entitlements: "Non-Card Payment Examples/Non-Card Payment Examples.entitlements",
dependencies: [
.project(target: "StripeCore", path: "//StripeCore"),
.project(target: "StripeLinkCore", path: "//StripeLinkCore"),
.project(target: "StripeUICore", path: "//StripeUICore"),
.project(target: "StripeApplePay", path: "//StripeApplePay"),
.project(target: "Stripe3DS2", path: "//Stripe3DS2"),
Expand Down
1 change: 1 addition & 0 deletions Example/PaymentSheet Example/Project.swift
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ let project = Project(
resources: "PaymentSheet Example/Resources/**",
dependencies: [
.project(target: "StripeCore", path: "//StripeCore"),
.project(target: "StripeLinkCore", path: "//StripeLinkCore"),
.project(target: "StripeUICore", path: "//StripeUICore"),
.project(target: "StripeApplePay", path: "//StripeApplePay"),
.project(target: "Stripe3DS2", path: "//Stripe3DS2"),
Expand Down
3 changes: 3 additions & 0 deletions MIGRATING.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
## Migration Guides
### Migrating from versions < 24.0.0
* `StripePaymentSheet` now requires `StripeLinkCore`. If you are manually installing `StripePaymentSheet`, you will need to include `StripeLinkCore.xcframework`, which can be found in the [release assets](https://github.com/stripe/stripe-ios/releases/tag/24.0.0) for version 24.0.0 of the SDK. If you are using CocoaPods or Swift Package Manager, this dependency will be imported automatically.

### Migrating from versions < 23.0.0
* The `Stripe` module is now split between `StripePaymentSheet`, `StripePayments`, and `StripePaymentsUI`. Some manual changes may be required. Migration instructions are available at [https://stripe.com/docs/mobile/ios/sdk-23-migration](https://stripe.com/docs/mobile/ios/sdk-23-migration).
* [Changed] If you use PaymentSheet, you must now `import StripePaymentSheet`. PaymentSheet users no longer need to import the `Stripe` module.
Expand Down
4 changes: 2 additions & 2 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ let package = Package(
),
.target(
name: "StripePaymentSheet",
dependencies: ["StripePaymentsUI", "StripeApplePay", "StripePayments", "StripeCore", "StripeUICore"],
dependencies: ["StripePaymentsUI", "StripeApplePay", "StripePayments", "StripeCore", "StripeUICore", "StripeLinkCore"],
path: "StripePaymentSheet/StripePaymentSheet",
exclude: ["Info.plist"],
resources: [
Expand All @@ -147,7 +147,7 @@ let package = Package(
),
.target(
name: "StripeLinkCore",
//dependencies: ["StripeCore"],
dependencies: ["StripeCore"],
path: "StripeLinkCore/StripeLinkCore",
exclude: ["Info.plist"]
)
Expand Down
2 changes: 1 addition & 1 deletion StripeLinkCore.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ Pod::Spec.new do |s|
s.swift_version = '5.0'
s.weak_framework = 'SwiftUI'
s.source_files = 'StripeLinkCore/StripeLinkCore/**/*.swift'
# s.dependency 'StripeCore', s.version.to_s
s.dependency 'StripeCore', s.version.to_s
end
4 changes: 2 additions & 2 deletions StripeLinkCore/Project.swift
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ import ProjectDescriptionHelpers
let project = Project.stripeFramework(
name: "StripeLinkCore",
dependencies: [
// .project(target: "StripeCore", path: "//StripeCore"),
.project(target: "StripeCore", path: "//StripeCore"),
],
unitTestOptions: .testOptions(
dependencies: [
// .project(target: "StripeCoreTestUtils", path: "//StripeCore"),
.project(target: "StripeCoreTestUtils", path: "//StripeCore"),
]
)
)
1 change: 1 addition & 0 deletions StripePaymentSheet.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ Pod::Spec.new do |s|
s.source_files = 'StripePaymentSheet/StripePaymentSheet/Source/**/*.swift'
s.ios.resource_bundle = { 'StripePaymentSheet' => 'StripePaymentSheet/StripePaymentSheet/Resources/**/*.{lproj,png,xcassets,json}' }
s.dependency 'StripeCore', s.version.to_s
s.dependency 'StripeLinkCore', s.version.to_s
s.dependency 'StripePayments', s.version.to_s
s.dependency 'StripePaymentsUI', s.version.to_s
s.dependency 'StripeApplePay', s.version.to_s
Expand Down
1 change: 1 addition & 0 deletions StripePaymentSheet/Project.swift
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ let project = Project.stripeFramework(
dependencies: [
.project(target: "StripeCore", path: "//StripeCore"),
.project(target: "StripeUICore", path: "//StripeUICore"),
.project(target: "StripeLinkCore", path: "//StripeLinkCore"),
.project(target: "Stripe3DS2", path: "//Stripe3DS2"),
.project(target: "StripeApplePay", path: "//StripeApplePay"),
.project(target: "StripePayments", path: "//StripePayments"),
Expand Down
1 change: 1 addition & 0 deletions StripePaymentSheet/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ Get started with our [📚 integration guides](https://stripe.com/docs/payments/
If you link this library manually, use a version from our [releases](https://github.com/stripe/stripe-ios/releases) page and make sure to embed <ins>all</ins> of the following frameworks:
- `StripeCore.xcframework`
- `StripeUICore.xcframework`
- `StripeLinkCore.xcframework`
- `Stripe3DS2.xcframework`
- `StripePayments.xcframework`
- `StripePaymentsUI.xcframework`
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
objects = {

/* Begin PBXBuildFile section */
005B83F229B0098B002E5314 /* StripeLinkCore.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 005B83F129B0098B002E5314 /* StripeLinkCore.xcframework */; };
04E6FCE71B714AC2000C8759 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04E6FCE61B714AC2000C8759 /* AppDelegate.swift */; };
04E6FCE91B714AC2000C8759 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04E6FCE81B714AC2000C8759 /* ViewController.swift */; };
04E6FCEC1B714AC2000C8759 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 04E6FCEA1B714AC2000C8759 /* Main.storyboard */; };
Expand Down Expand Up @@ -63,6 +64,7 @@
/* End PBXCopyFilesBuildPhase section */

/* Begin PBXFileReference section */
005B83F129B0098B002E5314 /* StripeLinkCore.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = StripeLinkCore.xcframework; path = Carthage/Build/StripeLinkCore.xcframework; sourceTree = "<group>"; };
04E6FCE11B714AC2000C8759 /* CarthageTest.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = CarthageTest.app; sourceTree = BUILT_PRODUCTS_DIR; };
04E6FCE51B714AC2000C8759 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
04E6FCE61B714AC2000C8759 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -104,6 +106,7 @@
3137B69427437E3500CE7F5C /* StripeApplePay.xcframework in Frameworks */,
E6AA24ED2744ABE000FD205E /* StripeCameraCore.xcframework in Frameworks */,
E6A36A5C26BA4E0E002A4427 /* StripeIdentity.xcframework in Frameworks */,
005B83F229B0098B002E5314 /* StripeLinkCore.xcframework in Frameworks */,
31CA744B25CCC669007FE8BF /* Stripe3DS2.xcframework in Frameworks */,
E6AFFAF526E972950067462F /* StripeUICore.xcframework in Frameworks */,
);
Expand Down Expand Up @@ -193,6 +196,7 @@
E6F05EA92687C76F00614D61 /* StripeCore.xcframework */,
3C4D20AC273C673200BC6444 /* StripeFinancialConnections.xcframework */,
3BD9808E27431DFE00B09BCD /* StripeCardScan.xcframework */,
005B83F129B0098B002E5314 /* StripeLinkCore.xcframework */,
);
name = Frameworks;
sourceTree = "<group>";
Expand Down
37 changes: 19 additions & 18 deletions Tests/installation_tests/cocoapods/with_frameworks_objc/Podfile
Original file line number Diff line number Diff line change
@@ -1,24 +1,25 @@
use_frameworks!

target 'CocoapodsTest' do
platform :ios, '13.0'
use_frameworks!
pod 'Stripe', path: '../../../..'
pod 'StripeCore', path: '../../../..'
pod 'StripeApplePay', path: '../../../..'
pod 'StripeUICore', path: '../../../..'
pod 'StripeCardScan', path: '../../../..'
pod 'StripePayments', path: '../../../..'
pod 'StripePaymentsUI', path: '../../../..'
pod 'StripePaymentSheet', path: '../../../..'
platform :ios, '13.0'
use_frameworks!
pod 'Stripe', path: '../../../..'
pod 'StripeCore', path: '../../../..'
pod 'StripeApplePay', path: '../../../..'
pod 'StripeUICore', path: '../../../..'
pod 'StripeLinkCore', path: '../../../..'
pod 'StripeCardScan', path: '../../../..'
pod 'StripePayments', path: '../../../..'
pod 'StripePaymentsUI', path: '../../../..'
pod 'StripePaymentSheet', path: '../../../..'

post_install do |installer|
installer.pods_project.build_configurations.each do |config|
config.build_settings['GCC_TREAT_WARNINGS_AS_ERRORS'] = "YES"
end
end
post_install do |installer|
installer.pods_project.build_configurations.each do |config|
config.build_settings['GCC_TREAT_WARNINGS_AS_ERRORS'] = 'YES'
end
end

target 'CocoapodsTestTests' do
inherit! :search_paths
end
target 'CocoapodsTestTests' do
inherit! :search_paths
end
end
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ target 'CocoapodsTest' do
pod 'StripeCameraCore', path: '../../../..'
pod 'StripeCore', path: '../../../..'
pod 'StripeUICore', path: '../../../..'
pod 'StripeLinkCore', path: '../../../..'
pod 'StripePayments', path: '../../../..'
pod 'StripePaymentsUI', path: '../../../..'
pod 'StripePaymentSheet', path: '../../../..'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ target 'CocoapodsTest' do
pod 'StripeCore', path: '../../../..'
pod 'StripeApplePay', path: '../../../..'
pod 'StripeUICore', path: '../../../..'
pod 'StripeLinkCore', path: '../../../..'
pod 'StripeCardScan', path: '../../../..'
pod 'StripePayments', path: '../../../..'
pod 'StripePaymentsUI', path: '../../../..'
Expand Down