From 2c56dc1f0e4115dc98c46a541df4c6b4d5c12f7a Mon Sep 17 00:00:00 2001 From: Lennard Sprong Date: Thu, 21 Nov 2024 12:32:11 +0000 Subject: [PATCH] [swift6] Add Identifiable conformance to supported models --- bin/configs/swift6-objcCompatible.yaml | 1 + docs/generators/swift6.md | 1 + .../languages/Swift6ClientCodegen.java | 20 +++++++++++++++++++ .../src/main/resources/swift6/model.mustache | 5 ++++- .../Swift6ClientCodegenOptionsProvider.java | 6 ++++-- .../Swift6ClientCodegenOptionsTest.java | 1 + .../PetstoreClient/Models/Category.swift | 3 +++ .../Sources/PetstoreClient/Models/Order.swift | 3 +++ .../Sources/PetstoreClient/Models/Pet.swift | 3 +++ .../Sources/PetstoreClient/Models/Tag.swift | 3 +++ .../Sources/PetstoreClient/Models/User.swift | 3 +++ .../PetstoreClient/Models/Category.swift | 3 +++ .../Sources/PetstoreClient/Models/Order.swift | 3 +++ .../Sources/PetstoreClient/Models/Pet.swift | 3 +++ .../Sources/PetstoreClient/Models/Tag.swift | 3 +++ .../Sources/PetstoreClient/Models/User.swift | 3 +++ .../PetstoreClient/Models/Category.swift | 3 +++ .../Sources/PetstoreClient/Models/Order.swift | 3 +++ .../Sources/PetstoreClient/Models/Pet.swift | 3 +++ .../Sources/PetstoreClient/Models/Tag.swift | 3 +++ .../Sources/PetstoreClient/Models/User.swift | 3 +++ .../Classes/OpenAPIs/Models/Category.swift | 3 +++ .../Classes/OpenAPIs/Models/Order.swift | 3 +++ .../Classes/OpenAPIs/Models/Pet.swift | 3 +++ .../Classes/OpenAPIs/Models/Tag.swift | 3 +++ .../Classes/OpenAPIs/Models/User.swift | 3 +++ .../CombineLibrary/Models/Category.swift | 3 +++ .../Sources/CombineLibrary/Models/Order.swift | 3 +++ .../Sources/CombineLibrary/Models/Pet.swift | 3 +++ .../Sources/CombineLibrary/Models/Tag.swift | 3 +++ .../Sources/CombineLibrary/Models/User.swift | 3 +++ .../PetstoreClient/Models/Category.swift | 3 +++ .../Sources/PetstoreClient/Models/Order.swift | 3 +++ .../Sources/PetstoreClient/Models/Pet.swift | 3 +++ .../Sources/PetstoreClient/Models/Tag.swift | 3 +++ .../Sources/PetstoreClient/Models/User.swift | 3 +++ .../Classes/OpenAPIs/Models/Category.swift | 3 +++ .../Classes/OpenAPIs/Models/Order.swift | 3 +++ .../Classes/OpenAPIs/Models/Pet.swift | 3 +++ .../Classes/OpenAPIs/Models/Tag.swift | 3 +++ .../Classes/OpenAPIs/Models/User.swift | 3 +++ .../Classes/OpenAPIs/Models/Category.swift | 3 +++ .../Classes/OpenAPIs/Models/Order.swift | 3 +++ .../Classes/OpenAPIs/Models/Pet.swift | 3 +++ .../Classes/OpenAPIs/Models/Tag.swift | 3 +++ .../Classes/OpenAPIs/Models/User.swift | 3 +++ .../Classes/OpenAPIs/Models/Category.swift | 3 +++ .../Classes/OpenAPIs/Models/Order.swift | 3 +++ .../Classes/OpenAPIs/Models/Pet.swift | 3 +++ .../Classes/OpenAPIs/Models/Tag.swift | 3 +++ .../Classes/OpenAPIs/Models/User.swift | 3 +++ .../PetstoreClient/Models/Category.swift | 3 +++ .../Sources/PetstoreClient/Models/Order.swift | 3 +++ .../Sources/PetstoreClient/Models/Pet.swift | 3 +++ .../Sources/PetstoreClient/Models/Tag.swift | 3 +++ .../Sources/PetstoreClient/Models/User.swift | 3 +++ .../PetstoreClient/Models/Category.swift | 3 +++ .../Sources/PetstoreClient/Models/Order.swift | 3 +++ .../Sources/PetstoreClient/Models/Pet.swift | 3 +++ .../Sources/PetstoreClient/Models/Tag.swift | 3 +++ .../Sources/PetstoreClient/Models/User.swift | 3 +++ 61 files changed, 196 insertions(+), 3 deletions(-) diff --git a/bin/configs/swift6-objcCompatible.yaml b/bin/configs/swift6-objcCompatible.yaml index 737a836dbb40..dc14856d9f45 100644 --- a/bin/configs/swift6-objcCompatible.yaml +++ b/bin/configs/swift6-objcCompatible.yaml @@ -6,6 +6,7 @@ generateAliasAsModel: true additionalProperties: responseAs: ObjcBlock podAuthors: "" + identifiableModels: false podSummary: PetstoreClient objcCompatible: true projectName: PetstoreClient diff --git a/docs/generators/swift6.md b/docs/generators/swift6.md index c86c4c6739de..b80a1d7996ab 100644 --- a/docs/generators/swift6.md +++ b/docs/generators/swift6.md @@ -28,6 +28,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |generateModelAdditionalProperties|Generate model additional properties (default: true)| |true| |hashableModels|Make hashable models (default: true)| |true| |hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |true| +|identifiableModels|Make models conform to Identifiable when an id is present (default: true)| |true| |legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|
**true**
The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
**false**
The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
|true| |library|Library template (sub-template) to use|
**urlsession**
[DEFAULT] HTTP client: URLSession
**alamofire**
HTTP client: Alamofire
**vapor**
HTTP client: Vapor
|urlsession| |mapFileBinaryToData|Map File and Binary to Data (default: false)| |false| diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift6ClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift6ClientCodegen.java index 1d093f508325..8c1bb2e0ffc7 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift6ClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift6ClientCodegen.java @@ -70,6 +70,7 @@ public class Swift6ClientCodegen extends DefaultCodegen implements CodegenConfig public static final String USE_BACKTICK_ESCAPES = "useBacktickEscapes"; public static final String GENERATE_MODEL_ADDITIONAL_PROPERTIES = "generateModelAdditionalProperties"; public static final String HASHABLE_MODELS = "hashableModels"; + public static final String IDENTIFIABLE_MODELS = "identifiableModels"; public static final String USE_JSON_ENCODABLE = "useJsonEncodable"; public static final String MAP_FILE_BINARY_TO_DATA = "mapFileBinaryToData"; public static final String USE_CUSTOM_DATE_WITHOUT_TIME = "useCustomDateWithoutTime"; @@ -98,6 +99,7 @@ public class Swift6ClientCodegen extends DefaultCodegen implements CodegenConfig @Setter protected boolean useBacktickEscapes = false; @Setter protected boolean generateModelAdditionalProperties = true; @Setter protected boolean hashableModels = true; + @Setter protected boolean identifiableModels = true; @Setter protected boolean useJsonEncodable = true; @Getter @Setter protected boolean mapFileBinaryToData = false; @Setter protected boolean useCustomDateWithoutTime = false; @@ -307,6 +309,10 @@ public Swift6ClientCodegen() { "Make hashable models (default: true)") .defaultValue(Boolean.TRUE.toString())); + cliOptions.add(new CliOption(IDENTIFIABLE_MODELS, + "Make models conform to Identifiable when an id is present (default: true)") + .defaultValue(Boolean.TRUE.toString())); + cliOptions.add(new CliOption(USE_JSON_ENCODABLE, "Make models conform to JSONEncodable protocol (default: true)") .defaultValue(Boolean.TRUE.toString())); @@ -527,6 +533,11 @@ public void processOpts() { } additionalProperties.put(HASHABLE_MODELS, hashableModels); + if (additionalProperties.containsKey(IDENTIFIABLE_MODELS)) { + setIdentifiableModels(convertPropertyToBooleanAndWriteBack(IDENTIFIABLE_MODELS)); + } + additionalProperties.put(IDENTIFIABLE_MODELS, identifiableModels); + if (additionalProperties.containsKey(USE_JSON_ENCODABLE)) { setUseJsonEncodable(convertPropertyToBooleanAndWriteBack(USE_JSON_ENCODABLE)); } @@ -973,6 +984,15 @@ public CodegenModel fromModel(String name, Schema model) { if (hashableModels) { codegenModel.vendorExtensions.put("x-swift-hashable", true); } + if (identifiableModels && !codegenModel.vendorExtensions.containsKey("x-swift-identifiable")) { + for (CodegenProperty cp : codegenModel.getVars()) { + if (!cp.getBaseName().equals("id")) continue; + if (cp.isString || cp.isUuid || cp.isInteger || cp.isLong) { + codegenModel.vendorExtensions.put("x-swift-identifiable", true); + break; + } + } + } return codegenModel; } diff --git a/modules/openapi-generator/src/main/resources/swift6/model.mustache b/modules/openapi-generator/src/main/resources/swift6/model.mustache index 7cc0e760218b..e9d561310dc8 100644 --- a/modules/openapi-generator/src/main/resources/swift6/model.mustache +++ b/modules/openapi-generator/src/main/resources/swift6/model.mustache @@ -24,4 +24,7 @@ extension {{projectName}}API { {{> modelObject}}{{/isEnum}}{{/isArray}}{{/vendorExtensions.x-is-one-of-interface}}{{/model}}{{/models}} {{#swiftUseApiNamespace}} } -{{/swiftUseApiNamespace}} \ No newline at end of file +{{/swiftUseApiNamespace}}{{#models}}{{#model}}{{#vendorExtensions.x-swift-identifiable}} +@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *) +extension {{#swiftUseApiNamespace}}{{projectName}}API.{{/swiftUseApiNamespace}}{{{classname}}}: Identifiable {} +{{/vendorExtensions.x-swift-identifiable}}{{/model}}{{/models}} \ No newline at end of file diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/options/Swift6ClientCodegenOptionsProvider.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/options/Swift6ClientCodegenOptionsProvider.java index 94be51999d31..a8c6473d1be9 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/options/Swift6ClientCodegenOptionsProvider.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/options/Swift6ClientCodegenOptionsProvider.java @@ -48,6 +48,7 @@ public class Swift6ClientCodegenOptionsProvider implements OptionsProvider { public static final String USE_BACKTICKS_ESCAPES_VALUE = "false"; public static final String GENERATE_MODEL_ADDITIONAL_PROPERTIES_VALUE = "true"; public static final String HASHABLE_MODELS_VALUE = "true"; + public static final String IDENTIFIABLE_MODELS_VALUE = "true"; public static final String USE_JSON_ENCODABLE_VALUE = "true"; public static final String ALLOW_UNICODE_IDENTIFIERS_VALUE = "false"; public static final String PREPEND_FORM_OR_BODY_PARAMETERS_VALUE = "true"; @@ -98,15 +99,16 @@ public Map createOptions() { .put(Swift6ClientCodegen.GENERATE_MODEL_ADDITIONAL_PROPERTIES, GENERATE_MODEL_ADDITIONAL_PROPERTIES_VALUE) .put(Swift6ClientCodegen.HASHABLE_MODELS, HASHABLE_MODELS_VALUE) + .put(Swift6ClientCodegen.IDENTIFIABLE_MODELS, IDENTIFIABLE_MODELS_VALUE) .put(Swift6ClientCodegen.USE_JSON_ENCODABLE, USE_JSON_ENCODABLE_VALUE) .put(Swift6ClientCodegen.MAP_FILE_BINARY_TO_DATA, "false") .put(Swift6ClientCodegen.USE_CUSTOM_DATE_WITHOUT_TIME, "false") .put(Swift6ClientCodegen.VALIDATABLE, "true") .put(Swift6ClientCodegen.ONE_OF_UNKNOWN_DEFAULT_CASE, "false") .put(Swift6ClientCodegen.USE_CLASSES, "false") - .put(Swift6ClientCodegen.API_STATIC_METHOD, + .put(Swift6ClientCodegen.API_STATIC_METHOD, API_STATIC_METHOD_VALUE) - .put(Swift6ClientCodegen.COMBINE_DEFERRED, + .put(Swift6ClientCodegen.COMBINE_DEFERRED, COMBINE_DEFERRED_VALUE) .put(CodegenConstants.ENUM_UNKNOWN_DEFAULT_CASE, ENUM_UNKNOWN_DEFAULT_CASE_VALUE) .build(); diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/swift6/Swift6ClientCodegenOptionsTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/swift6/Swift6ClientCodegenOptionsTest.java index ee2ab3d21a51..1a7a759a34ab 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/swift6/Swift6ClientCodegenOptionsTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/swift6/Swift6ClientCodegenOptionsTest.java @@ -53,6 +53,7 @@ protected void verifyOptions() { verify(clientCodegen).setGenerateModelAdditionalProperties( Boolean.parseBoolean(Swift6ClientCodegenOptionsProvider.GENERATE_MODEL_ADDITIONAL_PROPERTIES_VALUE)); verify(clientCodegen).setHashableModels(Boolean.parseBoolean(Swift6ClientCodegenOptionsProvider.HASHABLE_MODELS_VALUE)); + verify(clientCodegen).setIdentifiableModels(Boolean.parseBoolean(Swift6ClientCodegenOptionsProvider.IDENTIFIABLE_MODELS_VALUE)); verify(clientCodegen) .setEnumUnknownDefaultCase(Boolean.parseBoolean(Swift6ClientCodegenOptionsProvider.ENUM_UNKNOWN_DEFAULT_CASE_VALUE)); verify(clientCodegen).setApiStaticMethod(Boolean.parseBoolean(Swift6ClientCodegenOptionsProvider.API_STATIC_METHOD_VALUE)); diff --git a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Category.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Category.swift index c74b2f4778cf..d1cceeccfe81 100644 --- a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Category.swift +++ b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Category.swift @@ -31,3 +31,6 @@ public struct Category: Sendable, Codable, JSONEncodable, Hashable { } } + +@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *) +extension Category: Identifiable {} diff --git a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Order.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Order.swift index 322239ce8b6e..9bc6ecf183e9 100644 --- a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Order.swift +++ b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Order.swift @@ -53,3 +53,6 @@ public struct Order: Sendable, Codable, JSONEncodable, Hashable { } } + +@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *) +extension Order: Identifiable {} diff --git a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Pet.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Pet.swift index 89cb0bf888ec..b1ccb862d1af 100644 --- a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Pet.swift +++ b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Pet.swift @@ -56,3 +56,6 @@ public struct Pet: Sendable, Codable, JSONEncodable, Hashable { } } + +@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *) +extension Pet: Identifiable {} diff --git a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Tag.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Tag.swift index 52b77b433bf8..514e6abfcee2 100644 --- a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Tag.swift +++ b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Tag.swift @@ -31,3 +31,6 @@ public struct Tag: Sendable, Codable, JSONEncodable, Hashable { } } + +@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *) +extension Tag: Identifiable {} diff --git a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/User.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/User.swift index 237b3c28c7a0..ecdde64a8d17 100644 --- a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/User.swift +++ b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/User.swift @@ -56,3 +56,6 @@ public struct User: Sendable, Codable, JSONEncodable, Hashable { } } + +@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *) +extension User: Identifiable {} diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Category.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Category.swift index c74b2f4778cf..d1cceeccfe81 100644 --- a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Category.swift +++ b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Category.swift @@ -31,3 +31,6 @@ public struct Category: Sendable, Codable, JSONEncodable, Hashable { } } + +@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *) +extension Category: Identifiable {} diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Order.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Order.swift index 322239ce8b6e..9bc6ecf183e9 100644 --- a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Order.swift +++ b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Order.swift @@ -53,3 +53,6 @@ public struct Order: Sendable, Codable, JSONEncodable, Hashable { } } + +@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *) +extension Order: Identifiable {} diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Pet.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Pet.swift index 89cb0bf888ec..b1ccb862d1af 100644 --- a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Pet.swift +++ b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Pet.swift @@ -56,3 +56,6 @@ public struct Pet: Sendable, Codable, JSONEncodable, Hashable { } } + +@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *) +extension Pet: Identifiable {} diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Tag.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Tag.swift index 52b77b433bf8..514e6abfcee2 100644 --- a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Tag.swift +++ b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Tag.swift @@ -31,3 +31,6 @@ public struct Tag: Sendable, Codable, JSONEncodable, Hashable { } } + +@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *) +extension Tag: Identifiable {} diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/User.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/User.swift index 237b3c28c7a0..ecdde64a8d17 100644 --- a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/User.swift +++ b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/User.swift @@ -56,3 +56,6 @@ public struct User: Sendable, Codable, JSONEncodable, Hashable { } } + +@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *) +extension User: Identifiable {} diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Category.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Category.swift index c74b2f4778cf..d1cceeccfe81 100644 --- a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Category.swift +++ b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Category.swift @@ -31,3 +31,6 @@ public struct Category: Sendable, Codable, JSONEncodable, Hashable { } } + +@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *) +extension Category: Identifiable {} diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Order.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Order.swift index 322239ce8b6e..9bc6ecf183e9 100644 --- a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Order.swift +++ b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Order.swift @@ -53,3 +53,6 @@ public struct Order: Sendable, Codable, JSONEncodable, Hashable { } } + +@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *) +extension Order: Identifiable {} diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Pet.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Pet.swift index 89cb0bf888ec..b1ccb862d1af 100644 --- a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Pet.swift +++ b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Pet.swift @@ -56,3 +56,6 @@ public struct Pet: Sendable, Codable, JSONEncodable, Hashable { } } + +@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *) +extension Pet: Identifiable {} diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Tag.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Tag.swift index 52b77b433bf8..514e6abfcee2 100644 --- a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Tag.swift +++ b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Tag.swift @@ -31,3 +31,6 @@ public struct Tag: Sendable, Codable, JSONEncodable, Hashable { } } + +@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *) +extension Tag: Identifiable {} diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/User.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/User.swift index 237b3c28c7a0..ecdde64a8d17 100644 --- a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/User.swift +++ b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/User.swift @@ -56,3 +56,6 @@ public struct User: Sendable, Codable, JSONEncodable, Hashable { } } + +@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *) +extension User: Identifiable {} diff --git a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/Category.swift b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/Category.swift index c74b2f4778cf..d1cceeccfe81 100644 --- a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/Category.swift +++ b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/Category.swift @@ -31,3 +31,6 @@ public struct Category: Sendable, Codable, JSONEncodable, Hashable { } } + +@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *) +extension Category: Identifiable {} diff --git a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/Order.swift b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/Order.swift index 322239ce8b6e..9bc6ecf183e9 100644 --- a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/Order.swift +++ b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/Order.swift @@ -53,3 +53,6 @@ public struct Order: Sendable, Codable, JSONEncodable, Hashable { } } + +@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *) +extension Order: Identifiable {} diff --git a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift index 89cb0bf888ec..b1ccb862d1af 100644 --- a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift +++ b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift @@ -56,3 +56,6 @@ public struct Pet: Sendable, Codable, JSONEncodable, Hashable { } } + +@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *) +extension Pet: Identifiable {} diff --git a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift index 52b77b433bf8..514e6abfcee2 100644 --- a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift +++ b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift @@ -31,3 +31,6 @@ public struct Tag: Sendable, Codable, JSONEncodable, Hashable { } } + +@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *) +extension Tag: Identifiable {} diff --git a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/User.swift b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/User.swift index 237b3c28c7a0..ecdde64a8d17 100644 --- a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/User.swift +++ b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/User.swift @@ -56,3 +56,6 @@ public struct User: Sendable, Codable, JSONEncodable, Hashable { } } + +@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *) +extension User: Identifiable {} diff --git a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/Category.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/Category.swift index c74b2f4778cf..d1cceeccfe81 100644 --- a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/Category.swift +++ b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/Category.swift @@ -31,3 +31,6 @@ public struct Category: Sendable, Codable, JSONEncodable, Hashable { } } + +@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *) +extension Category: Identifiable {} diff --git a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/Order.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/Order.swift index 322239ce8b6e..9bc6ecf183e9 100644 --- a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/Order.swift +++ b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/Order.swift @@ -53,3 +53,6 @@ public struct Order: Sendable, Codable, JSONEncodable, Hashable { } } + +@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *) +extension Order: Identifiable {} diff --git a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/Pet.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/Pet.swift index 89cb0bf888ec..b1ccb862d1af 100644 --- a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/Pet.swift +++ b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/Pet.swift @@ -56,3 +56,6 @@ public struct Pet: Sendable, Codable, JSONEncodable, Hashable { } } + +@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *) +extension Pet: Identifiable {} diff --git a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/Tag.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/Tag.swift index 52b77b433bf8..514e6abfcee2 100644 --- a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/Tag.swift +++ b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/Tag.swift @@ -31,3 +31,6 @@ public struct Tag: Sendable, Codable, JSONEncodable, Hashable { } } + +@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *) +extension Tag: Identifiable {} diff --git a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/User.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/User.swift index 237b3c28c7a0..ecdde64a8d17 100644 --- a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/User.swift +++ b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/User.swift @@ -56,3 +56,6 @@ public struct User: Sendable, Codable, JSONEncodable, Hashable { } } + +@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *) +extension User: Identifiable {} diff --git a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/Category.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/Category.swift index a81defc3880f..f2eeddb30bba 100644 --- a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/Category.swift +++ b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/Category.swift @@ -31,3 +31,6 @@ public struct Category: Sendable, Codable, JSONEncodable, Hashable { } } + +@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *) +extension Category: Identifiable {} diff --git a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/Order.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/Order.swift index 8f2dde07e24d..c43aac1bb30d 100644 --- a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/Order.swift +++ b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/Order.swift @@ -53,3 +53,6 @@ public struct Order: Sendable, Codable, JSONEncodable, Hashable { } } + +@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *) +extension Order: Identifiable {} diff --git a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/Pet.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/Pet.swift index 655b93369e33..0518f378e107 100644 --- a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/Pet.swift +++ b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/Pet.swift @@ -54,3 +54,6 @@ public struct Pet: Sendable, Codable, JSONEncodable, Hashable { } } + +@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *) +extension Pet: Identifiable {} diff --git a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/Tag.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/Tag.swift index 52b77b433bf8..514e6abfcee2 100644 --- a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/Tag.swift +++ b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/Tag.swift @@ -31,3 +31,6 @@ public struct Tag: Sendable, Codable, JSONEncodable, Hashable { } } + +@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *) +extension Tag: Identifiable {} diff --git a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/User.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/User.swift index 237b3c28c7a0..ecdde64a8d17 100644 --- a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/User.swift +++ b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/User.swift @@ -56,3 +56,6 @@ public struct User: Sendable, Codable, JSONEncodable, Hashable { } } + +@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *) +extension User: Identifiable {} diff --git a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Category.swift b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Category.swift index c74b2f4778cf..d1cceeccfe81 100644 --- a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Category.swift +++ b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Category.swift @@ -31,3 +31,6 @@ public struct Category: Sendable, Codable, JSONEncodable, Hashable { } } + +@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *) +extension Category: Identifiable {} diff --git a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Order.swift b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Order.swift index 322239ce8b6e..9bc6ecf183e9 100644 --- a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Order.swift +++ b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Order.swift @@ -53,3 +53,6 @@ public struct Order: Sendable, Codable, JSONEncodable, Hashable { } } + +@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *) +extension Order: Identifiable {} diff --git a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift index 89cb0bf888ec..b1ccb862d1af 100644 --- a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift +++ b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift @@ -56,3 +56,6 @@ public struct Pet: Sendable, Codable, JSONEncodable, Hashable { } } + +@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *) +extension Pet: Identifiable {} diff --git a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift index 52b77b433bf8..514e6abfcee2 100644 --- a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift +++ b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift @@ -31,3 +31,6 @@ public struct Tag: Sendable, Codable, JSONEncodable, Hashable { } } + +@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *) +extension Tag: Identifiable {} diff --git a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/User.swift b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/User.swift index 237b3c28c7a0..ecdde64a8d17 100644 --- a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/User.swift +++ b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/User.swift @@ -56,3 +56,6 @@ public struct User: Sendable, Codable, JSONEncodable, Hashable { } } + +@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *) +extension User: Identifiable {} diff --git a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Category.swift b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Category.swift index e800c1d8185c..5c9c88fb0c41 100644 --- a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Category.swift +++ b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Category.swift @@ -31,3 +31,6 @@ internal struct Category: Sendable, Codable, JSONEncodable, Hashable { } } + +@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *) +extension Category: Identifiable {} diff --git a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Order.swift b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Order.swift index 1300ee52ec1e..f9b6aa26da12 100644 --- a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Order.swift +++ b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Order.swift @@ -54,3 +54,6 @@ internal struct Order: Sendable, Codable, JSONEncodable { } } + +@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *) +extension Order: Identifiable {} diff --git a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift index 953a67369f8d..72d0aa87c805 100644 --- a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift +++ b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift @@ -57,3 +57,6 @@ internal struct Pet: Sendable, Codable, JSONEncodable, Hashable { } } + +@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *) +extension Pet: Identifiable {} diff --git a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift index 344e3eec04aa..5f5a08c4334e 100644 --- a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift +++ b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift @@ -31,3 +31,6 @@ internal struct Tag: Sendable, Codable, JSONEncodable, Hashable { } } + +@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *) +extension Tag: Identifiable {} diff --git a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/User.swift b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/User.swift index 300aaeab4077..96f93dd39eb8 100644 --- a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/User.swift +++ b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/User.swift @@ -56,3 +56,6 @@ internal struct User: Sendable, Codable, JSONEncodable { } } + +@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *) +extension User: Identifiable {} diff --git a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Category.swift b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Category.swift index c74b2f4778cf..d1cceeccfe81 100644 --- a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Category.swift +++ b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Category.swift @@ -31,3 +31,6 @@ public struct Category: Sendable, Codable, JSONEncodable, Hashable { } } + +@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *) +extension Category: Identifiable {} diff --git a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Order.swift b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Order.swift index 322239ce8b6e..9bc6ecf183e9 100644 --- a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Order.swift +++ b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Order.swift @@ -53,3 +53,6 @@ public struct Order: Sendable, Codable, JSONEncodable, Hashable { } } + +@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *) +extension Order: Identifiable {} diff --git a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift index 89cb0bf888ec..b1ccb862d1af 100644 --- a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift +++ b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift @@ -56,3 +56,6 @@ public struct Pet: Sendable, Codable, JSONEncodable, Hashable { } } + +@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *) +extension Pet: Identifiable {} diff --git a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift index 52b77b433bf8..514e6abfcee2 100644 --- a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift +++ b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift @@ -31,3 +31,6 @@ public struct Tag: Sendable, Codable, JSONEncodable, Hashable { } } + +@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *) +extension Tag: Identifiable {} diff --git a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/User.swift b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/User.swift index 237b3c28c7a0..ecdde64a8d17 100644 --- a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/User.swift +++ b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/User.swift @@ -56,3 +56,6 @@ public struct User: Sendable, Codable, JSONEncodable, Hashable { } } + +@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *) +extension User: Identifiable {} diff --git a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/Category.swift b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/Category.swift index 2cfb14a0a245..5563e7499e9a 100644 --- a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/Category.swift +++ b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/Category.swift @@ -49,3 +49,6 @@ public final class Category: @unchecked Sendable, Codable, JSONEncodable, Hashab } } + +@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *) +extension PetstoreClientAPI.Category: Identifiable {} diff --git a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/Order.swift b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/Order.swift index d6494d32b052..c26bec17f7e5 100644 --- a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/Order.swift +++ b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/Order.swift @@ -79,3 +79,6 @@ public final class Order: @unchecked Sendable, Codable, JSONEncodable, Hashable } } + +@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *) +extension PetstoreClientAPI.Order: Identifiable {} diff --git a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/Pet.swift b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/Pet.swift index 9be36c7079c2..310d37f8bf6c 100644 --- a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/Pet.swift +++ b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/Pet.swift @@ -82,3 +82,6 @@ public final class Pet: @unchecked Sendable, Codable, JSONEncodable, Hashable { } } + +@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *) +extension PetstoreClientAPI.Pet: Identifiable {} diff --git a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/Tag.swift b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/Tag.swift index 7589ada24c5d..f3b364ebefea 100644 --- a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/Tag.swift +++ b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/Tag.swift @@ -49,3 +49,6 @@ public final class Tag: @unchecked Sendable, Codable, JSONEncodable, Hashable { } } + +@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *) +extension PetstoreClientAPI.Tag: Identifiable {} diff --git a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/User.swift b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/User.swift index 0eafd7fe8b7c..1b1796878dbe 100644 --- a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/User.swift +++ b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/User.swift @@ -86,3 +86,6 @@ public final class User: @unchecked Sendable, Codable, JSONEncodable, Hashable { } } + +@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *) +extension PetstoreClientAPI.User: Identifiable {} diff --git a/samples/client/petstore/swift6/vaporLibrary/Sources/PetstoreClient/Models/Category.swift b/samples/client/petstore/swift6/vaporLibrary/Sources/PetstoreClient/Models/Category.swift index 58991bb8b7ba..e2115d08fbe0 100644 --- a/samples/client/petstore/swift6/vaporLibrary/Sources/PetstoreClient/Models/Category.swift +++ b/samples/client/petstore/swift6/vaporLibrary/Sources/PetstoreClient/Models/Category.swift @@ -44,3 +44,6 @@ public final class Category: Content, Hashable { } } + +@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *) +extension Category: Identifiable {} diff --git a/samples/client/petstore/swift6/vaporLibrary/Sources/PetstoreClient/Models/Order.swift b/samples/client/petstore/swift6/vaporLibrary/Sources/PetstoreClient/Models/Order.swift index b34947183715..c6ebc2461026 100644 --- a/samples/client/petstore/swift6/vaporLibrary/Sources/PetstoreClient/Models/Order.swift +++ b/samples/client/petstore/swift6/vaporLibrary/Sources/PetstoreClient/Models/Order.swift @@ -74,3 +74,6 @@ public final class Order: Content, Hashable { } } + +@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *) +extension Order: Identifiable {} diff --git a/samples/client/petstore/swift6/vaporLibrary/Sources/PetstoreClient/Models/Pet.swift b/samples/client/petstore/swift6/vaporLibrary/Sources/PetstoreClient/Models/Pet.swift index 2fa70388b17a..063415378890 100644 --- a/samples/client/petstore/swift6/vaporLibrary/Sources/PetstoreClient/Models/Pet.swift +++ b/samples/client/petstore/swift6/vaporLibrary/Sources/PetstoreClient/Models/Pet.swift @@ -75,3 +75,6 @@ public final class Pet: Content, Hashable { } } + +@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *) +extension Pet: Identifiable {} diff --git a/samples/client/petstore/swift6/vaporLibrary/Sources/PetstoreClient/Models/Tag.swift b/samples/client/petstore/swift6/vaporLibrary/Sources/PetstoreClient/Models/Tag.swift index 88753a144ffb..530aec30b0b0 100644 --- a/samples/client/petstore/swift6/vaporLibrary/Sources/PetstoreClient/Models/Tag.swift +++ b/samples/client/petstore/swift6/vaporLibrary/Sources/PetstoreClient/Models/Tag.swift @@ -44,3 +44,6 @@ public final class Tag: Content, Hashable { } } + +@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *) +extension Tag: Identifiable {} diff --git a/samples/client/petstore/swift6/vaporLibrary/Sources/PetstoreClient/Models/User.swift b/samples/client/petstore/swift6/vaporLibrary/Sources/PetstoreClient/Models/User.swift index 6bff68639652..38fbd26b4303 100644 --- a/samples/client/petstore/swift6/vaporLibrary/Sources/PetstoreClient/Models/User.swift +++ b/samples/client/petstore/swift6/vaporLibrary/Sources/PetstoreClient/Models/User.swift @@ -81,3 +81,6 @@ public final class User: Content, Hashable { } } + +@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *) +extension User: Identifiable {}