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

[V7] Remove MXO #1454

Merged
merged 23 commits into from
Nov 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 1 addition & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,6 @@ jobs:

# run sourcekitten on each Swift module individually
sourcekitten doc -- -workspace Braintree.xcworkspace -scheme BraintreeCore -destination 'name=iPhone 14,platform=iOS Simulator' > braintree-core.json
sourcekitten doc -- -workspace Braintree.xcworkspace -scheme BraintreePayPalNativeCheckout -destination 'name=iPhone 14,platform=iOS Simulator' > braintree-pay-pal-native-checkout.json
sourcekitten doc -- -workspace Braintree.xcworkspace -scheme BraintreeSEPADirectDebit -destination 'name=iPhone 14,platform=iOS Simulator' > braintree-sepa-direct-debit.json
sourcekitten doc -- -workspace Braintree.xcworkspace -scheme BraintreeAmericanExpress -destination 'name=iPhone 14,platform=iOS Simulator' > braintree-american-express.json
sourcekitten doc -- -workspace Braintree.xcworkspace -scheme BraintreeDataCollector -destination 'name=iPhone 14,platform=iOS Simulator' > braintree-data-collector.json
Expand All @@ -114,7 +113,7 @@ jobs:
sourcekitten doc -- -workspace Braintree.xcworkspace -scheme BraintreeShopperInsights -destination 'name=iPhone 14,platform=iOS Simulator' > braintree-shopper-insights.json

# merge sourcekitten output
jq -s '.[0] + .[1] + .[2] + .[3] + .[4] + .[5] + .[6] + .[7] + .[8] + .[9] + .[10] + .[11] + .[12]' braintree-core.json braintree-pay-pal-native-checkout.json braintree-sepa-direct-debit.json braintree-american-express.json braintree-data-collector.json braintree-apple-pay.json braintree-local-payment.json braintree-three-d-secure.json braintree-card.json braintree-paypal.json braintree-venmo.json braintree-paypal-messaging.json braintree-shopper-insights.json > swiftDoc.json
jq -s '.[0] + .[1] + .[2] + .[3] + .[4] + .[5] + .[6] + .[7] + .[8] + .[9] + .[10] + .[11] + .[12]' braintree-core.json braintree-sepa-direct-debit.json braintree-american-express.json braintree-data-collector.json braintree-apple-pay.json braintree-local-payment.json braintree-three-d-secure.json braintree-card.json braintree-paypal.json braintree-venmo.json braintree-paypal-messaging.json braintree-shopper-insights.json > swiftDoc.json

jazzy \
--sourcekitten-sourcefile swiftDoc.json \
Expand Down
8 changes: 0 additions & 8 deletions Braintree.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -79,14 +79,6 @@ Pod::Spec.new do |s|
s.resource_bundle = { "BraintreeShopperInsights_PrivacyInfo" => "Sources/BraintreeShopperInsights/PrivacyInfo.xcprivacy" }
end

s.subspec "PayPalNativeCheckout" do |s|
s.source_files = "Sources/BraintreePayPalNativeCheckout/**/*.{swift}"
s.dependency "Braintree/Core"
s.dependency "Braintree/PayPal"
s.dependency "PayPalCheckout", '1.3.0'
s.resource_bundle = { "BraintreePayPalNativeCheckout_PrivacyInfo" => "Sources/BraintreePayPalNativeCheckout/PrivacyInfo.xcprivacy" }
end

s.subspec "PayPalMessaging" do |s|
s.source_files = "Sources/BraintreePayPalMessaging/**/*.{swift}"
s.dependency "Braintree/Core"
Expand Down
526 changes: 0 additions & 526 deletions Braintree.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

This file was deleted.

2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
## unreleased (v7)
* Breaking Changes
* Bump minimum supported deployment target to iOS 16+
* BraintreePayPalNativeCheckout
* Remove entire PayPal Native Checkout module
* BraintreeVenmo
* Update `BTVenmoRequest` to make all properties accessible on the initializer only vs via the dot syntax.
* BraintreeSEPADirectDebit
Expand Down
1 change: 0 additions & 1 deletion Cartfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
binary "https://assets.braintreegateway.com/mobile/ios/carthage-frameworks/cardinal-mobile/CardinalMobile.json" == 2.2.5-9
binary "https://assets.braintreegateway.com/mobile/ios/carthage-frameworks/pp-risk-magnes/PPRiskMagnes.json" == 5.5.0-static-Xcode15-MinOSVersion100
binary "https://github.com/paypal/paypalcheckout-ios/raw/main/Carthage/PayPalCheckout.json" == 1.3.0
binary "https://github.com/paypal/paypal-messages-ios/raw/main/Carthage/PayPalMessages.json" == 1.0.0
2 changes: 0 additions & 2 deletions Demo/Application/Base/ContainmentViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -231,8 +231,6 @@ class ContainmentViewController: UIViewController {
return DataCollectorViewController(authorization: authorization)
case "IdealViewController":
return IdealViewController(authorization: authorization)
case "PayPalNativeCheckoutViewController":
return PayPalNativeCheckoutViewController(authorization: authorization)
case "PayPalWebCheckoutViewController":
return PayPalWebCheckoutViewController(authorization: authorization)
case "SEPADirectDebitViewController":
Expand Down
2 changes: 0 additions & 2 deletions Demo/Application/Base/Settings/Settings.bundle/Root.plist
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
<string>BraintreeDemoCardTokenizationViewController</string>
<key>Titles</key>
<array>
<string>PayPal - Native Checkout</string>
<string>PayPal - Web Checkout</string>
<string>Credit Card Tokenization</string>
<string>Venmo - Custom Button</string>
Expand All @@ -32,7 +31,6 @@
</array>
<key>Values</key>
<array>
<string>PayPalNativeCheckoutViewController</string>
<string>PayPalWebCheckoutViewController</string>
<string>CardTokenizationViewController</string>
<string>VenmoViewController</string>
Expand Down

This file was deleted.

27 changes: 0 additions & 27 deletions Demo/Demo.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@
42C574D525FA6CAC008B3681 /* AppSwitcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = 42C574D425FA6CAC008B3681 /* AppSwitcher.swift */; };
42C5BDD625A4CE4800E8FF40 /* AmericanExpress_UITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 42C5BDD525A4CE4800E8FF40 /* AmericanExpress_UITests.swift */; };
45DDDDA92C08FB0B00C262E5 /* PayPalMessages in Frameworks */ = {isa = PBXBuildFile; productRef = 45DDDDA82C08FB0B00C262E5 /* PayPalMessages */; };
57108A152832E789004EB870 /* PayPalNativeCheckoutViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57108A142832E789004EB870 /* PayPalNativeCheckoutViewController.swift */; };
57108A172832EA04004EB870 /* BraintreePayPalNativeCheckout.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 57108A162832EA04004EB870 /* BraintreePayPalNativeCheckout.framework */; };
57108A182832EA04004EB870 /* BraintreePayPalNativeCheckout.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 57108A162832EA04004EB870 /* BraintreePayPalNativeCheckout.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
62240F5A2B67FE1100ECE5C9 /* TextFieldWithLabel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 62240F592B67FE1100ECE5C9 /* TextFieldWithLabel.swift */; };
8025988D2CC1A95400E7D898 /* Toggle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8025988C2CC1A95400E7D898 /* Toggle.swift */; };
8028B9762B28C9E100C88CE8 /* ShopperInsightsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8028B9752B28C9E100C88CE8 /* ShopperInsightsViewController.swift */; };
Expand Down Expand Up @@ -63,7 +60,6 @@
BE35FCD82A1BD162008F0326 /* BraintreeLocalPayment.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BE35FCD72A1BD162008F0326 /* BraintreeLocalPayment.framework */; };
BE35FCD92A1BD162008F0326 /* BraintreeLocalPayment.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = BE35FCD72A1BD162008F0326 /* BraintreeLocalPayment.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
BE45D7162AD97C340047E2C7 /* ContainmentViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE45D7152AD97C340047E2C7 /* ContainmentViewController.swift */; };
BE6442D12B4DE2B00096E562 /* PayPalCheckout in Frameworks */ = {isa = PBXBuildFile; productRef = BE6442D02B4DE2B00096E562 /* PayPalCheckout */; };
BE67CDC02B29FF7B00BA4904 /* PayPalMessagingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE67CDBF2B29FF7B00BA4904 /* PayPalMessagingViewController.swift */; };
BE67CDC22B2A023F00BA4904 /* BraintreePayPalMessaging.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BE67CDC12B2A023F00BA4904 /* BraintreePayPalMessaging.framework */; };
BE67CDC32B2A023F00BA4904 /* BraintreePayPalMessaging.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = BE67CDC12B2A023F00BA4904 /* BraintreePayPalMessaging.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
Expand Down Expand Up @@ -117,7 +113,6 @@
BE9BD75A28872E4D00022983 /* BraintreeSEPADirectDebit.framework in Embed Frameworks */,
803D64FC256DAF9A00ACE692 /* BraintreeCore.framework in Embed Frameworks */,
BE67CDC32B2A023F00BA4904 /* BraintreePayPalMessaging.framework in Embed Frameworks */,
57108A182832EA04004EB870 /* BraintreePayPalNativeCheckout.framework in Embed Frameworks */,
BE35FCD92A1BD162008F0326 /* BraintreeLocalPayment.framework in Embed Frameworks */,
803D6504256DAF9A00ACE692 /* BraintreeThreeDSecure.framework in Embed Frameworks */,
803D6502256DAF9A00ACE692 /* BraintreePayPal.framework in Embed Frameworks */,
Expand All @@ -144,8 +139,6 @@
42C5BDD525A4CE4800E8FF40 /* AmericanExpress_UITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AmericanExpress_UITests.swift; sourceTree = "<group>"; };
42F3F6DB2603B83100401B0D /* CardinalMobile.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = CardinalMobile.xcframework; path = ../Frameworks/CardinalMobile.xcframework; sourceTree = "<group>"; };
570B93D32853A6D30041BAFE /* BraintreeCoreSwift.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = BraintreeCoreSwift.framework; sourceTree = BUILT_PRODUCTS_DIR; };
57108A142832E789004EB870 /* PayPalNativeCheckoutViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PayPalNativeCheckoutViewController.swift; sourceTree = "<group>"; };
57108A162832EA04004EB870 /* BraintreePayPalNativeCheckout.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = BraintreePayPalNativeCheckout.framework; sourceTree = BUILT_PRODUCTS_DIR; };
62240F592B67FE1100ECE5C9 /* TextFieldWithLabel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextFieldWithLabel.swift; sourceTree = "<group>"; };
6D23244B5E9EE59BAB3F3003 /* Pods_Demo.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Demo.framework; sourceTree = BUILT_PRODUCTS_DIR; };
73498B4265CA7D315E2FBF38 /* Pods-Demo.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Demo.debug.xcconfig"; path = "Target Support Files/Pods-Demo/Pods-Demo.debug.xcconfig"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -219,12 +212,10 @@
files = (
45DDDDA92C08FB0B00C262E5 /* PayPalMessages in Frameworks */,
BE67CDC22B2A023F00BA4904 /* BraintreePayPalMessaging.framework in Frameworks */,
57108A172832EA04004EB870 /* BraintreePayPalNativeCheckout.framework in Frameworks */,
803D64FB256DAF9A00ACE692 /* BraintreeCore.framework in Frameworks */,
9C36BD4C26B311D900F0A559 /* CardinalMobile.xcframework in Frameworks */,
803D64F5256DAF9A00ACE692 /* BraintreeAmericanExpress.framework in Frameworks */,
BE35FCD82A1BD162008F0326 /* BraintreeLocalPayment.framework in Frameworks */,
BE6442D12B4DE2B00096E562 /* PayPalCheckout in Frameworks */,
BE9BD75928872E4D00022983 /* BraintreeSEPADirectDebit.framework in Frameworks */,
9C36BD2926B3071B00F0A559 /* PPRiskMagnes.xcframework in Frameworks */,
803D6501256DAF9A00ACE692 /* BraintreePayPal.framework in Frameworks */,
Expand Down Expand Up @@ -365,7 +356,6 @@
BEE930482A98FE9200C85779 /* DataCollectorViewController.swift */,
BEAAAA332A98E5E6001ECA63 /* IdealViewController.swift */,
BE67CDBF2B29FF7B00BA4904 /* PayPalMessagingViewController.swift */,
57108A142832E789004EB870 /* PayPalNativeCheckoutViewController.swift */,
BED7C4C92ABDD35700EF8550 /* PayPalWebCheckoutViewController.swift */,
BE777AC327D9370400487D23 /* SEPADirectDebitViewController.swift */,
8028B9752B28C9E100C88CE8 /* ShopperInsightsViewController.swift */,
Expand Down Expand Up @@ -393,7 +383,6 @@
570B93D32853A6D30041BAFE /* BraintreeCoreSwift.framework */,
BE24C66A28E490F30067B11A /* PayPalCheckout.xcframework */,
BE9BD75828872E4D00022983 /* BraintreeSEPADirectDebit.framework */,
57108A162832EA04004EB870 /* BraintreePayPalNativeCheckout.framework */,
9C36BD2826B3071A00F0A559 /* PPRiskMagnes.xcframework */,
42F3F6DB2603B83100401B0D /* CardinalMobile.xcframework */,
803D64EA256DAF9A00ACE692 /* BraintreeAmericanExpress.framework */,
Expand Down Expand Up @@ -510,7 +499,6 @@
);
name = Demo;
packageProductDependencies = (
BE6442D02B4DE2B00096E562 /* PayPalCheckout */,
45DDDDA82C08FB0B00C262E5 /* PayPalMessages */,
);
productName = Demo;
Expand Down Expand Up @@ -588,7 +576,6 @@
);
mainGroup = A0988E4024DB43DC0095EEEE;
packageReferences = (
BE6442CF2B4DE2B00096E562 /* XCRemoteSwiftPackageReference "paypalcheckout-ios" */,
45DDDDA72C08FB0B00C262E5 /* XCRemoteSwiftPackageReference "paypal-messages-ios" */,
);
productRefGroup = A0988E4A24DB43DC0095EEEE /* Products */;
Expand Down Expand Up @@ -708,7 +695,6 @@
BE994B0B2AD8377D00470773 /* BaseViewController.swift in Sources */,
80D36DEE2A7967F20035380E /* VenmoViewController.swift in Sources */,
BEE930492A98FE9200C85779 /* DataCollectorViewController.swift in Sources */,
57108A152832E789004EB870 /* PayPalNativeCheckoutViewController.swift in Sources */,
BEBD52832AAB62FB005D6687 /* ApplePayViewController.swift in Sources */,
BEAAAD052970A70D000BD296 /* BTSEPADirectDebitTestHelper.swift in Sources */,
809E86A62AD00AF4004998B0 /* AppDelegate.swift in Sources */,
Expand Down Expand Up @@ -1083,14 +1069,6 @@
minimumVersion = 1.0.0;
};
};
BE6442CF2B4DE2B00096E562 /* XCRemoteSwiftPackageReference "paypalcheckout-ios" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/paypal/paypalcheckout-ios/";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 1.3.0;
};
};
/* End XCRemoteSwiftPackageReference section */

/* Begin XCSwiftPackageProductDependency section */
Expand All @@ -1099,11 +1077,6 @@
package = 45DDDDA72C08FB0B00C262E5 /* XCRemoteSwiftPackageReference "paypal-messages-ios" */;
productName = PayPalMessages;
};
BE6442D02B4DE2B00096E562 /* PayPalCheckout */ = {
isa = XCSwiftPackageProductDependency;
package = BE6442CF2B4DE2B00096E562 /* XCRemoteSwiftPackageReference "paypalcheckout-ios" */;
productName = PayPalCheckout;
};
/* End XCSwiftPackageProductDependency section */
};
rootObject = A0988E4124DB43DC0095EEEE /* Project object */;
Expand Down
Loading
Loading