Merge pull request #249 from nickasd/openapi-0.2.0

Update CreateApi to 0.2.0

Makefile

@@ -6,7 +6,7 @@ update: download generate
 # see https://github.com/AvdLee/appstoreconnect-swift-sdk/pull/197
 .PHONY: download
 download:
-	curl -fsSL -o - https://developer.apple.com/sample-code/app-store-connect/app-store-connect-openapi-specification.zip | bsdtar -xOf - | jq '.components.schemas.BundleIdPlatform.enum |= [ "IOS", "MAC_OS", "UNIVERSAL" ] | del(.["x-important"]) | del(.. |."enum"? | select(. != null and length == 0))' > Sources/OpenAPI/app_store_connect_api_2.3_openapi.json
+	curl -fsSL -o - https://developer.apple.com/sample-code/app-store-connect/app-store-connect-openapi-specification.zip | bsdtar -xOf - | jq '.components.schemas.BundleIdPlatform.enum |= [ "IOS", "MAC_OS", "UNIVERSAL" ] | del(.["x-important"]) | del(.. |."enum"? | select(. != null and length == 0))' > Sources/OpenAPI/app_store_connect_api.json
 
 # Runs the CreateAPI generator to update generated source code
 .PHONY: generate

Package.swift

@@ -33,12 +33,12 @@ let package = Package(
             name: "AppStoreConnect-Swift-SDK",
             dependencies: targetDependencies,
             path: "Sources",
-            exclude: ["OpenAPI/app_store_connect_api_2.3_openapi.json"]
+            exclude: ["OpenAPI/app_store_connect_api.json"]
         ),
         .binaryTarget(
             name: "create-api", // Find the URL and checksum at https://github.com/createapi/createapi/releases/latest
-            url: "https://github.com/CreateAPI/CreateAPI/releases/download/0.0.5/create-api.artifactbundle.zip",
-            checksum: "89c75ec3b2938d08b961b94e70e6dd6fa0ff52a90037304d41718cd5fb58bd24" // Find at https://github.com/createapi/createapi/releases/latest
+            url: "https://github.com/CreateAPI/CreateAPI/releases/download/0.2.0/create-api.artifactbundle.zip",
+            checksum: "6f8a3ce099f07eb2655ccaf6f66d8c9a09b74bb2307781c4adec36609ddac009"
         ),
         .plugin(
             name: "CreateAPI",

Package@swift-5.5.swift

@@ -19,6 +19,6 @@ let package = Package(
             name: "AppStoreConnect-Swift-SDK",
             dependencies: ["URLQueryEncoder"],
             path: "Sources",
-            exclude: ["OpenAPI/app_store_connect_api_2.3_openapi.json"])
+            exclude: ["OpenAPI/app_store_connect_api.json"])
     ]
 )

Plugins/CreateAPI/Plugin.swift

@@ -12,11 +12,9 @@ struct Plugin: CommandPlugin {
         process.executableURL = URL(fileURLWithPath: createAPI.path.string)
         process.arguments = [
             "generate",
-            "app_store_connect_api_2.3_openapi.json",
-            "--module", "AppStoreConnect_Swift_SDK",
+            "app_store_connect_api.json",
             "--output", "Generated",
-            "--config", ".create-api.yml",
-            "--split",
+            "--config", "create-api.yml",
             "--clean"
         ]
 

Sources/Endpoint.swift

@@ -32,67 +32,21 @@ public struct Request<Response> {
     public var headers: [String: String]?
     public var id: String?
 
-    public init(method: String, path: String, query: [(String, String?)]? = nil, headers: [String: String]? = nil) {
+    public init(path: String, method: String, query: [(String, String?)]? = nil, headers: [String: String]? = nil, id: String) {
         self.method = method
         self.path = path
         self.query = query
         self.headers = headers
+        self.id = id
     }
 
-    public init<U: Encodable>(method: String, path: String, query: [(String, String?)]? = nil, body: U?, headers: [String: String]? = nil) {
+    public init<U: Encodable>(path: String, method: String, query: [(String, String?)]? = nil, body: U?, headers: [String: String]? = nil, id: String) {
         self.method = method
         self.path = path
         self.query = query
         self.body = body.map(AnyEncodable.init)
         self.headers = headers
-    }
-
-    public static func get(_ path: String, query: [(String, String?)]? = nil, headers: [String: String]? = nil) -> Request {
-        Request(method: "GET", path: path, query: query, headers: headers)
-    }
-
-    public static func post(_ path: String, query: [(String, String?)]? = nil, headers: [String: String]? = nil) -> Request {
-        Request(method: "POST", path: path, query: query, headers: headers)
-    }
-
-    public static func post<U: Encodable>(_ path: String, query: [(String, String?)]? = nil, body: U?, headers: [String: String]? = nil) -> Request {
-        Request(method: "POST", path: path, query: query, body: body, headers: headers)
-    }
-
-    public static func put(_ path: String, query: [(String, String?)]? = nil, headers: [String: String]? = nil) -> Request {
-        Request(method: "PUT", path: path, query: query, headers: headers)
-    }
-
-    public static func put<U: Encodable>(_ path: String, query: [(String, String?)]? = nil, body: U?, headers: [String: String]? = nil) -> Request {
-        Request(method: "PUT", path: path, query: query, body: body, headers: headers)
-    }
-
-    public static func patch(_ path: String, query: [(String, String?)]? = nil, headers: [String: String]? = nil) -> Request {
-        Request(method: "PATCH", path: path, query: query, headers: headers)
-    }
-
-    public static func patch<U: Encodable>(_ path: String, query: [(String, String?)]? = nil, body: U?, headers: [String: String]? = nil) -> Request {
-        Request(method: "PATCH", path: path, query: query, body: body, headers: headers)
-    }
-
-    public static func delete(_ path: String, query: [(String, String?)]? = nil, headers: [String: String]? = nil) -> Request {
-        Request(method: "DELETE", path: path, query: query, headers: headers)
-    }
-
-    public static func delete<U: Encodable>(_ path: String, query: [(String, String?)]? = nil, body: U?, headers: [String: String]? = nil) -> Request {
-        Request(method: "DELETE", path: path, query: query, body: body, headers: headers)
-    }
-
-    public static func options(_ path: String, query: [(String, String?)]? = nil, headers: [String: String]? = nil) -> Request {
-        Request(method: "OPTIONS", path: path, query: query, headers: headers)
-    }
-
-    public static func head(_ path: String, query: [(String, String?)]? = nil, headers: [String: String]? = nil) -> Request {
-        Request(method: "HEAD", path: path, query: query, headers: headers)
-    }
-
-    public static func trace(_ path: String, query: [(String, String?)]? = nil, headers: [String: String]? = nil) -> Request {
-        Request(method: "TRACE", path: path, query: query, headers: headers)
+        self.id = id
     }
 }
 

Sources/OpenAPI/Generated/Entities/Actor.swift

@@ -1,7 +1,5 @@
 // Generated by Create API
 // https://github.com/CreateAPI/CreateAPI
-//
-// swiftlint:disable all
 
 import Foundation
 

Sources/OpenAPI/Generated/Entities/ActorResponse.swift

@@ -1,7 +1,5 @@
 // Generated by Create API
 // https://github.com/CreateAPI/CreateAPI
-//
-// swiftlint:disable all
 
 import Foundation
 

Sources/OpenAPI/Generated/Entities/ActorsResponse.swift

@@ -1,7 +1,5 @@
 // Generated by Create API
 // https://github.com/CreateAPI/CreateAPI
-//
-// swiftlint:disable all
 
 import Foundation
 

Sources/OpenAPI/Generated/Entities/AgeRatingDeclaration.swift

@@ -1,7 +1,5 @@
 // Generated by Create API
 // https://github.com/CreateAPI/CreateAPI
-//
-// swiftlint:disable all
 
 import Foundation
 

Sources/OpenAPI/Generated/Entities/AgeRatingDeclarationResponse.swift

@@ -1,7 +1,5 @@
 // Generated by Create API
 // https://github.com/CreateAPI/CreateAPI
-//
-// swiftlint:disable all
 
 import Foundation
 

Sources/OpenAPI/Generated/Entities/AgeRatingDeclarationUpdateRequest.swift

@@ -1,7 +1,5 @@
 // Generated by Create API
 // https://github.com/CreateAPI/CreateAPI
-//
-// swiftlint:disable all
 
 import Foundation
 

Sources/OpenAPI/Generated/Entities/AgeRatingDeclarationWithoutIncludesResponse.swift

@@ -1,7 +1,5 @@
 // Generated by Create API
 // https://github.com/CreateAPI/CreateAPI
-//
-// swiftlint:disable all
 
 import Foundation
 

Sources/OpenAPI/Generated/Entities/App.swift

@@ -1,7 +1,5 @@
 // Generated by Create API
 // https://github.com/CreateAPI/CreateAPI
-//
-// swiftlint:disable all
 
 import Foundation
 

Sources/OpenAPI/Generated/Entities/AppAvailability.swift

@@ -1,10 +1,9 @@
 // Generated by Create API
 // https://github.com/CreateAPI/CreateAPI
-//
-// swiftlint:disable all
 
 import Foundation
 
+@available(*, deprecated, message: "Deprecated")
 public struct AppAvailability: Codable, Identifiable {
 	public var type: `Type`
 	public var id: String

Sources/OpenAPI/Generated/Entities/AppAvailabilityCreateRequest.swift

@@ -1,10 +1,9 @@
 // Generated by Create API
 // https://github.com/CreateAPI/CreateAPI
-//
-// swiftlint:disable all
 
 import Foundation
 
+@available(*, deprecated, message: "Deprecated")
 public struct AppAvailabilityCreateRequest: Codable {
 	public var data: Data
 

Sources/OpenAPI/Generated/Entities/AppAvailabilityResponse.swift

@@ -1,12 +1,13 @@
 // Generated by Create API
 // https://github.com/CreateAPI/CreateAPI
-//
-// swiftlint:disable all
 
 import Foundation
 
+@available(*, deprecated, message: "Deprecated")
 public struct AppAvailabilityResponse: Codable {
 	/// AppAvailability
+	///
+	/// - warning: Deprecated.
 	public var data: AppAvailability
 	public var included: [IncludedItem]?
 	public var links: DocumentLinks
@@ -22,7 +23,10 @@ public struct AppAvailabilityResponse: Codable {
 			} else if let value = try? container.decode(Territory.self) {
 				self = .territory(value)
 			} else {
-				throw DecodingError.dataCorruptedError(in: container, debugDescription: "Failed to intialize `oneOf`")
+				throw DecodingError.dataCorruptedError(
+					in: container,
+					debugDescription: "Data could not be decoded as any of the expected types (App, Territory)."
+				)
 			}
 		}
 

Sources/OpenAPI/Generated/Entities/AppAvailabilityV2.swift

@@ -1,7 +1,5 @@
 // Generated by Create API
 // https://github.com/CreateAPI/CreateAPI
-//
-// swiftlint:disable all
 
 import Foundation
 

Sources/OpenAPI/Generated/Entities/AppAvailabilityV2CreateRequest.swift

@@ -1,7 +1,5 @@
 // Generated by Create API
 // https://github.com/CreateAPI/CreateAPI
-//
-// swiftlint:disable all
 
 import Foundation
 

Sources/OpenAPI/Generated/Entities/AppAvailabilityV2Response.swift

@@ -1,7 +1,5 @@
 // Generated by Create API
 // https://github.com/CreateAPI/CreateAPI
-//
-// swiftlint:disable all
 
 import Foundation
 

Sources/OpenAPI/Generated/Entities/AppBetaTestersLinkagesRequest.swift

@@ -1,7 +1,5 @@
 // Generated by Create API
 // https://github.com/CreateAPI/CreateAPI
-//
-// swiftlint:disable all
 
 import Foundation
 

Sources/OpenAPI/Generated/Entities/AppCategoriesResponse.swift

@@ -1,7 +1,5 @@
 // Generated by Create API
 // https://github.com/CreateAPI/CreateAPI
-//
-// swiftlint:disable all
 
 import Foundation
 

Sources/OpenAPI/Generated/Entities/AppCategoriesWithoutIncludesResponse.swift

@@ -1,7 +1,5 @@
 // Generated by Create API
 // https://github.com/CreateAPI/CreateAPI
-//
-// swiftlint:disable all
 
 import Foundation
 

Sources/OpenAPI/Generated/Entities/AppCategory.swift

@@ -1,7 +1,5 @@
 // Generated by Create API
 // https://github.com/CreateAPI/CreateAPI
-//
-// swiftlint:disable all
 
 import Foundation
 

Sources/OpenAPI/Generated/Entities/AppCategoryResponse.swift

@@ -1,7 +1,5 @@
 // Generated by Create API
 // https://github.com/CreateAPI/CreateAPI
-//
-// swiftlint:disable all
 
 import Foundation
 

Sources/OpenAPI/Generated/Entities/AppCategoryWithoutIncludesResponse.swift

@@ -1,7 +1,5 @@
 // Generated by Create API
 // https://github.com/CreateAPI/CreateAPI
-//
-// swiftlint:disable all
 
 import Foundation
 

Sources/OpenAPI/Generated/Entities/AppClip.swift

@@ -1,7 +1,5 @@
 // Generated by Create API
 // https://github.com/CreateAPI/CreateAPI
-//
-// swiftlint:disable all
 
 import Foundation
 

Sources/OpenAPI/Generated/Entities/AppClipAction.swift

@@ -1,7 +1,5 @@
 // Generated by Create API
 // https://github.com/CreateAPI/CreateAPI
-//
-// swiftlint:disable all
 
 import Foundation
 

Sources/OpenAPI/Generated/Entities/AppClipAdvancedExperience.swift

@@ -1,7 +1,5 @@
 // Generated by Create API
 // https://github.com/CreateAPI/CreateAPI
-//
-// swiftlint:disable all
 
 import Foundation
 

Sources/OpenAPI/Generated/Entities/AppClipAdvancedExperienceCreateRequest.swift

@@ -1,7 +1,5 @@
 // Generated by Create API
 // https://github.com/CreateAPI/CreateAPI
-//
-// swiftlint:disable all
 
 import Foundation
 

Sources/OpenAPI/Generated/Entities/AppClipAdvancedExperienceImage.swift

@@ -1,7 +1,5 @@
 // Generated by Create API
 // https://github.com/CreateAPI/CreateAPI
-//
-// swiftlint:disable all
 
 import Foundation