Skip to content

Commit

Permalink
Merge pull request #819 from Shopify/develop
Browse files Browse the repository at this point in the history 
SDK 3.1.4
  • Loading branch information
@dbart01
dbart01 authored Apr 10, 2018
2 parents 9780978 + 4ed0fe5 commit 5ff6211
Show file tree
Hide file tree
Showing 28 changed files with 334 additions and 125 deletions.
40 changes: 24 additions & 16 deletions Buy.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,9 @@
9AA416DB1EE095BB0060029B /* CommentEdge.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9AA416D71EE095BB0060029B /* CommentEdge.swift */; };
9AA7AC761EBB77660014D95D /* Graph.CacheItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9AA7AC751EBB77660014D95D /* Graph.CacheItem.swift */; };
9AA7AC781EBB78160014D95D /* Graph.CacheItemTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9AA7AC771EBB78160014D95D /* Graph.CacheItemTests.swift */; };
9AA997EC2046EC480096734F /* ImageContentType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9AA997EB2046EC470096734F /* ImageContentType.swift */; };
9AA997ED2046EC480096734F /* ImageContentType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9AA997EB2046EC470096734F /* ImageContentType.swift */; };
9AA997EE2046EC480096734F /* ImageContentType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9AA997EB2046EC470096734F /* ImageContentType.swift */; };
9AADF1C71EA63ED000D22740 /* MockPaymentMethod.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9AADF1C61EA63ED000D22740 /* MockPaymentMethod.swift */; };
9AADF1C91EA63FB900D22740 /* MockPaymentToken.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9AADF1C81EA63FB900D22740 /* MockPaymentToken.swift */; };
9AADF1CB1EA640C000D22740 /* MockPayment.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9AADF1CA1EA640C000D22740 /* MockPayment.swift */; };
Expand Down Expand Up @@ -671,6 +674,7 @@
9AA89E8C1E9BDC650075AC74 /* MockSessionDataTask.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MockSessionDataTask.swift; sourceTree = "<group>"; };
9AA89E951E9D29B40075AC74 /* Graph.QueryError.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Graph.QueryError.swift; sourceTree = "<group>"; };
9AA89E971E9D2BD80075AC74 /* Graph.RetryHandlerTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Graph.RetryHandlerTests.swift; sourceTree = "<group>"; };
9AA997EB2046EC470096734F /* ImageContentType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImageContentType.swift; sourceTree = "<group>"; };
9AADF1C61EA63ED000D22740 /* MockPaymentMethod.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MockPaymentMethod.swift; sourceTree = "<group>"; };
9AADF1C81EA63FB900D22740 /* MockPaymentToken.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MockPaymentToken.swift; sourceTree = "<group>"; };
9AADF1CA1EA640C000D22740 /* MockPayment.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MockPayment.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -825,6 +829,7 @@
9A0C802E1EAA51C50020F187 /* Domain.swift */,
9A0C802F1EAA51C50020F187 /* Image.swift */,
9A0C80301EAA51C50020F187 /* ImageConnection.swift */,
9AA997EB2046EC470096734F /* ImageContentType.swift */,
9A0C80311EAA51C50020F187 /* ImageEdge.swift */,
9A0C80321EAA51C50020F187 /* MailingAddress.swift */,
9A0C80331EAA51C50020F187 /* MailingAddressConnection.swift */,
Expand Down Expand Up @@ -1565,6 +1570,7 @@
9AC2EFB71F6818180037E0D7 /* CheckoutLineItemInput.swift in Sources */,
9AC2EFB81F6818180037E0D7 /* TokenizedPaymentInput.swift in Sources */,
9AC2EFB91F6818180037E0D7 /* CheckoutLineItem.swift in Sources */,
9AA997ED2046EC480096734F /* ImageContentType.swift in Sources */,
9AC2EFBA1F6818180037E0D7 /* OrderDisplayFinancialStatus.swift in Sources */,
9AC2EFBB1F6818180037E0D7 /* ProductVariantEdge.swift in Sources */,
9AC2EFBC1F6818180037E0D7 /* AppliedGiftCard.swift in Sources */,
Expand Down Expand Up @@ -1710,6 +1716,7 @@
9A0C806C1EAA51C50020F187 /* CheckoutLineItemInput.swift in Sources */,
9A0C80B01EAA51C50020F187 /* TokenizedPaymentInput.swift in Sources */,
9A0C80691EAA51C50020F187 /* CheckoutLineItem.swift in Sources */,
9AA997EC2046EC480096734F /* ImageContentType.swift in Sources */,
9A0C809A1EAA51C50020F187 /* OrderDisplayFinancialStatus.swift in Sources */,
9A0C80AA1EAA51C50020F187 /* ProductVariantEdge.swift in Sources */,
9A0C80581EAA51C50020F187 /* AppliedGiftCard.swift in Sources */,
Expand Down Expand Up @@ -1855,6 +1862,7 @@
9AF256311F6FEE50005BB0C9 /* CheckoutLineItemInput.swift in Sources */,
9AF256321F6FEE50005BB0C9 /* TokenizedPaymentInput.swift in Sources */,
9AF256331F6FEE50005BB0C9 /* CheckoutLineItem.swift in Sources */,
9AA997EE2046EC480096734F /* ImageContentType.swift in Sources */,
9AF256341F6FEE50005BB0C9 /* OrderDisplayFinancialStatus.swift in Sources */,
9AF256351F6FEE50005BB0C9 /* ProductVariantEdge.swift in Sources */,
9AF256361F6FEE50005BB0C9 /* AppliedGiftCard.swift in Sources */,
Expand Down Expand Up @@ -1922,11 +1930,11 @@
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "";
CURRENT_PROJECT_VERSION = 3.1.3;
CURRENT_PROJECT_VERSION = 3.1.4;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = "";
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 3.1.3;
DYLIB_CURRENT_VERSION = 3.1.4;
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = Pay/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
Expand All @@ -1947,11 +1955,11 @@
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "";
CURRENT_PROJECT_VERSION = 3.1.3;
CURRENT_PROJECT_VERSION = 3.1.4;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = "";
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 3.1.3;
DYLIB_CURRENT_VERSION = 3.1.4;
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = Pay/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
Expand Down Expand Up @@ -2000,11 +2008,11 @@
CODE_SIGN_IDENTITY = "";
"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 3.1.3;
CURRENT_PROJECT_VERSION = 3.1.4;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = "";
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 3.1.3;
DYLIB_CURRENT_VERSION = 3.1.4;
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = Buy/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
Expand All @@ -2027,11 +2035,11 @@
CODE_SIGN_IDENTITY = "";
"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 3.1.3;
CURRENT_PROJECT_VERSION = 3.1.4;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = "";
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 3.1.3;
DYLIB_CURRENT_VERSION = 3.1.4;
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = Buy/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
Expand Down Expand Up @@ -2162,11 +2170,11 @@
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_IDENTITY = "";
CURRENT_PROJECT_VERSION = 3.1.3;
CURRENT_PROJECT_VERSION = 3.1.4;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = "";
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 3.1.3;
DYLIB_CURRENT_VERSION = 3.1.4;
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = Buy/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
Expand All @@ -2184,11 +2192,11 @@
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_IDENTITY = "";
CURRENT_PROJECT_VERSION = 3.1.3;
CURRENT_PROJECT_VERSION = 3.1.4;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = "";
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 3.1.3;
DYLIB_CURRENT_VERSION = 3.1.4;
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = Buy/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
Expand All @@ -2207,11 +2215,11 @@
CODE_SIGN_IDENTITY = "";
"CODE_SIGN_IDENTITY[sdk=watchos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 3.1.3;
CURRENT_PROJECT_VERSION = 3.1.4;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = "";
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 3.1.3;
DYLIB_CURRENT_VERSION = 3.1.4;
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = Buy/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
Expand All @@ -2236,11 +2244,11 @@
CODE_SIGN_IDENTITY = "";
"CODE_SIGN_IDENTITY[sdk=watchos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 3.1.3;
CURRENT_PROJECT_VERSION = 3.1.4;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = "";
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 3.1.3;
DYLIB_CURRENT_VERSION = 3.1.4;
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = Buy/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
Expand Down
18 changes: 9 additions & 9 deletions Buy/Generated/Storefront/Article.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,11 @@ extension Storefront {
/// List of comments posted on the article.
///
/// - parameters:
/// - first: No description
/// - after: No description
/// - last: No description
/// - before: No description
/// - reverse: No description
/// - first: Returns up to the first `n` elements from the list.
/// - after: Returns the elements that come after the specified cursor.
/// - last: Returns up to the last `n` elements from the list.
/// - before: Returns the elements that come before the specified cursor.
/// - reverse: Reverse the order of the underlying list.
///
@discardableResult
open func comments(alias: String? = nil, first: Int32? = nil, after: String? = nil, last: Int32? = nil, before: String? = nil, reverse: Bool? = nil, _ subfields: (CommentConnectionQuery) -> Void) -> ArticleQuery {
Expand Down Expand Up @@ -154,10 +154,10 @@ extension Storefront {
/// The image associated with the article.
///
/// - parameters:
/// - maxWidth: Image width in pixels between 1 and 2048
/// - maxHeight: Image height in pixels between 1 and 2048
/// - crop: If specified, crop the image keeping the specified region
/// - scale: Image size multiplier retina displays. Must be between 1 and 3
/// - maxWidth: Image width in pixels between 1 and 2048. This argument is deprecated: Use `maxWidth` on `Image.transformedSrc` instead.
/// - maxHeight: Image height in pixels between 1 and 2048. This argument is deprecated: Use `maxHeight` on `Image.transformedSrc` instead.
/// - crop: Crops the image according to the specified region. This argument is deprecated: Use `crop` on `Image.transformedSrc` instead.
/// - scale: Image size multiplier for high-resolution retina displays. Must be between 1 and 3. This argument is deprecated: Use `scale` on `Image.transformedSrc` instead.
///
@discardableResult
open func image(alias: String? = nil, maxWidth: Int32? = nil, maxHeight: Int32? = nil, crop: CropRegion? = nil, scale: Int32? = nil, _ subfields: (ImageQuery) -> Void) -> ArticleQuery {
Expand Down
4 changes: 4 additions & 0 deletions Buy/Generated/Storefront/ArticleSortKeys.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@ extension Storefront {

case id = "ID"

/// During a search (i.e. when the `query` parameter has been specified on the
/// connection) this sorts the results by relevance to the search term(s). When
/// no search query is specified, this sort key is not deterministic and should
/// not be used.
case relevance = "RELEVANCE"

case title = "TITLE"
Expand Down
10 changes: 5 additions & 5 deletions Buy/Generated/Storefront/Blog.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ extension Storefront {
/// List of the blog's articles.
///
/// - parameters:
/// - first: No description
/// - after: No description
/// - last: No description
/// - before: No description
/// - reverse: No description
/// - first: Returns up to the first `n` elements from the list.
/// - after: Returns the elements that come after the specified cursor.
/// - last: Returns up to the last `n` elements from the list.
/// - before: Returns the elements that come before the specified cursor.
/// - reverse: Reverse the order of the underlying list.
///
@discardableResult
open func articles(alias: String? = nil, first: Int32? = nil, after: String? = nil, last: Int32? = nil, before: String? = nil, reverse: Bool? = nil, _ subfields: (ArticleConnectionQuery) -> Void) -> BlogQuery {
Expand Down
4 changes: 4 additions & 0 deletions Buy/Generated/Storefront/BlogSortKeys.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@ extension Storefront {

case id = "ID"

/// During a search (i.e. when the `query` parameter has been specified on the
/// connection) this sorts the results by relevance to the search term(s). When
/// no search query is specified, this sort key is not deterministic and should
/// not be used.
case relevance = "RELEVANCE"

case title = "TITLE"
Expand Down
10 changes: 5 additions & 5 deletions Buy/Generated/Storefront/Checkout.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,11 +110,11 @@ extension Storefront {
/// in the checkout.
///
/// - parameters:
/// - first: No description
/// - after: No description
/// - last: No description
/// - before: No description
/// - reverse: No description
/// - first: Returns up to the first `n` elements from the list.
/// - after: Returns the elements that come after the specified cursor.
/// - last: Returns up to the last `n` elements from the list.
/// - before: Returns the elements that come before the specified cursor.
/// - reverse: Reverse the order of the underlying list.
///
@discardableResult
open func lineItems(alias: String? = nil, first: Int32? = nil, after: String? = nil, last: Int32? = nil, before: String? = nil, reverse: Bool? = nil, _ subfields: (CheckoutLineItemConnectionQuery) -> Void) -> CheckoutQuery {
Expand Down
4 changes: 2 additions & 2 deletions Buy/Generated/Storefront/CheckoutAttributesUpdateInput.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ extension Storefront {
/// - parameters:
/// - note: The text of an optional note that a shop owner can attach to the checkout.
/// - customAttributes: A list of extra information that is added to the checkout.
/// - allowPartialAddresses: Allows setting partial addresses on a Checkout, skipping the full validation of attributes. The required attributes are city, province, and country. Full validation of the addresses is still done at complete time.
/// - allowPartialAddresses: Allows setting partial addresses on a Checkout, skipping the full validation of attributes. The required attributes are city, province, and country. Full validation of the addresses is still done at complete time.
///
public static func create(note: Input<String> = .undefined, customAttributes: Input<[AttributeInput]> = .undefined, allowPartialAddresses: Input<Bool> = .undefined) -> CheckoutAttributesUpdateInput {
return CheckoutAttributesUpdateInput(note: note, customAttributes: customAttributes, allowPartialAddresses: allowPartialAddresses)
Expand All @@ -62,7 +62,7 @@ extension Storefront {
/// - parameters:
/// - note: The text of an optional note that a shop owner can attach to the checkout.
/// - customAttributes: A list of extra information that is added to the checkout.
/// - allowPartialAddresses: Allows setting partial addresses on a Checkout, skipping the full validation of attributes. The required attributes are city, province, and country. Full validation of the addresses is still done at complete time.
/// - allowPartialAddresses: Allows setting partial addresses on a Checkout, skipping the full validation of attributes. The required attributes are city, province, and country. Full validation of the addresses is still done at complete time.
///
@available(*, deprecated, message: "Use the static create() method instead.")
public convenience init(note: String? = nil, customAttributes: [AttributeInput]? = nil, allowPartialAddresses: Bool? = nil) {
Expand Down
4 changes: 2 additions & 2 deletions Buy/Generated/Storefront/CheckoutCreateInput.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ extension Storefront {
/// - shippingAddress: The shipping address to where the line items will be shipped.
/// - note: The text of an optional note that a shop owner can attach to the checkout.
/// - customAttributes: A list of extra information that is added to the checkout.
/// - allowPartialAddresses: Allows setting partial addresses on a Checkout, skipping the full validation of attributes. The required attributes are city, province, and country. Full validation of addresses is still done at complete time.
/// - allowPartialAddresses: Allows setting partial addresses on a Checkout, skipping the full validation of attributes. The required attributes are city, province, and country. Full validation of addresses is still done at complete time.
///
public static func create(email: Input<String> = .undefined, lineItems: Input<[CheckoutLineItemInput]> = .undefined, shippingAddress: Input<MailingAddressInput> = .undefined, note: Input<String> = .undefined, customAttributes: Input<[AttributeInput]> = .undefined, allowPartialAddresses: Input<Bool> = .undefined) -> CheckoutCreateInput {
return CheckoutCreateInput(email: email, lineItems: lineItems, shippingAddress: shippingAddress, note: note, customAttributes: customAttributes, allowPartialAddresses: allowPartialAddresses)
Expand All @@ -81,7 +81,7 @@ extension Storefront {
/// - shippingAddress: The shipping address to where the line items will be shipped.
/// - note: The text of an optional note that a shop owner can attach to the checkout.
/// - customAttributes: A list of extra information that is added to the checkout.
/// - allowPartialAddresses: Allows setting partial addresses on a Checkout, skipping the full validation of attributes. The required attributes are city, province, and country. Full validation of addresses is still done at complete time.
/// - allowPartialAddresses: Allows setting partial addresses on a Checkout, skipping the full validation of attributes. The required attributes are city, province, and country. Full validation of addresses is still done at complete time.
///
@available(*, deprecated, message: "Use the static create() method instead.")
public convenience init(email: String? = nil, lineItems: [CheckoutLineItemInput]? = nil, shippingAddress: MailingAddressInput? = nil, note: String? = nil, customAttributes: [AttributeInput]? = nil, allowPartialAddresses: Bool? = nil) {
Expand Down
Loading

0 comments on commit 5ff6211

Please sign in to comment.