Clean up umbrella headers.

Remove extern references to constants that no longer exist. Remove reference to header that no longer exists. Re-order headers for clarity. Add comments to identify why headers are grouped together.

Mobile Buy SDK/Mobile Buy SDK/Buy.h

@@ -26,12 +26,7 @@
 
 #import <UIKit/UIKit.h>
 
-//! Project version number for Buy.
-FOUNDATION_EXPORT double BuyVersionNumber;
-
-//! Project version string for Buy.
-FOUNDATION_EXPORT const unsigned char BuyVersionString[];
-
+// Model types
 #import <Buy/BUYAccountCredentials.h>
 #import <Buy/BUYAddress.h>
 #import <Buy/BUYCart.h>
@@ -49,12 +44,24 @@ FOUNDATION_EXPORT const unsigned char BuyVersionString[];
 #import <Buy/BUYOption.h>
 #import <Buy/BUYOptionValue.h>
 #import <Buy/BUYOrder.h>
+#import <Buy/BUYPaymentToken.h>
 #import <Buy/BUYProduct.h>
 #import <Buy/BUYProductVariant.h>
 #import <Buy/BUYShippingRate.h>
 #import <Buy/BUYShop.h>
 #import <Buy/BUYTaxLine.h>
 
+// Model support
+#import <Buy/BUYError.h>
+#import <Buy/BUYError+BUYAdditions.h>
+#import <Buy/BUYManagedObject.h>
+#import <Buy/BUYModelManager.h>
+#import <Buy/BUYModelManagerProtocol.h>
+#import <Buy/BUYObject.h>
+#import <Buy/BUYObjectProtocol.h>
+#import <Buy/BUYShopifyErrorCodes.h>
+
+// Checkout support
 #import <Buy/BUYApplePayAdditions.h>
 #import <Buy/BUYApplePayAuthorizationDelegate.h>
 #import <Buy/BUYApplePayPaymentProvider.h>
@@ -62,31 +69,25 @@ FOUNDATION_EXPORT const unsigned char BuyVersionString[];
 #import <Buy/BUYPaymentProvider.h>
 #import <Buy/BUYWebCheckoutPaymentProvider.h>
 
+// Client API
 #import <Buy/BUYClientTypes.h>
 #import <Buy/BUYClient.h>
 #import <Buy/BUYClient+Address.h>
 #import <Buy/BUYClient+Customers.h>
 #import <Buy/BUYClient+Checkout.h>
 #import <Buy/BUYClient+Storefront.h>
-#import <Buy/BUYError.h>
-#import <Buy/BUYError+BUYAdditions.h>
-#import <Buy/BUYManagedObject.h>
-#import <Buy/BUYModelManager.h>
-#import <Buy/BUYModelManagerProtocol.h>
-#import <Buy/BUYObjectProtocol.h>
-#import <Buy/BUYShopifyErrorCodes.h>
-
-#import <Buy/BUYPaymentToken.h>
 
+// Foundation extensions
 #import <Buy/NSArray+BUYAdditions.h>
 #import <Buy/NSDate+BUYAdditions.h>
 #import <Buy/NSDateFormatter+BUYAdditions.h>
 #import <Buy/NSDecimalNumber+BUYAdditions.h>
 #import <Buy/NSDictionary+BUYAdditions.h>
-#import <Buy/NSDictionary+BUYAdditions.h>
-#import <Buy/NSEntityDescription+BUYAdditions.h>
 #import <Buy/NSException+BUYAdditions.h>
-#import <Buy/NSPropertyDescription+BUYAdditions.h>
-#import <Buy/NSRegularExpression+BUYAdditions.h>
 #import <Buy/NSString+BUYAdditions.h>
 #import <Buy/NSURL+BUYAdditions.h>
+
+// Core Data extensions
+#import <Buy/NSEntityDescription+BUYAdditions.h>
+#import <Buy/NSPropertyDescription+BUYAdditions.h>
+#import <Buy/NSRegularExpression+BUYAdditions.h>

Mobile Buy SDK/Mobile Buy SDK/Static Framework/Buy.h

@@ -28,6 +28,7 @@
  *  Umbrella header used for Cocoapods
  */
 
+// Model types
 #import "BUYAccountCredentials.h"
 #import "BUYAddress.h"
 #import "BUYCart.h"
@@ -45,19 +46,32 @@
 #import "BUYOption.h"
 #import "BUYOptionValue.h"
 #import "BUYOrder.h"
+#import "BUYPaymentToken.h"
 #import "BUYProduct.h"
 #import "BUYProductVariant.h"
 #import "BUYShippingRate.h"
 #import "BUYShop.h"
 #import "BUYTaxLine.h"
 
+// Model support
+#import "BUYError.h"
+#import "BUYError+BUYAdditions.h"
+#import "BUYManagedObject.h"
+#import "BUYModelManager.h"
+#import "BUYModelManagerProtocol.h"
+#import "BUYObject.h"
+#import "BUYObjectProtocol.h"
+#import "BUYShopifyErrorCodes.h"
+
+// Checkout support
 #import "BUYApplePayAdditions.h"
-#import "BUYApplePayHelpers.h"
+#import "BUYApplePayAuthorizationDelegate.h"
 #import "BUYApplePayPaymentProvider.h"
 #import "BUYPaymentController.h"
 #import "BUYPaymentProvider.h"
 #import "BUYWebCheckoutPaymentProvider.h"
 
+// Client API
 #import "BUYClientTypes.h"
 #import "BUYClient.h"
 #import "BUYClient+Address.h"
@@ -65,25 +79,17 @@
 #import "BUYClient+Checkout.h"
 #import "BUYClient+Storefront.h"
 
-#import "BUYError.h"
-#import "BUYError+BUYAdditions.h"
-#import "BUYManagedObject.h"
-#import "BUYModelManager.h"
-#import "BUYModelManagerProtocol.h"
-#import "BUYObjectProtocol.h"
-#import "BUYShopifyErrorCodes.h"
-
-#import "BUYPaymentToken.h"
-
+// Foundation extensions
 #import "NSArray+BUYAdditions.h"
 #import "NSDate+BUYAdditions.h"
 #import "NSDateFormatter+BUYAdditions.h"
 #import "NSDecimalNumber+BUYAdditions.h"
 #import "NSDictionary+BUYAdditions.h"
-#import "NSDictionary+BUYAdditions.h"
-#import "NSEntityDescription+BUYAdditions.h"
 #import "NSException+BUYAdditions.h"
-#import "NSPropertyDescription+BUYAdditions.h"
-#import "NSRegularExpression+BUYAdditions.h"
 #import "NSString+BUYAdditions.h"
 #import "NSURL+BUYAdditions.h"
+
+// Core Data extensions
+#import "NSEntityDescription+BUYAdditions.h"
+#import "NSPropertyDescription+BUYAdditions.h"
+#import "NSRegularExpression+BUYAdditions.h"