resolve merge conflicts

braintree · Nov 12, 2024 · 208840f · 208840f
2 parents 0d5d4e0 + 9001cc4
commit 208840f
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 154 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## unreleased (v7)
 * Breaking Changes
   * Bump minimum supported deployment target to iOS 16+
+  * `countryCodeAlpha2` now returns a 2 character country code instead of a 3 character country code 
   * BraintreePayPalNativeCheckout
     * Remove entire PayPal Native Checkout module
 * BraintreeVenmo

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/Demo.xcodeproj/xcshareddata/xcschemes/Demo.xcscheme b/Demo/Demo.xcodeproj/xcshareddata/xcschemes/Demo.xcscheme
@@ -230,17 +230,6 @@
                ReferencedContainer = "container:../Braintree.xcodeproj">
             </BuildableReference>
          </TestableReference>
-         <TestableReference
-            skipped = "NO"
-            parallelizable = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "9CE5179A282D54030013C740"
-               BuildableName = "BraintreePayPalNativeCheckoutTests.xctest"
-               BlueprintName = "BraintreePayPalNativeCheckoutTests"
-               ReferencedContainer = "container:../Braintree.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
          <TestableReference
             skipped = "NO"
             parallelizable = "YES">

diff --git a/SDK_ERROR_CODES.md b/SDK_ERROR_CODES.md
diff --git a/Sources/BraintreeCore/BTCoreConstants.swift b/Sources/BraintreeCore/BTCoreConstants.swift
@@ -18,7 +18,7 @@ import Foundation
 
     static let apiVersion: String = "2016-10-07"
 
-    static let graphQLVersion: String = "2018-03-06"
+    static let graphQLVersion: String = "2024-11-05"
 
     // swiftlint:disable force_unwrapping
     static let payPalProductionURL = URL(string: "https://api.paypal.com")!

diff --git a/UnitTests/BraintreeCoreTests/BTGraphQLHTTP_Tests.swift b/UnitTests/BraintreeCoreTests/BTGraphQLHTTP_Tests.swift
@@ -175,7 +175,7 @@ final class BTGraphQLHTTP_Tests: XCTestCase {
         http?.post("", configuration: fakeConfiguration, parameters: nil) { body, _, _ in
             let httpRequest = BTHTTPTestProtocol.parseRequestFromTestResponseBody(body!)
             let requestHeaders = httpRequest.allHTTPHeaderFields
-            XCTAssertEqual(requestHeaders!["Braintree-Version"], "2018-03-06")
+            XCTAssertEqual(requestHeaders!["Braintree-Version"], "2024-11-05")
             expectation.fulfill()
         }