Skip to content

Align PassKit protocol abstractions with Swift 6 #90

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.

Sign up for GitHub

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

Draft
kieran-osgood-shopify wants to merge 1 commit into
base: kieran-osgood/swift6/mainactor-wallet-layer
Choose a base branch
from
+8 −7
Draft

Align PassKit protocol abstractions with Swift 6 #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions ...ets/ApplePay/ApplePayAuthorizationDelegate/ApplePayAuthorizationDelegate+Controller.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/

import PassKit
@preconcurrency import PassKit
import ShopifyCheckoutKit

@available(iOS 16.0, *)
extension ApplePayAuthorizationDelegate: PKPaymentAuthorizationControllerDelegate {
extension ApplePayAuthorizationDelegate: @preconcurrency PKPaymentAuthorizationControllerDelegate {
/// Triggers on payment sheet presentation, and if user changes shipping address
///
/// Only triggered if the PKPaymentRequest has `requiredShippingContactFields` set
Expand Down
9 changes: 5 additions & 4 deletions ...ckouts/Wallets/ApplePay/ApplePayAuthorizationDelegate/ApplePayAuthorizationDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,23 +22,24 @@
*/

import Foundation
import PassKit
@preconcurrency import PassKit
import ShopifyCheckoutKit

// MARK: - PaymentAuthorizationController Protocol

/// Protocol to abstract PKPaymentAuthorizationController for testing
@available(iOS 16.0, *)
@MainActor
protocol PaymentAuthorizationController {
var delegate: PKPaymentAuthorizationControllerDelegate? { get set }
var delegate: (any PKPaymentAuthorizationControllerDelegate)? { get set }
func present() async -> Bool
func dismiss(completion: (() -> Void)?)
func dismiss(completion: (@Sendable () -> Void)?)
}

extension PKPaymentAuthorizationController: PaymentAuthorizationController {}

@available(iOS 16.0, *)
typealias PKAuthorizationControllerFactory = (PKPaymentRequest) -> PaymentAuthorizationController
typealias PKAuthorizationControllerFactory = @MainActor (PKPaymentRequest) -> any PaymentAuthorizationController

@available(iOS 16.0, *)
@MainActor
Expand Down
2 changes: 1 addition & 1 deletion ...orms/swift/Sources/ShopifyAcceleratedCheckouts/Wallets/ApplePay/Data/PassKitFactory.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
import PassKit

@available(iOS 16.0, *)
class PassKitFactory {
final class PassKitFactory: Sendable {
static let shared = PassKitFactory()

private struct DeliveryOptionWithGroupType {
Expand Down
Loading