Commit e7632aba by Brent Gulanowski

Merge pull request #221 from Shopify/task/fix-imports

Update all public headers to use framework-style imports
parents 8f0a3e1f 9a9f3144
...@@ -25,8 +25,8 @@ ...@@ -25,8 +25,8 @@
// //
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
#import "BUYObjectProtocol.h" #import <Buy/BUYObjectProtocol.h>
#import "BUYModelManagerProtocol.h" #import <Buy/BUYModelManagerProtocol.h>
@class NSManagedObjectModel; @class NSManagedObjectModel;
......
...@@ -25,8 +25,8 @@ ...@@ -25,8 +25,8 @@
// //
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
#import "BUYSerializable.h" #import <Buy/BUYSerializable.h>
#import "NSArray+BUYAdditions.h" #import <Buy/NSArray+BUYAdditions.h>
typedef NSString * (^BUYStringMap) (NSString *); typedef NSString * (^BUYStringMap) (NSString *);
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
// THE SOFTWARE. // THE SOFTWARE.
// //
#import "BUYClient+Customers.h" #import <Buy/BUYClient+Customers.h>
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
@class BUYAddress; @class BUYAddress;
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
// THE SOFTWARE. // THE SOFTWARE.
// //
#import "BUYClient.h" #import <Buy/BUYClient.h>
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
@class BUYCheckout; @class BUYCheckout;
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
// THE SOFTWARE. // THE SOFTWARE.
// //
#import "BUYClient.h" #import <Buy/BUYClient.h>
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
@class BUYCustomer; @class BUYCustomer;
......
...@@ -24,9 +24,9 @@ ...@@ -24,9 +24,9 @@
// THE SOFTWARE. // THE SOFTWARE.
// //
#import "BUYClient.h" #import <Buy/BUYClient.h>
#import "BUYClient+Checkout.h" #import <Buy/BUYClient+Checkout.h>
#import "BUYSerializable.h" #import <Buy/BUYSerializable.h>
static NSString * const BUYShopifyErrorDomain = @"BUYShopifyErrorDomain"; static NSString * const BUYShopifyErrorDomain = @"BUYShopifyErrorDomain";
static NSString * const BUYClientCustomerAccessToken = @"X-Shopify-Customer-Access-Token"; static NSString * const BUYClientCustomerAccessToken = @"X-Shopify-Customer-Access-Token";
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
// THE SOFTWARE. // THE SOFTWARE.
// //
#import "BUYClient.h" #import <Buy/BUYClient.h>
@interface BUYClient (Routing) @interface BUYClient (Routing)
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
// THE SOFTWARE. // THE SOFTWARE.
// //
#import "BUYClient.h" #import <Buy/BUYClient.h>
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
@class BUYShop; @class BUYShop;
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
// //
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
#import "BUYPaymentToken.h" #import <Buy/BUYPaymentToken.h>
@class PKPaymentToken; @class PKPaymentToken;
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
// //
@import Foundation; @import Foundation;
#import "BUYSerializable.h" #import <Buy/BUYSerializable.h>
/** /**
* This represents raw credit card data that the user is posting. You MUST discard this object as soon as it has been posted * This represents raw credit card data that the user is posting. You MUST discard this object as soon as it has been posted
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
// //
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
#import "BUYPaymentToken.h" #import <Buy/BUYPaymentToken.h>
@interface BUYCreditCardToken : NSObject <BUYPaymentToken> @interface BUYCreditCardToken : NSObject <BUYPaymentToken>
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
// THE SOFTWARE. // THE SOFTWARE.
// //
#import "_BUYCart.h" #import <Buy/_BUYCart.h>
@class BUYProductVariant; @class BUYProductVariant;
@class BUYLineItem; @class BUYLineItem;
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
// //
#import <Buy/_BUYCollection.h> #import <Buy/_BUYCollection.h>
#import "BUYClient+Storefront.h" #import <Buy/BUYClient+Storefront.h>
@interface BUYCollection : _BUYCollection {} @interface BUYCollection : _BUYCollection {}
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
#import <Buy/BUYManagedObject.h> #import <Buy/BUYManagedObject.h>
#import "BUYModelManager.h" #import <Buy/BUYModelManager.h>
extern const struct BUYAddressAttributes { extern const struct BUYAddressAttributes {
__unsafe_unretained NSString *address1; __unsafe_unretained NSString *address1;
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
#import <Buy/BUYManagedObject.h> #import <Buy/BUYManagedObject.h>
#import "BUYModelManager.h" #import <Buy/BUYModelManager.h>
extern const struct BUYCartRelationships { extern const struct BUYCartRelationships {
__unsafe_unretained NSString *lineItems; __unsafe_unretained NSString *lineItems;
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
#import <Buy/BUYManagedObject.h> #import <Buy/BUYManagedObject.h>
#import "BUYModelManager.h" #import <Buy/BUYModelManager.h>
extern const struct BUYCartLineItemAttributes { extern const struct BUYCartLineItemAttributes {
__unsafe_unretained NSString *quantity; __unsafe_unretained NSString *quantity;
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
#import <Buy/BUYManagedObject.h> #import <Buy/BUYManagedObject.h>
#import "BUYModelManager.h" #import <Buy/BUYModelManager.h>
extern const struct BUYCollectionAttributes { extern const struct BUYCollectionAttributes {
__unsafe_unretained NSString *createdAt; __unsafe_unretained NSString *createdAt;
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
#import <Buy/BUYManagedObject.h> #import <Buy/BUYManagedObject.h>
#import "BUYModelManager.h" #import <Buy/BUYModelManager.h>
extern const struct BUYCustomerAttributes { extern const struct BUYCustomerAttributes {
__unsafe_unretained NSString *acceptsMarketing; __unsafe_unretained NSString *acceptsMarketing;
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
#import <Buy/BUYManagedObject.h> #import <Buy/BUYManagedObject.h>
#import "BUYModelManager.h" #import <Buy/BUYModelManager.h>
extern const struct BUYImageLinkAttributes { extern const struct BUYImageLinkAttributes {
__unsafe_unretained NSString *createdAt; __unsafe_unretained NSString *createdAt;
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
#import <Buy/BUYManagedObject.h> #import <Buy/BUYManagedObject.h>
#import "BUYModelManager.h" #import <Buy/BUYModelManager.h>
extern const struct BUYLineItemAttributes { extern const struct BUYLineItemAttributes {
__unsafe_unretained NSString *compareAtPrice; __unsafe_unretained NSString *compareAtPrice;
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
#import <Buy/BUYManagedObject.h> #import <Buy/BUYManagedObject.h>
#import "BUYModelManager.h" #import <Buy/BUYModelManager.h>
extern const struct BUYOptionAttributes { extern const struct BUYOptionAttributes {
__unsafe_unretained NSString *identifier; __unsafe_unretained NSString *identifier;
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
#import <Buy/BUYManagedObject.h> #import <Buy/BUYManagedObject.h>
#import "BUYModelManager.h" #import <Buy/BUYModelManager.h>
extern const struct BUYOptionValueAttributes { extern const struct BUYOptionValueAttributes {
__unsafe_unretained NSString *name; __unsafe_unretained NSString *name;
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
#import <Buy/BUYManagedObject.h> #import <Buy/BUYManagedObject.h>
#import "BUYModelManager.h" #import <Buy/BUYModelManager.h>
extern const struct BUYOrderAttributes { extern const struct BUYOrderAttributes {
__unsafe_unretained NSString *identifier; __unsafe_unretained NSString *identifier;
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
#import <Buy/BUYManagedObject.h> #import <Buy/BUYManagedObject.h>
#import "BUYModelManager.h" #import <Buy/BUYModelManager.h>
extern const struct BUYProductAttributes { extern const struct BUYProductAttributes {
__unsafe_unretained NSString *available; __unsafe_unretained NSString *available;
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
#import <Buy/BUYManagedObject.h> #import <Buy/BUYManagedObject.h>
#import "BUYModelManager.h" #import <Buy/BUYModelManager.h>
extern const struct BUYProductVariantAttributes { extern const struct BUYProductVariantAttributes {
__unsafe_unretained NSString *available; __unsafe_unretained NSString *available;
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
#import <Buy/BUYManagedObject.h> #import <Buy/BUYManagedObject.h>
#import "BUYModelManager.h" #import <Buy/BUYModelManager.h>
extern const struct BUYShopAttributes { extern const struct BUYShopAttributes {
__unsafe_unretained NSString *city; __unsafe_unretained NSString *city;
......
...@@ -29,9 +29,9 @@ ...@@ -29,9 +29,9 @@
#import <Buy/BUYManagedObject.h> #import <Buy/BUYManagedObject.h>
<$if hasAdditionalHeaderFile$> <$if hasAdditionalHeaderFile$>
#import "<$additionalHeaderFileName$>" #import <Buy/<$additionalHeaderFileName$>>
<$endif$> <$endif$>
#import "BUYModelManager.h" #import <Buy/BUYModelManager.h>
<$if noninheritedAttributes.@count > 0$> <$if noninheritedAttributes.@count > 0$>
extern const struct <$managedObjectClassName$>Attributes {<$foreach Attribute noninheritedAttributes do$> extern const struct <$managedObjectClassName$>Attributes {<$foreach Attribute noninheritedAttributes do$>
......
...@@ -27,10 +27,10 @@ ...@@ -27,10 +27,10 @@
// Make changes to <$managedObjectClassName$>.h instead. // Make changes to <$managedObjectClassName$>.h instead.
<$if hasCustomSuperentity$><$if hasSuperentity$>#import <Buy/<$customSuperentity$>.h> <$if hasCustomSuperentity$><$if hasSuperentity$>#import <Buy/<$customSuperentity$>.h>
<$else$><$if hasCustomBaseCaseImport$>#import <$baseClassImport$><$else$>#import "<$customSuperentity$>.h"<$endif$><$endif$><$endif$> <$else$><$if hasCustomBaseCaseImport$>#import <$baseClassImport$><$else$>#import <Buy/<$customSuperentity$>.h><$endif$><$endif$><$endif$>
<$if hasAdditionalHeaderFile$> <$if hasAdditionalHeaderFile$>
#import "<$additionalHeaderFileName$>" #import <Buy/<$additionalHeaderFileName$>>
<$endif$> <$endif$>
#import <Buy/BUYModelManager.h> #import <Buy/BUYModelManager.h>
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
// DO NOT EDIT. This file is machine-generated and constantly overwritten. // DO NOT EDIT. This file is machine-generated and constantly overwritten.
// Make changes to BUYCheckout.h instead. // Make changes to BUYCheckout.h instead.
#import "BUYObject.h" #import <Buy/BUYObject.h>
#import <Buy/BUYModelManager.h> #import <Buy/BUYModelManager.h>
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
// DO NOT EDIT. This file is machine-generated and constantly overwritten. // DO NOT EDIT. This file is machine-generated and constantly overwritten.
// Make changes to BUYCheckoutAttribute.h instead. // Make changes to BUYCheckoutAttribute.h instead.
#import "BUYObject.h" #import <Buy/BUYObject.h>
#import <Buy/BUYModelManager.h> #import <Buy/BUYModelManager.h>
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
// DO NOT EDIT. This file is machine-generated and constantly overwritten. // DO NOT EDIT. This file is machine-generated and constantly overwritten.
// Make changes to BUYDiscount.h instead. // Make changes to BUYDiscount.h instead.
#import "BUYObject.h" #import <Buy/BUYObject.h>
#import <Buy/BUYModelManager.h> #import <Buy/BUYModelManager.h>
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
// DO NOT EDIT. This file is machine-generated and constantly overwritten. // DO NOT EDIT. This file is machine-generated and constantly overwritten.
// Make changes to BUYGiftCard.h instead. // Make changes to BUYGiftCard.h instead.
#import "BUYObject.h" #import <Buy/BUYObject.h>
#import <Buy/BUYModelManager.h> #import <Buy/BUYModelManager.h>
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
// DO NOT EDIT. This file is machine-generated and constantly overwritten. // DO NOT EDIT. This file is machine-generated and constantly overwritten.
// Make changes to BUYMaskedCreditCard.h instead. // Make changes to BUYMaskedCreditCard.h instead.
#import "BUYObject.h" #import <Buy/BUYObject.h>
#import <Buy/BUYModelManager.h> #import <Buy/BUYModelManager.h>
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
// DO NOT EDIT. This file is machine-generated and constantly overwritten. // DO NOT EDIT. This file is machine-generated and constantly overwritten.
// Make changes to BUYShippingRate.h instead. // Make changes to BUYShippingRate.h instead.
#import "BUYObject.h" #import <Buy/BUYObject.h>
#import <Buy/BUYModelManager.h> #import <Buy/BUYModelManager.h>
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
// DO NOT EDIT. This file is machine-generated and constantly overwritten. // DO NOT EDIT. This file is machine-generated and constantly overwritten.
// Make changes to BUYTaxLine.h instead. // Make changes to BUYTaxLine.h instead.
#import "BUYObject.h" #import <Buy/BUYObject.h>
#import <Buy/BUYModelManager.h> #import <Buy/BUYModelManager.h>
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
// THE SOFTWARE. // THE SOFTWARE.
// //
#import "BUYOperation.h" #import <Buy/BUYOperation.h>
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
@class BUYClient; @class BUYClient;
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
// //
@import UIKit; @import UIKit;
#import "BUYPaymentProvider.h" #import <Buy/BUYPaymentProvider.h>
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
// //
@import Foundation; @import Foundation;
#import "BUYPaymentProvider.h" #import <Buy/BUYPaymentProvider.h>
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
@import UIKit; @import UIKit;
#import "BUYClient.h" #import <Buy/BUYClient.h>
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
// //
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
#import "BUYPaymentProvider.h" #import <Buy/BUYPaymentProvider.h>
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
......
...@@ -27,9 +27,9 @@ ...@@ -27,9 +27,9 @@
@import Foundation; @import Foundation;
@import PassKit; @import PassKit;
#import "BUYCheckout.h" #import <Buy/BUYCheckout.h>
#import "BUYShippingRate.h" #import <Buy/BUYShippingRate.h>
#import "BUYAddress.h" #import <Buy/BUYAddress.h>
@interface BUYCheckout (ApplePay) @interface BUYCheckout (ApplePay)
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
// THE SOFTWARE. // THE SOFTWARE.
// //
#import "BUYError.h" #import <Buy/BUYError.h>
@interface BUYError (Checkout) @interface BUYError (Checkout)
+ (NSArray<BUYError *> *)errorsFromCheckoutJSON:(NSDictionary *)json; + (NSArray<BUYError *> *)errorsFromCheckoutJSON:(NSDictionary *)json;
......
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