Commit 5f9ad9b7 by Dima Bart

Resolve issues leftover from rebase.

- remove duplicate compile sources
- sync dynamic and static framework umbrella headers
- rename BUYClient+Checkout helpers category to avoid duplicate name
parent 0ac2cb01
...@@ -66,7 +66,6 @@ FOUNDATION_EXPORT const unsigned char BuyVersionString[]; ...@@ -66,7 +66,6 @@ FOUNDATION_EXPORT const unsigned char BuyVersionString[];
#import <Buy/BUYClient+Customers.h> #import <Buy/BUYClient+Customers.h>
#import <Buy/BUYClient+Checkout.h> #import <Buy/BUYClient+Checkout.h>
#import <Buy/BUYClient+Storefront.h> #import <Buy/BUYClient+Storefront.h>
#import <Buy/BUYClient+Checkout.h>
#import <Buy/BUYRequestOperation.h> #import <Buy/BUYRequestOperation.h>
#import <Buy/BUYError.h> #import <Buy/BUYError.h>
#import <Buy/BUYError+BUYAdditions.h> #import <Buy/BUYError+BUYAdditions.h>
......
// //
// BUYClient+Checkout.h // BUYClient+CheckoutHelpers.h
// Mobile Buy SDK // Mobile Buy SDK
// //
// Created by Shopify. // Created by Shopify.
......
// //
// BUYClient+Checkout.m // BUYClient+CheckoutHelpers.m
// Mobile Buy SDK // Mobile Buy SDK
// //
// Created by Shopify. // Created by Shopify.
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
@implementation BUYClient (CheckoutHelpers) @implementation BUYClient (CheckoutHelpers)
- (NSURLSessionDataTask *)handleCheckout:(BUYCheckout *)checkout completion:(BUYDataCheckoutBlock)completion - (BUYRequestOperation *)handleCheckout:(BUYCheckout *)checkout completion:(BUYDataCheckoutBlock)completion
{ {
if ([checkout hasToken]) { if ([checkout hasToken]) {
return [self updateCheckout:checkout completion:completion]; return [self updateCheckout:checkout completion:completion];
......
...@@ -29,19 +29,11 @@ ...@@ -29,19 +29,11 @@
*/ */
#import "BUYAccountCredentials.h" #import "BUYAccountCredentials.h"
#import "BUYApplePayAdditions.h"
#import "BUYApplePayHelpers.h"
#import "BUYAddress.h" #import "BUYAddress.h"
#import "BUYCart.h" #import "BUYCart.h"
#import "BUYCartLineItem.h" #import "BUYCartLineItem.h"
#import "BUYCheckout.h" #import "BUYCheckout.h"
#import "BUYCheckoutAttribute.h" #import "BUYCheckoutAttribute.h"
#import "BUYClient+Test.h"
#import "BUYClient.h"
#import "BUYClient+Customers.h"
#import "BUYClient+Storefront.h"
#import "BUYClient+Checkout.h"
#import "BUYRequestOperation.h"
#import "BUYCollection.h" #import "BUYCollection.h"
#import "BUYCreditCard.h" #import "BUYCreditCard.h"
#import "BUYCustomer.h" #import "BUYCustomer.h"
...@@ -59,6 +51,7 @@ ...@@ -59,6 +51,7 @@
#import "BUYShop.h" #import "BUYShop.h"
#import "BUYTaxLine.h" #import "BUYTaxLine.h"
#import "BUYApplePayAdditions.h"
#import "BUYApplePayHelpers.h" #import "BUYApplePayHelpers.h"
#import "BUYApplePayPaymentProvider.h" #import "BUYApplePayPaymentProvider.h"
#import "BUYPaymentController.h" #import "BUYPaymentController.h"
...@@ -68,6 +61,8 @@ ...@@ -68,6 +61,8 @@
#import "BUYClient.h" #import "BUYClient.h"
#import "BUYClient+Customers.h" #import "BUYClient+Customers.h"
#import "BUYClient+Checkout.h" #import "BUYClient+Checkout.h"
#import "BUYClient+Storefront.h"
#import "BUYRequestOperation.h"
#import "BUYError.h" #import "BUYError.h"
#import "BUYError+BUYAdditions.h" #import "BUYError+BUYAdditions.h"
#import "BUYManagedObject.h" #import "BUYManagedObject.h"
...@@ -80,6 +75,7 @@ ...@@ -80,6 +75,7 @@
#import "BUYPaymentToken.h" #import "BUYPaymentToken.h"
#import "NSArray+BUYAdditions.h" #import "NSArray+BUYAdditions.h"
#import "NSDate+BUYAdditions.h"
#import "NSDateFormatter+BUYAdditions.h" #import "NSDateFormatter+BUYAdditions.h"
#import "NSDecimalNumber+BUYAdditions.h" #import "NSDecimalNumber+BUYAdditions.h"
#import "NSDictionary+BUYAdditions.h" #import "NSDictionary+BUYAdditions.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment