[swift5][client] make AnyCodable optional (#9479)

* [swift5][client] make AnyCodable usage optional * [swift5][client] update sample projects
2021-05-18 16:47:26 +01:00
parent 6b5794df9d
commit f48311dac4
441 changed files with 908 additions and 26 deletions
--- a/modules/openapi-generator/src/main/resources/swift5/Extensions.mustache
+++ b/modules/openapi-generator/src/main/resources/swift5/Extensions.mustache
@@ -5,7 +5,9 @@
 //

 import Foundation
-import AnyCodable{{#usePromiseKit}}
+#if canImport(AnyCodable)
+import AnyCodable
+#endif{{#usePromiseKit}}
 import PromiseKit{{/usePromiseKit}}

 extension Bool: JSONEncodable {
@@ -201,6 +203,7 @@ extension RequestBuilder {
    }
 }{{/usePromiseKit}}

+#if canImport(AnyCodable)
 extension AnyCodable: Hashable {
    public func hash(into hasher: inout Hasher) {
        switch value {
@@ -240,4 +243,5 @@ extension AnyCodable: Hashable {
            hasher.combine(0)
        }
    }
-}
+}
+#endif
--- a/modules/openapi-generator/src/main/resources/swift5/XcodeGen.mustache
+++ b/modules/openapi-generator/src/main/resources/swift5/XcodeGen.mustache
@@ -11,8 +11,8 @@ targets:
    settings:
      APPLICATION_EXTENSION_API_ONLY: true
    scheme: {}
-    {{#useAlamofire}}dependencies:{{/useAlamofire}}{{^useAlamofire}}{{#useRxSwift}}dependencies:{{/useRxSwift}}{{/useAlamofire}}{{^useAlamofire}}{{^useRxSwift}}{{#usePromiseKit}}dependencies:{{/usePromiseKit}}{{/useRxSwift}}{{/useAlamofire}}{{#useAlamofire}}
+    dependencies:
+    - carthage: AnyCodable{{#useAlamofire}}
    - carthage: Alamofire{{/useAlamofire}}{{#useRxSwift}}
    - carthage: RxSwift{{/useRxSwift}}{{#usePromiseKit}}
    - carthage: PromiseKit{{/usePromiseKit}}
-    - carthage: AnyCodable
--- a/modules/openapi-generator/src/main/resources/swift5/model.mustache
+++ b/modules/openapi-generator/src/main/resources/swift5/model.mustache
@@ -6,7 +6,9 @@
 //

 import Foundation
+#if canImport(AnyCodable)
 import AnyCodable
+#endif
 {{#description}}

 /** {{description}} */{{/description}}{{#isDeprecated}}
--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift
@@ -5,7 +5,9 @@
 //

 import Foundation
+#if canImport(AnyCodable)
 import AnyCodable
+#endif

 extension Bool: JSONEncodable {
    func encodeToJSON() -> Any { return self as Any }
@@ -185,6 +187,7 @@ extension HTTPURLResponse {
    }
 }

+#if canImport(AnyCodable)
 extension AnyCodable: Hashable {
    public func hash(into hasher: inout Hasher) {
        switch value {
@@ -224,4 +227,5 @@ extension AnyCodable: Hashable {
            hasher.combine(0)
        }
    }
-}
+}
+#endif
--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift
@@ -6,7 +6,9 @@
 //

 import Foundation
+#if canImport(AnyCodable)
 import AnyCodable
+#endif

 public struct AdditionalPropertiesClass: Codable, Hashable {

--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift
@@ -6,7 +6,9 @@
 //

 import Foundation
+#if canImport(AnyCodable)
 import AnyCodable
+#endif

 public struct Animal: Codable, Hashable {

--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift
@@ -6,6 +6,8 @@
 //

 import Foundation
+#if canImport(AnyCodable)
 import AnyCodable
+#endif

 public typealias AnimalFarm = [Animal]
--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift
@@ -6,7 +6,9 @@
 //

 import Foundation
+#if canImport(AnyCodable)
 import AnyCodable
+#endif

 public struct ApiResponse: Codable, Hashable {

--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift
@@ -6,7 +6,9 @@
 //

 import Foundation
+#if canImport(AnyCodable)
 import AnyCodable
+#endif

 public struct ArrayOfArrayOfNumberOnly: Codable, Hashable {

--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift
@@ -6,7 +6,9 @@
 //

 import Foundation
+#if canImport(AnyCodable)
 import AnyCodable
+#endif

 public struct ArrayOfNumberOnly: Codable, Hashable {

--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift
@@ -6,7 +6,9 @@
 //

 import Foundation
+#if canImport(AnyCodable)
 import AnyCodable
+#endif

 public struct ArrayTest: Codable, Hashable {

--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift
@@ -6,7 +6,9 @@
 //

 import Foundation
+#if canImport(AnyCodable)
 import AnyCodable
+#endif

 public struct Capitalization: Codable, Hashable {

--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift
@@ -6,7 +6,9 @@
 //

 import Foundation
+#if canImport(AnyCodable)
 import AnyCodable
+#endif

 public struct Cat: Codable, Hashable {

--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/CatAllOf.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/CatAllOf.swift
@@ -6,7 +6,9 @@
 //

 import Foundation
+#if canImport(AnyCodable)
 import AnyCodable
+#endif

 public struct CatAllOf: Codable, Hashable {

--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Category.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Category.swift
@@ -6,7 +6,9 @@
 //

 import Foundation
+#if canImport(AnyCodable)
 import AnyCodable
+#endif

 public struct Category: Codable, Hashable {

--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift
@@ -6,7 +6,9 @@
 //

 import Foundation
+#if canImport(AnyCodable)
 import AnyCodable
+#endif

 /** Model for testing model with \&quot;_class\&quot; property */
 public struct ClassModel: Codable, Hashable {
--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Client.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Client.swift
@@ -6,7 +6,9 @@
 //

 import Foundation
+#if canImport(AnyCodable)
 import AnyCodable
+#endif

 public struct Client: Codable, Hashable {

--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift
@@ -6,7 +6,9 @@
 //

 import Foundation
+#if canImport(AnyCodable)
 import AnyCodable
+#endif

 public struct Dog: Codable, Hashable {

--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/DogAllOf.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/DogAllOf.swift
@@ -6,7 +6,9 @@
 //

 import Foundation
+#if canImport(AnyCodable)
 import AnyCodable
+#endif

 public struct DogAllOf: Codable, Hashable {

--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift
@@ -6,7 +6,9 @@
 //

 import Foundation
+#if canImport(AnyCodable)
 import AnyCodable
+#endif

 public struct EnumArrays: Codable, Hashable {

--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumClass.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumClass.swift
@@ -6,7 +6,9 @@
 //

 import Foundation
+#if canImport(AnyCodable)
 import AnyCodable
+#endif

 public enum EnumClass: String, Codable, CaseIterable {
    case abc = "_abc"
--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift
@@ -6,7 +6,9 @@
 //

 import Foundation
+#if canImport(AnyCodable)
 import AnyCodable
+#endif

 public struct EnumTest: Codable, Hashable {

--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/File.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/File.swift
@@ -6,7 +6,9 @@
 //

 import Foundation
+#if canImport(AnyCodable)
 import AnyCodable
+#endif

 /** Must be named &#x60;File&#x60; for test. */
 public struct File: Codable, Hashable {
--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift
@@ -6,7 +6,9 @@
 //

 import Foundation
+#if canImport(AnyCodable)
 import AnyCodable
+#endif

 public struct FileSchemaTestClass: Codable, Hashable {

--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift
@@ -6,7 +6,9 @@
 //

 import Foundation
+#if canImport(AnyCodable)
 import AnyCodable
+#endif

 public struct FormatTest: Codable, Hashable {

--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift
@@ -6,7 +6,9 @@
 //

 import Foundation
+#if canImport(AnyCodable)
 import AnyCodable
+#endif

 public struct HasOnlyReadOnly: Codable, Hashable {

--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/List.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/List.swift
@@ -6,7 +6,9 @@
 //

 import Foundation
+#if canImport(AnyCodable)
 import AnyCodable
+#endif

 public struct List: Codable, Hashable {

--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift
@@ -6,7 +6,9 @@
 //

 import Foundation
+#if canImport(AnyCodable)
 import AnyCodable
+#endif

 public struct MapTest: Codable, Hashable {

--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift
@@ -6,7 +6,9 @@
 //

 import Foundation
+#if canImport(AnyCodable)
 import AnyCodable
+#endif

 public struct MixedPropertiesAndAdditionalPropertiesClass: Codable, Hashable {

--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift
@@ -6,7 +6,9 @@
 //

 import Foundation
+#if canImport(AnyCodable)
 import AnyCodable
+#endif

 /** Model for testing model name starting with number */
 public struct Model200Response: Codable, Hashable {
--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Name.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Name.swift
@@ -6,7 +6,9 @@
 //

 import Foundation
+#if canImport(AnyCodable)
 import AnyCodable
+#endif

 /** Model for testing model name same as property name */
 public struct Name: Codable, Hashable {
--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift
@@ -6,7 +6,9 @@
 //

 import Foundation
+#if canImport(AnyCodable)
 import AnyCodable
+#endif

 public struct NumberOnly: Codable, Hashable {

--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Order.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Order.swift
@@ -6,7 +6,9 @@
 //

 import Foundation
+#if canImport(AnyCodable)
 import AnyCodable
+#endif

 public struct Order: Codable, Hashable {

--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift
@@ -6,7 +6,9 @@
 //

 import Foundation
+#if canImport(AnyCodable)
 import AnyCodable
+#endif

 public struct OuterComposite: Codable, Hashable {

--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift
@@ -6,7 +6,9 @@
 //

 import Foundation
+#if canImport(AnyCodable)
 import AnyCodable
+#endif

 public enum OuterEnum: String, Codable, CaseIterable {
    case placed = "placed"
--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift
@@ -6,7 +6,9 @@
 //

 import Foundation
+#if canImport(AnyCodable)
 import AnyCodable
+#endif

 public struct Pet: Codable, Hashable {

--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift
@@ -6,7 +6,9 @@
 //

 import Foundation
+#if canImport(AnyCodable)
 import AnyCodable
+#endif

 public struct ReadOnlyFirst: Codable, Hashable {

--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Return.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Return.swift
@@ -6,7 +6,9 @@
 //

 import Foundation
+#if canImport(AnyCodable)
 import AnyCodable
+#endif

 /** Model for testing reserved words */
 public struct Return: Codable, Hashable {
--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift
@@ -6,7 +6,9 @@
 //

 import Foundation
+#if canImport(AnyCodable)
 import AnyCodable
+#endif

 public struct SpecialModelName: Codable, Hashable {

--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift
@@ -6,7 +6,9 @@
 //

 import Foundation
+#if canImport(AnyCodable)
 import AnyCodable
+#endif

 public struct StringBooleanMap: Codable, Hashable {

--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift
@@ -6,7 +6,9 @@
 //

 import Foundation
+#if canImport(AnyCodable)
 import AnyCodable
+#endif

 public struct Tag: Codable, Hashable {

--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift
@@ -6,7 +6,9 @@
 //

 import Foundation
+#if canImport(AnyCodable)
 import AnyCodable
+#endif

 public struct TypeHolderDefault: Codable, Hashable {

--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift
@@ -6,7 +6,9 @@
 //

 import Foundation
+#if canImport(AnyCodable)
 import AnyCodable
+#endif

 public struct TypeHolderExample: Codable, Hashable {

--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/User.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/User.swift
@@ -6,7 +6,9 @@
 //

 import Foundation
+#if canImport(AnyCodable)
 import AnyCodable
+#endif

 public struct User: Codable, Hashable {

--- a/samples/client/petstore/swift5/alamofireLibrary/project.yml
+++ b/samples/client/petstore/swift5/alamofireLibrary/project.yml
@@ -12,5 +12,5 @@ targets:
      APPLICATION_EXTENSION_API_ONLY: true
    scheme: {}
    dependencies:
-    - carthage: Alamofire
    - carthage: AnyCodable
+    - carthage: Alamofire
--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift
@@ -5,7 +5,9 @@
 //

 import Foundation
+#if canImport(AnyCodable)
 import AnyCodable
+#endif

 extension Bool: JSONEncodable {
    func encodeToJSON() -> Any { return self as Any }
@@ -185,6 +187,7 @@ extension HTTPURLResponse {
    }
 }

+#if canImport(AnyCodable)
 extension AnyCodable: Hashable {
    public func hash(into hasher: inout Hasher) {
        switch value {
@@ -224,4 +227,5 @@ extension AnyCodable: Hashable {
            hasher.combine(0)
        }
    }
-}
+}
+#endif
--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift
@@ -6,7 +6,9 @@
 //

 import Foundation
+#if canImport(AnyCodable)
 import AnyCodable
+#endif

 public struct AdditionalPropertiesClass: Codable, Hashable {

--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift
@@ -6,7 +6,9 @@
 //

 import Foundation
+#if canImport(AnyCodable)
 import AnyCodable
+#endif

 public struct Animal: Codable, Hashable {

--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift
@@ -6,6 +6,8 @@
 //

 import Foundation
+#if canImport(AnyCodable)
 import AnyCodable
+#endif

 public typealias AnimalFarm = [Animal]
--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift
@@ -6,7 +6,9 @@
 //

 import Foundation
+#if canImport(AnyCodable)
 import AnyCodable
+#endif

 public struct ApiResponse: Codable, Hashable {

--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift
@@ -6,7 +6,9 @@
 //

 import Foundation
+#if canImport(AnyCodable)
 import AnyCodable
+#endif

 public struct ArrayOfArrayOfNumberOnly: Codable, Hashable {

--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift
@@ -6,7 +6,9 @@
 //

 import Foundation
+#if canImport(AnyCodable)
 import AnyCodable
+#endif

 public struct ArrayOfNumberOnly: Codable, Hashable {

--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift
@@ -6,7 +6,9 @@
 //

 import Foundation
+#if canImport(AnyCodable)
 import AnyCodable
+#endif

 public struct ArrayTest: Codable, Hashable {

--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift
@@ -6,7 +6,9 @@
 //

 import Foundation
+#if canImport(AnyCodable)
 import AnyCodable
+#endif

 public struct Capitalization: Codable, Hashable {

--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift
@@ -6,7 +6,9 @@
 //

 import Foundation
+#if canImport(AnyCodable)
 import AnyCodable
+#endif

 public struct Cat: Codable, Hashable {

--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/CatAllOf.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/CatAllOf.swift
@@ -6,7 +6,9 @@
 //

 import Foundation
+#if canImport(AnyCodable)
 import AnyCodable
+#endif

 public struct CatAllOf: Codable, Hashable {

--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Category.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Category.swift
@@ -6,7 +6,9 @@
 //

 import Foundation
+#if canImport(AnyCodable)
 import AnyCodable
+#endif

 public struct Category: Codable, Hashable {

--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift
@@ -6,7 +6,9 @@
 //

 import Foundation
+#if canImport(AnyCodable)
 import AnyCodable
+#endif

 /** Model for testing model with \&quot;_class\&quot; property */
 public struct ClassModel: Codable, Hashable {
--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Client.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Client.swift
@@ -6,7 +6,9 @@
 //

 import Foundation
+#if canImport(AnyCodable)
 import AnyCodable
+#endif

 public struct Client: Codable, Hashable {

--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift
@@ -6,7 +6,9 @@
 //

 import Foundation
+#if canImport(AnyCodable)
 import AnyCodable
+#endif

 public struct Dog: Codable, Hashable {

--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/DogAllOf.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/DogAllOf.swift
@@ -6,7 +6,9 @@
 //

 import Foundation
+#if canImport(AnyCodable)
 import AnyCodable
+#endif

 public struct DogAllOf: Codable, Hashable {

--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift
@@ -6,7 +6,9 @@
 //

 import Foundation
+#if canImport(AnyCodable)
 import AnyCodable
+#endif

 public struct EnumArrays: Codable, Hashable {

--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumClass.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumClass.swift
@@ -6,7 +6,9 @@
 //

 import Foundation
+#if canImport(AnyCodable)
 import AnyCodable
+#endif

 public enum EnumClass: String, Codable, CaseIterable {
    case abc = "_abc"
--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift
@@ -6,7 +6,9 @@
 //

 import Foundation
+#if canImport(AnyCodable)
 import AnyCodable
+#endif

 public struct EnumTest: Codable, Hashable {

--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/File.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/File.swift
@@ -6,7 +6,9 @@
 //

 import Foundation
+#if canImport(AnyCodable)
 import AnyCodable
+#endif

 /** Must be named &#x60;File&#x60; for test. */
 public struct File: Codable, Hashable {
--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift
@@ -6,7 +6,9 @@
 //

 import Foundation
+#if canImport(AnyCodable)
 import AnyCodable
+#endif

 public struct FileSchemaTestClass: Codable, Hashable {

--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift
@@ -6,7 +6,9 @@
 //

 import Foundation
+#if canImport(AnyCodable)
 import AnyCodable
+#endif

 public struct FormatTest: Codable, Hashable {

--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift
@@ -6,7 +6,9 @@
 //

 import Foundation
+#if canImport(AnyCodable)
 import AnyCodable
+#endif

 public struct HasOnlyReadOnly: Codable, Hashable {

--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/List.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/List.swift
@@ -6,7 +6,9 @@
 //

 import Foundation
+#if canImport(AnyCodable)
 import AnyCodable
+#endif

 public struct List: Codable, Hashable {

--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift
@@ -6,7 +6,9 @@
 //

 import Foundation
+#if canImport(AnyCodable)
 import AnyCodable
+#endif

 public struct MapTest: Codable, Hashable {

--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift
@@ -6,7 +6,9 @@
 //

 import Foundation
+#if canImport(AnyCodable)
 import AnyCodable
+#endif

 public struct MixedPropertiesAndAdditionalPropertiesClass: Codable, Hashable {

--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift
@@ -6,7 +6,9 @@
 //

 import Foundation
+#if canImport(AnyCodable)
 import AnyCodable
+#endif

 /** Model for testing model name starting with number */
 public struct Model200Response: Codable, Hashable {
--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Name.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Name.swift
@@ -6,7 +6,9 @@
 //

 import Foundation
+#if canImport(AnyCodable)
 import AnyCodable
+#endif

 /** Model for testing model name same as property name */
 public struct Name: Codable, Hashable {
--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift
@@ -6,7 +6,9 @@
 //

 import Foundation
+#if canImport(AnyCodable)
 import AnyCodable
+#endif

 public struct NumberOnly: Codable, Hashable {

--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Order.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Order.swift
@@ -6,7 +6,9 @@
 //

 import Foundation
+#if canImport(AnyCodable)
 import AnyCodable
+#endif

 public struct Order: Codable, Hashable {

--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift
@@ -6,7 +6,9 @@
 //

 import Foundation
+#if canImport(AnyCodable)
 import AnyCodable
+#endif

 public struct OuterComposite: Codable, Hashable {

--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift
@@ -6,7 +6,9 @@
 //

 import Foundation
+#if canImport(AnyCodable)
 import AnyCodable
+#endif

 public enum OuterEnum: String, Codable, CaseIterable {
    case placed = "placed"
--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift
@@ -6,7 +6,9 @@
 //

 import Foundation
+#if canImport(AnyCodable)
 import AnyCodable
+#endif

 public struct Pet: Codable, Hashable {

--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift
@@ -6,7 +6,9 @@
 //

 import Foundation
+#if canImport(AnyCodable)
 import AnyCodable
+#endif

 public struct ReadOnlyFirst: Codable, Hashable {

--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Return.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Return.swift
@@ -6,7 +6,9 @@
 //

 import Foundation
+#if canImport(AnyCodable)
 import AnyCodable
+#endif

 /** Model for testing reserved words */
 public struct Return: Codable, Hashable {
--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift
@@ -6,7 +6,9 @@
 //

 import Foundation
+#if canImport(AnyCodable)
 import AnyCodable
+#endif

 public struct SpecialModelName: Codable, Hashable {

--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift
@@ -6,7 +6,9 @@
 //

 import Foundation
+#if canImport(AnyCodable)
 import AnyCodable
+#endif

 public struct StringBooleanMap: Codable, Hashable {

--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift
@@ -6,7 +6,9 @@
 //

 import Foundation
+#if canImport(AnyCodable)
 import AnyCodable
+#endif

 public struct Tag: Codable, Hashable {

--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift
@@ -6,7 +6,9 @@
 //

 import Foundation
+#if canImport(AnyCodable)
 import AnyCodable
+#endif

 public struct TypeHolderDefault: Codable, Hashable {

--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift
@@ -6,7 +6,9 @@
 //

 import Foundation
+#if canImport(AnyCodable)
 import AnyCodable
+#endif

 public struct TypeHolderExample: Codable, Hashable {

--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/User.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/User.swift
@@ -6,7 +6,9 @@
 //

 import Foundation
+#if canImport(AnyCodable)
 import AnyCodable
+#endif

 public struct User: Codable, Hashable {

--- a/samples/client/petstore/swift5/combineLibrary/project.yml
+++ b/samples/client/petstore/swift5/combineLibrary/project.yml
@@ -11,5 +11,5 @@ targets:
    settings:
      APPLICATION_EXTENSION_API_ONLY: true
    scheme: {}
-    
+    dependencies:
    - carthage: AnyCodable
--- a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Extensions.swift
+++ b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Extensions.swift
@@ -5,7 +5,9 @@
 //

 import Foundation
+#if canImport(AnyCodable)
 import AnyCodable
+#endif

 extension Bool: JSONEncodable {
    func encodeToJSON() -> Any { return self as Any }
@@ -185,6 +187,7 @@ extension HTTPURLResponse {
    }
 }

+#if canImport(AnyCodable)
 extension AnyCodable: Hashable {
    public func hash(into hasher: inout Hasher) {
        switch value {
@@ -224,4 +227,5 @@ extension AnyCodable: Hashable {
            hasher.combine(0)
        }
    }
-}
+}
+#endif
--- a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesAnyType.swift
+++ b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesAnyType.swift
@@ -6,7 +6,9 @@
 //

 import Foundation
+#if canImport(AnyCodable)
 import AnyCodable
+#endif

 public struct AdditionalPropertiesAnyType: Codable, Hashable {

--- a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesArray.swift
+++ b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesArray.swift
@@ -6,7 +6,9 @@
 //

 import Foundation
+#if canImport(AnyCodable)
 import AnyCodable
+#endif

 public struct AdditionalPropertiesArray: Codable, Hashable {

--- a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesBoolean.swift
+++ b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesBoolean.swift
@@ -6,7 +6,9 @@
 //

 import Foundation
+#if canImport(AnyCodable)
 import AnyCodable
+#endif

 public struct AdditionalPropertiesBoolean: Codable, Hashable {

--- a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift
+++ b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift
@@ -6,7 +6,9 @@
 //

 import Foundation
+#if canImport(AnyCodable)
 import AnyCodable
+#endif

 public struct AdditionalPropertiesClass: Codable, Hashable {

--- a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesInteger.swift
+++ b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesInteger.swift
@@ -6,7 +6,9 @@
 //

 import Foundation
+#if canImport(AnyCodable)
 import AnyCodable
+#endif

 public struct AdditionalPropertiesInteger: Codable, Hashable {

--- a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesNumber.swift
+++ b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesNumber.swift
@@ -6,7 +6,9 @@
 //

 import Foundation
+#if canImport(AnyCodable)
 import AnyCodable
+#endif

 public struct AdditionalPropertiesNumber: Codable, Hashable {

--- a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesObject.swift
+++ b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesObject.swift
@@ -6,7 +6,9 @@
 //

 import Foundation
+#if canImport(AnyCodable)
 import AnyCodable
+#endif

 public struct AdditionalPropertiesObject: Codable, Hashable {

--- a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesString.swift
+++ b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesString.swift
@@ -6,7 +6,9 @@
 //

 import Foundation
+#if canImport(AnyCodable)
 import AnyCodable
+#endif

 public struct AdditionalPropertiesString: Codable, Hashable {

--- a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift
+++ b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift
@@ -6,7 +6,9 @@
 //

 import Foundation
+#if canImport(AnyCodable)
 import AnyCodable
+#endif

 public struct Animal: Codable, Hashable {

--- a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift
+++ b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift
@@ -6,6 +6,8 @@
 //

 import Foundation
+#if canImport(AnyCodable)
 import AnyCodable
+#endif

 public typealias AnimalFarm = [Animal]
--- a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift
+++ b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift
@@ -6,7 +6,9 @@
 //

 import Foundation
+#if canImport(AnyCodable)
 import AnyCodable
+#endif

 public struct ApiResponse: Codable, Hashable {

--- a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift
+++ b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift
@@ -6,7 +6,9 @@
 //

 import Foundation
+#if canImport(AnyCodable)
 import AnyCodable
+#endif

 public struct ArrayOfArrayOfNumberOnly: Codable, Hashable {

--- a/Show More
+++ b/Show More