Merge branch 'v7' of https://github.com/braintree/braintree_ios into …

…v7-venmo-universal-link # Conflicts: # CHANGELOG.md
braintree · Nov 12, 2024 · dae4473 · dae4473
2 parents ab02597 + 9001cc4
commit dae4473
Show file tree

Hide file tree

Showing 66 changed files with 186 additions and 2,932 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -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
@@ -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 \

diff --git a/Braintree.podspec b/Braintree.podspec
@@ -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"

diff --git a/Braintree.xcodeproj/project.pbxproj b/Braintree.xcodeproj/project.pbxproj
diff --git a/Braintree.xcodeproj/xcshareddata/xcschemes/BraintreePayPalNativeCheckout.xcscheme b/Braintree.xcodeproj/xcshareddata/xcschemes/BraintreePayPalNativeCheckout.xcscheme
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,11 +3,16 @@
 ## unreleased (v7)
 * Breaking Changes
   * Bump minimum supported deployment target to iOS 16+
-* BraintreeVenmo
-  * Update `BTVenmoRequest` to make all properties accessible on the initializer only vs via the dot syntax.
-  * Remove `fallbacktoWeb` property from `BTVenmoRequest`. All Venmo flows will now use universal links to switch to the Venmo app or fallback to the web flow if the Venmo app is not installed
-* BraintreeSEPADirectDebit
-  * Update `BTSEPADirectDebitRequest` to make all properties accessible on the initializer only vs via the dot syntax.
+  * `countryCodeAlpha2` now returns a 2 character country code instead of a 3 character country code 
+  * BraintreePayPalNativeCheckout
+    * Remove entire PayPal Native Checkout module
+  * BraintreeVenmo
+    * Update `BTVenmoRequest` to make all properties accessible on the initializer only vs via the dot syntax.
+    * Remove `fallbacktoWeb` property from `BTVenmoRequest`. All Venmo flows will now use universal links to switch to the Venmo app or fallback to the web flow if the Venmo app is not installed
+  * BraintreeSEPADirectDebit
+    * Update `BTSEPADirectDebitRequest` to make all properties accessible on the initializer only vs via the dot syntax.
+  * BraintreeLocalPayment
+    * Update `BTLocalPaymentRequest` to make all properties accessible on the initializer only vs via the dot syntax.
 
 ## unreleased
 * BraintreePayPal

diff --git a/Cartfile b/Cartfile
@@ -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
diff --git a/Demo/Application/Base/ContainmentViewController.swift b/Demo/Application/Base/ContainmentViewController.swift
@@ -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":

diff --git a/Demo/Application/Base/Settings/BraintreeDemoSettings.swift b/Demo/Application/Base/Settings/BraintreeDemoSettings.swift
@@ -45,9 +45,9 @@ class BraintreeDemoSettings: NSObject {
     static var currentEnvironmentURLString: String {
         switch currentEnvironment {
         case .sandbox, .custom:
-            return "https://braintree-sample-merchant.herokuapp.com"
+            return "https://braintree-demo-merchant-63b7a2204f6e.herokuapp.com/"
         case .production:
-            return "https://executive-sample-merchant.herokuapp.com"
+            return "https://braintree-production-merchant-455d21469113.herokuapp.com/"
         }
     }
 

diff --git a/Demo/Application/Base/Settings/Settings.bundle/Root.plist b/Demo/Application/Base/Settings/Settings.bundle/Root.plist
@@ -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>
@@ -32,7 +31,6 @@
 			</array>
 			<key>Values</key>
 			<array>
-				<string>PayPalNativeCheckoutViewController</string>
 				<string>PayPalWebCheckoutViewController</string>
 				<string>CardTokenizationViewController</string>
 				<string>VenmoViewController</string>

diff --git a/Demo/Application/Features/IdealViewController.swift b/Demo/Application/Features/IdealViewController.swift
@@ -51,24 +51,23 @@ class IdealViewController: PaymentButtonBaseViewController {
         let apiClient = BTAPIClient(authorization: "sandbox_f252zhq7_hh4cpc39zq4rgjcg")!
         localPaymentClient = BTLocalPaymentClient(apiClient: apiClient)
 
-        let request = BTLocalPaymentRequest()
-        request.paymentType = "ideal"
-        request.paymentTypeCountryCode = "NL"
-        request.currencyCode = "EUR"
-        request.amount = "1.01"
-        request.givenName = "Linh"
-        request.surname = "Ngo"
-        request.phone = "639847934"
-        request.email = "[email protected]"
-        request.isShippingAddressRequired = false
-
         let postalAddress = BTPostalAddress()
         postalAddress.countryCodeAlpha2 = "NL"
         postalAddress.postalCode = "2585 GJ"
         postalAddress.streetAddress = "836486 of 22321 Park Lake"
         postalAddress.locality = "Den Haag"
-
-        request.address = postalAddress
+
+        let request = BTLocalPaymentRequest(
+            paymentType: "ideal",
+            amount: "1.01",
+            currencyCode: "EUR",
+            paymentTypeCountryCode: "NL",
+            address: postalAddress,
+            email: "[email protected]",
+            givenName: "Linh",
+            surname: "Ngo",
+            phone: "639847934"
+        )
         request.localPaymentFlowDelegate = self
 
         localPaymentClient.startPaymentFlow(request) { result, error in

diff --git a/Demo/Application/Features/PayPalNativeCheckoutViewController.swift b/Demo/Application/Features/PayPalNativeCheckoutViewController.swift