Merge pull request #37 from cashapp/release-1.0.0

Release 1.0.0

Author: darkpiston

.github/workflows/ci.yml

@@ -9,7 +9,7 @@ on:
 jobs:
   pod-lint:
     name: Pod Lint
-    runs-on: macos-13
+    runs-on: macos-latest
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v4
@@ -30,7 +30,5 @@ jobs:
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v4
-      - name: Select Xcode Version (15.1.0)
-        run: sudo xcode-select --switch /Applications/Xcode_15.1.0.app/Contents/Developer
       - name: Build
         run:  xcodebuild build -scheme PayKit -sdk "`xcrun --sdk iphonesimulator --show-sdk-path`"

CashAppPayKit.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
     s.name         = 'CashAppPayKit'
-    s.version      = '0.6.3'
+    s.version      = '1.0.0'
     s.summary      = 'PayKit iOS SDK'
     s.homepage     = 'https://github.com/cashapp/cash-app-pay-ios-sdk'
     s.license      = 'Apache License, Version 2.0'

CashAppPayKitUI.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
     s.name         = 'CashAppPayKitUI'
-    s.version      = "0.6.3"
+    s.version      = "1.0.0"
     s.summary      = 'UI components for the PayKit iOS SDK'
     s.homepage     = 'https://github.com/cashapp/cash-app-pay-ios-sdk'
     s.license      = 'Apache License, Version 2.0'

Demo/PayKitDemo/PayKitViewController.swift

@@ -121,7 +121,7 @@ class PayKitViewController: UIViewController {
         updateRequestButton.isEnabled = (pendingRequest != nil)
         authorizeRequestButton.isEnabled = (pendingRequest != nil)
         amountTextField.isEnabled = (paymentType == .ONE_TIME_PAYMENT)
-        accountReferenceIDTextField.isEnabled = (paymentType == .ON_FILE_PAYMENT)
+        accountReferenceIDTextField.isEnabled = (paymentType != .ONE_TIME_PAYMENT)
         endpointLabel.text = environment.title
     }
 
@@ -176,6 +176,8 @@ extension PayKitViewController {
             action = .oneTimePayment(scopeID: brandID, money: amount)
         case .ON_FILE_PAYMENT:
             action = .onFilePayment(scopeID: brandID, accountReferenceID: accountReferenceIDTextField.text)
+        case .ON_FILE_PAYOUT:
+            action = .onFilePayout(scopeID: brandID, accountReferenceID: accountReferenceIDTextField.text)
         }
 
         return CreateCustomerRequestParams(
@@ -193,6 +195,8 @@ extension PayKitViewController {
             action = .oneTimePayment(scopeID: brandID, money: amount)
         case .ON_FILE_PAYMENT:
             action = .onFilePayment(scopeID: brandID, accountReferenceID: accountReferenceIDTextField.text)
+        case .ON_FILE_PAYOUT:
+            action = .onFilePayout(scopeID: brandID, accountReferenceID: accountReferenceIDTextField.text)
         }
 
         return UpdateCustomerRequestParams(
@@ -299,7 +303,11 @@ extension PayKitViewController {
                 handler: handlePaymentTypeControlChanged
             ),
             UIAction(
-                title: "On File",
+                title: "On File Payment",
+                handler: handlePaymentTypeControlChanged
+            ),
+            UIAction(
+                title: "On File Payout",
                 handler: handlePaymentTypeControlChanged
             ),
         ])

RELEASE-NOTES.md

@@ -1,3 +1,13 @@
+## Paykit 1.0.0 Release Notes
+
+Pay Kit 1.0.0 supports iOS and requires Xcode 11 or later. The minimum supported Base SDK is 12.0.
+
+Pay Kit 1.0.0 includes the following new features and enhancements.
+
+- **PayKit Update**
+
+    Addition of a new CustomerRequest payment action, payment type of `ON_FILE_PAYOUT`. This payment type enables merchants to payout customers.
+
 ## Paykit 0.6.3 Release Notes
 
 Pay Kit 0.6.3 supports iOS and requires Xcode 11 or later. The minimum supported Base SDK is 12.0.

Sources/PayKit/CashAppPay.swift

@@ -19,7 +19,7 @@ import UIKit
 
 public class CashAppPay {
 
-    public static let version = "0.6.3"
+    public static let version = "1.0.0"
 
     public static let RedirectNotification: Notification.Name = Notification.Name("CashAppPayRedirect")
 

Sources/PayKit/CustomerRequest.swift

@@ -208,6 +208,16 @@ public struct PaymentAction: Equatable {
             accountReferenceID: accountReferenceID
         )
     }
+
+    public static func onFilePayout(scopeID: String, accountReferenceID: String?) -> PaymentAction {
+        return PaymentAction(
+            type: .ON_FILE_PAYOUT,
+            scopeID: scopeID,
+            money: nil,
+            accountReferenceID: accountReferenceID
+        )
+    }
+
     enum CodingKeys: String, CodingKey {
         case type, scopeID = "scopeId", amount, currency, accountReferenceID = "accountReferenceId"
     }
@@ -246,7 +256,7 @@ extension PaymentAction: Encodable {
                 try container.encodeIfPresent(money?.currency, forKey: .currency)
             }
 
-        case .ON_FILE_PAYMENT:
+        case .ON_FILE_PAYMENT, .ON_FILE_PAYOUT:
             if clearing {
                 try container.encode(accountReferenceID, forKey: .accountReferenceID)
             } else {
@@ -259,6 +269,7 @@ extension PaymentAction: Encodable {
 public enum PaymentType: String, Codable, CaseIterable, Equatable {
     case ONE_TIME_PAYMENT
     case ON_FILE_PAYMENT
+    case ON_FILE_PAYOUT
 }
 
 // MARK: - Primitives
@@ -345,7 +356,13 @@ extension PaymentAction: CustomDebugStringConvertible {
             return """
 \n ONE_TIME_PAYMENT:
    Scope ID: \(scopeID)
-   Account Reference ID: \(String(describing: money))
+   Account Reference ID: \(String(describing: accountReferenceID))
+"""
+        case .ON_FILE_PAYOUT:
+            return """
+\n ONE_FILE_PAYOUT:
+   Scope ID: \(scopeID)
+   Account Reference ID: \(String(describing: accountReferenceID))
 """
         }
     }

Sources/PayKit/ObjcWrapper/CustomerRequest+ObjC.swift

@@ -522,6 +522,11 @@ import Foundation
         return CAPPaymentAction(paymentAction: paymentAction)
     }
 
+    public static func onFilePayout(scopeID: String, accountReferenceID: String?) -> CAPPaymentAction {
+        let paymentAction = PaymentAction.onFilePayout(scopeID: scopeID, accountReferenceID: accountReferenceID)
+        return CAPPaymentAction(paymentAction: paymentAction)
+    }
+
     // MARK: - Equatable
 
     public override func isEqual(_ object: Any?) -> Bool {

Sources/PayKit/ObjcWrapper/Errors+ObjC.swift

@@ -20,7 +20,7 @@ import Foundation
 
 public let CAPErrorDomain = "com.squareup.cashapppay.error"
 
-@objcMembers public final class CAPApiError: NSError {
+@objcMembers public final class CAPApiError: NSError, @unchecked Sendable {
 
     // MARK: - Properties
 
@@ -90,7 +90,7 @@ extension APIError.ErrorCode {
 
 // MARK: - IntegrationError
 
-@objcMembers public final class CAPIntegrationError: NSError {
+@objcMembers public final class CAPIntegrationError: NSError, @unchecked Sendable {
 
     // MARK: - Properties
 
@@ -232,7 +232,7 @@ extension IntegrationError.ErrorCode {
 
 // MARK: - UnexpectedError
 
-@objcMembers public final class CAPUnexpectedError: NSError {
+@objcMembers public final class CAPUnexpectedError: NSError, @unchecked Sendable {
 
     // MARK: - Properties
 
@@ -271,9 +271,9 @@ extension IntegrationError.ErrorCode {
 
 // MARK: - Network Error
 
-@objc public final class CAPNetworkErrorNoResponse: NSError {}
+@objc public final class CAPNetworkErrorNoResponse: NSError, @unchecked Sendable {}
 
-@objc public final class CAPNetworkErrorNilData: NSError {
+@objc public final class CAPNetworkErrorNilData: NSError, @unchecked Sendable {
     @objc public var response: HTTPURLResponse
 
     init(response: HTTPURLResponse) {
@@ -287,7 +287,7 @@ extension IntegrationError.ErrorCode {
     }
 }
 
-@objc public final class CAPNetworkErrorInvalidJSON: NSError {
+@objc public final class CAPNetworkErrorInvalidJSON: NSError, @unchecked Sendable {
     @objc public var data: Data
 
     init(data: Data) {

Sources/PayKit/Services/Analytics/Loggable.swift

@@ -123,8 +123,7 @@ struct LoggablePaymentAction: Encodable, Equatable, Loggable {
                 try container.encodeIfPresent(money?.amount, forKey: .amount)
                 try container.encodeIfPresent(money?.currency, forKey: .currency)
             }
-
-        case .ON_FILE_PAYMENT:
+        case .ON_FILE_PAYMENT, .ON_FILE_PAYOUT:
             if clearing {
                 try container.encode(accountReferenceID, forKey: .accountReferenceID)
             } else {