diff --git a/bin/configs/swift6-combineDeferredLibrary.yaml b/bin/configs/swift6-combineDeferredLibrary.yaml index 7496bc505b0..cda2dd3e3d7 100644 --- a/bin/configs/swift6-combineDeferredLibrary.yaml +++ b/bin/configs/swift6-combineDeferredLibrary.yaml @@ -5,6 +5,7 @@ templateDir: modules/openapi-generator/src/main/resources/swift6 generateAliasAsModel: true additionalProperties: responseAs: Combine + useSPMFileStructure: false podAuthors: "" podSummary: PetstoreClient projectName: PetstoreClient diff --git a/bin/configs/swift6-combineLibrary.yaml b/bin/configs/swift6-combineLibrary.yaml index 955fd6eeaa1..4e4fee0806d 100644 --- a/bin/configs/swift6-combineLibrary.yaml +++ b/bin/configs/swift6-combineLibrary.yaml @@ -6,6 +6,7 @@ generateAliasAsModel: true additionalProperties: responseAs: Combine combineDeferred: false + swiftPackagePath: "Sources/CombineLibrary" podAuthors: "" podSummary: PetstoreClient projectName: PetstoreClient diff --git a/bin/configs/swift6-oneOf.yaml b/bin/configs/swift6-oneOf.yaml index a5df35f8154..6a719fa033c 100644 --- a/bin/configs/swift6-oneOf.yaml +++ b/bin/configs/swift6-oneOf.yaml @@ -4,6 +4,7 @@ inputSpec: modules/openapi-generator/src/test/resources/3_0/oneOf.yaml templateDir: modules/openapi-generator/src/main/resources/swift6 generateAliasAsModel: true additionalProperties: + useSPMFileStructure: false podAuthors: "" podSummary: PetstoreClient projectName: PetstoreClient diff --git a/bin/configs/swift6-promisekitLibrary.yaml b/bin/configs/swift6-promisekitLibrary.yaml index 5634bd902b4..ca7053bf5df 100644 --- a/bin/configs/swift6-promisekitLibrary.yaml +++ b/bin/configs/swift6-promisekitLibrary.yaml @@ -4,6 +4,7 @@ inputSpec: modules/openapi-generator/src/test/resources/2_0/swift/petstore-with- templateDir: modules/openapi-generator/src/main/resources/swift6 generateAliasAsModel: true additionalProperties: + useSPMFileStructure: false responseAs: PromiseKit podAuthors: "" podSummary: PetstoreClient diff --git a/bin/configs/swift6-resultLibrary.yaml b/bin/configs/swift6-resultLibrary.yaml index 07f64247be0..3296289539a 100644 --- a/bin/configs/swift6-resultLibrary.yaml +++ b/bin/configs/swift6-resultLibrary.yaml @@ -5,6 +5,7 @@ templateDir: modules/openapi-generator/src/main/resources/swift6 generateAliasAsModel: true additionalProperties: responseAs: Result + useSPMFileStructure: false podAuthors: "" podSummary: PetstoreClient sortParamsByRequiredFlag: false diff --git a/bin/configs/swift6-rxswiftLibrary.yaml b/bin/configs/swift6-rxswiftLibrary.yaml index 8221669ca6a..bc9c4f02f92 100644 --- a/bin/configs/swift6-rxswiftLibrary.yaml +++ b/bin/configs/swift6-rxswiftLibrary.yaml @@ -5,6 +5,7 @@ templateDir: modules/openapi-generator/src/main/resources/swift6 generateAliasAsModel: true additionalProperties: responseAs: RxSwift + useSPMFileStructure: false podAuthors: "" podSummary: PetstoreClient projectName: PetstoreClient diff --git a/bin/configs/swift6-validation.yaml b/bin/configs/swift6-validation.yaml index 0eec4f88675..d2ab2c83fb3 100644 --- a/bin/configs/swift6-validation.yaml +++ b/bin/configs/swift6-validation.yaml @@ -4,6 +4,7 @@ inputSpec: modules/openapi-generator/src/test/resources/3_0/validation.yaml templateDir: modules/openapi-generator/src/main/resources/swift6 generateAliasAsModel: true additionalProperties: + useSPMFileStructure: false podAuthors: "" podSummary: PetstoreClient projectName: PetstoreClient diff --git a/docs/generators/swift6.md b/docs/generators/swift6.md index 2db4ad7bafa..404cebc54bd 100644 --- a/docs/generators/swift6.md +++ b/docs/generators/swift6.md @@ -50,13 +50,13 @@ These options may be applied as additional-properties (cli) or configOptions (pl |responseAs|Optionally use libraries to manage response. Currently PromiseKit, RxSwift, Result, Combine, AsyncAwait are available.| |null| |sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true| |sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true| -|swiftPackagePath|Set a custom source path instead of OpenAPIClient/Classes/OpenAPIs.| |null| +|swiftPackagePath|Set a custom source path instead of Sources/{{projectName}}.| |null| |swiftUseApiNamespace|Flag to make all the API classes inner-class of {{projectName}}API| |null| |useBacktickEscapes|Escape reserved words using backticks (default: false)| |false| |useClasses|Use final classes for models instead of structs (default: false)| |false| |useCustomDateWithoutTime|Uses a custom type to decode and encode dates without time information to support OpenAPIs date format (default: false)| |false| |useJsonEncodable|Make models conform to JSONEncodable protocol (default: true)| |true| -|useSPMFileStructure|Use SPM file structure and set the source path to Sources/{{projectName}} (default: false).| |null| +|useSPMFileStructure|Use SPM file structure and set the source path to Sources/{{projectName}} (default: true).| |null| |validatable|Make validation rules and validator for model properies (default: true)| |true| ## IMPORT MAPPING 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 efef7a6996d..9a272236f82 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 @@ -98,9 +98,9 @@ public class Swift6ClientCodegen extends DefaultCodegen implements CodegenConfig @Setter protected boolean swiftUseApiNamespace = false; @Setter - protected boolean useSPMFileStructure = false; + protected boolean useSPMFileStructure = true; @Setter - protected String swiftPackagePath = "Classes" + File.separator + "OpenAPIs"; + protected String swiftPackagePath = "Sources" + File.separator + projectName; @Setter protected boolean oneOfUnknownDefaultCase = false; @Setter @@ -323,9 +323,9 @@ public class Swift6ClientCodegen extends DefaultCodegen implements CodegenConfig cliOptions.add(new CliOption(CodegenConstants.API_NAME_PREFIX, CodegenConstants.API_NAME_PREFIX_DESC)); cliOptions.add(new CliOption(USE_SPM_FILE_STRUCTURE, "Use SPM file structure" - + " and set the source path to Sources" + File.separator + "{{projectName}} (default: false).")); + + " and set the source path to Sources" + File.separator + "{{projectName}} (default: true).")); cliOptions.add(new CliOption(SWIFT_PACKAGE_PATH, "Set a custom source path instead of " - + projectName + File.separator + "Classes" + File.separator + "OpenAPIs" + ".")); + + "Sources" + File.separator + "{{projectName}}" + ".")); cliOptions.add(new CliOption(USE_CLASSES, "Use final classes for models instead of structs (default: false)") .defaultValue(Boolean.FALSE.toString())); @@ -458,7 +458,6 @@ public class Swift6ClientCodegen extends DefaultCodegen implements CodegenConfig } else { additionalProperties.put(PROJECT_NAME, projectName); } - sourceFolder = projectName + File.separator + sourceFolder; // Setup nonPublicApi option, which generates code with reduced access // modifiers; allows embedding elsewhere without exposing non-public API calls @@ -517,6 +516,7 @@ public class Swift6ClientCodegen extends DefaultCodegen implements CodegenConfig if (additionalProperties.containsKey(SWIFT_USE_API_NAMESPACE)) { setSwiftUseApiNamespace(convertPropertyToBooleanAndWriteBack(SWIFT_USE_API_NAMESPACE)); } + additionalProperties.put(SWIFT_USE_API_NAMESPACE, swiftUseApiNamespace); if (!additionalProperties.containsKey(POD_AUTHORS)) { additionalProperties.put(POD_AUTHORS, DEFAULT_POD_AUTHORS); @@ -524,7 +524,12 @@ public class Swift6ClientCodegen extends DefaultCodegen implements CodegenConfig if (additionalProperties.containsKey(USE_SPM_FILE_STRUCTURE)) { setUseSPMFileStructure(convertPropertyToBooleanAndWriteBack(USE_SPM_FILE_STRUCTURE)); + } + additionalProperties.put(USE_SPM_FILE_STRUCTURE, useSPMFileStructure); + if (useSPMFileStructure) { sourceFolder = "Sources" + File.separator + projectName; + } else { + sourceFolder = projectName + File.separator + "Classes" + File.separator + "OpenAPIs"; } if (additionalProperties.containsKey(SWIFT_PACKAGE_PATH) diff --git a/samples/client/petstore/swift6/alamofireLibrary/.openapi-generator/FILES b/samples/client/petstore/swift6/alamofireLibrary/.openapi-generator/FILES index 21318228abe..6efbd60dd6a 100644 --- a/samples/client/petstore/swift6/alamofireLibrary/.openapi-generator/FILES +++ b/samples/client/petstore/swift6/alamofireLibrary/.openapi-generator/FILES @@ -3,64 +3,64 @@ Cartfile Package.swift PetstoreClient.podspec -PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift -PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift -PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift -PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift -PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift -PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift -PetstoreClient/Classes/OpenAPIs/Infrastructure/APIHelper.swift -PetstoreClient/Classes/OpenAPIs/Infrastructure/APIs.swift -PetstoreClient/Classes/OpenAPIs/Infrastructure/AlamofireImplementations.swift -PetstoreClient/Classes/OpenAPIs/Infrastructure/CodableHelper.swift -PetstoreClient/Classes/OpenAPIs/Infrastructure/Extensions.swift -PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONDataEncoding.swift -PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONEncodingHelper.swift -PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONValue.swift -PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift -PetstoreClient/Classes/OpenAPIs/Infrastructure/OpenAPIDateWithoutTime.swift -PetstoreClient/Classes/OpenAPIs/Infrastructure/OpenISO8601DateFormatter.swift -PetstoreClient/Classes/OpenAPIs/Infrastructure/SynchronizedDictionary.swift -PetstoreClient/Classes/OpenAPIs/Infrastructure/Validation.swift -PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift -PetstoreClient/Classes/OpenAPIs/Models/Animal.swift -PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift -PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift -PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift -PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift -PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift -PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift -PetstoreClient/Classes/OpenAPIs/Models/Cat.swift -PetstoreClient/Classes/OpenAPIs/Models/Category.swift -PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift -PetstoreClient/Classes/OpenAPIs/Models/Client.swift -PetstoreClient/Classes/OpenAPIs/Models/Dog.swift -PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift -PetstoreClient/Classes/OpenAPIs/Models/EnumClass.swift -PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift -PetstoreClient/Classes/OpenAPIs/Models/File.swift -PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift -PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift -PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift -PetstoreClient/Classes/OpenAPIs/Models/List.swift -PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift -PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift -PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift -PetstoreClient/Classes/OpenAPIs/Models/Name.swift -PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift -PetstoreClient/Classes/OpenAPIs/Models/Order.swift -PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift -PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift -PetstoreClient/Classes/OpenAPIs/Models/Pet.swift -PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift -PetstoreClient/Classes/OpenAPIs/Models/Return.swift -PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift -PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift -PetstoreClient/Classes/OpenAPIs/Models/Tag.swift -PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift -PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift -PetstoreClient/Classes/OpenAPIs/Models/User.swift README.md +Sources/PetstoreClient/APIs/AnotherFakeAPI.swift +Sources/PetstoreClient/APIs/FakeAPI.swift +Sources/PetstoreClient/APIs/FakeClassnameTags123API.swift +Sources/PetstoreClient/APIs/PetAPI.swift +Sources/PetstoreClient/APIs/StoreAPI.swift +Sources/PetstoreClient/APIs/UserAPI.swift +Sources/PetstoreClient/Infrastructure/APIHelper.swift +Sources/PetstoreClient/Infrastructure/APIs.swift +Sources/PetstoreClient/Infrastructure/AlamofireImplementations.swift +Sources/PetstoreClient/Infrastructure/CodableHelper.swift +Sources/PetstoreClient/Infrastructure/Extensions.swift +Sources/PetstoreClient/Infrastructure/JSONDataEncoding.swift +Sources/PetstoreClient/Infrastructure/JSONEncodingHelper.swift +Sources/PetstoreClient/Infrastructure/JSONValue.swift +Sources/PetstoreClient/Infrastructure/Models.swift +Sources/PetstoreClient/Infrastructure/OpenAPIDateWithoutTime.swift +Sources/PetstoreClient/Infrastructure/OpenISO8601DateFormatter.swift +Sources/PetstoreClient/Infrastructure/SynchronizedDictionary.swift +Sources/PetstoreClient/Infrastructure/Validation.swift +Sources/PetstoreClient/Models/AdditionalPropertiesClass.swift +Sources/PetstoreClient/Models/Animal.swift +Sources/PetstoreClient/Models/AnimalFarm.swift +Sources/PetstoreClient/Models/ApiResponse.swift +Sources/PetstoreClient/Models/ArrayOfArrayOfNumberOnly.swift +Sources/PetstoreClient/Models/ArrayOfNumberOnly.swift +Sources/PetstoreClient/Models/ArrayTest.swift +Sources/PetstoreClient/Models/Capitalization.swift +Sources/PetstoreClient/Models/Cat.swift +Sources/PetstoreClient/Models/Category.swift +Sources/PetstoreClient/Models/ClassModel.swift +Sources/PetstoreClient/Models/Client.swift +Sources/PetstoreClient/Models/Dog.swift +Sources/PetstoreClient/Models/EnumArrays.swift +Sources/PetstoreClient/Models/EnumClass.swift +Sources/PetstoreClient/Models/EnumTest.swift +Sources/PetstoreClient/Models/File.swift +Sources/PetstoreClient/Models/FileSchemaTestClass.swift +Sources/PetstoreClient/Models/FormatTest.swift +Sources/PetstoreClient/Models/HasOnlyReadOnly.swift +Sources/PetstoreClient/Models/List.swift +Sources/PetstoreClient/Models/MapTest.swift +Sources/PetstoreClient/Models/MixedPropertiesAndAdditionalPropertiesClass.swift +Sources/PetstoreClient/Models/Model200Response.swift +Sources/PetstoreClient/Models/Name.swift +Sources/PetstoreClient/Models/NumberOnly.swift +Sources/PetstoreClient/Models/Order.swift +Sources/PetstoreClient/Models/OuterComposite.swift +Sources/PetstoreClient/Models/OuterEnum.swift +Sources/PetstoreClient/Models/Pet.swift +Sources/PetstoreClient/Models/ReadOnlyFirst.swift +Sources/PetstoreClient/Models/Return.swift +Sources/PetstoreClient/Models/SpecialModelName.swift +Sources/PetstoreClient/Models/StringBooleanMap.swift +Sources/PetstoreClient/Models/Tag.swift +Sources/PetstoreClient/Models/TypeHolderDefault.swift +Sources/PetstoreClient/Models/TypeHolderExample.swift +Sources/PetstoreClient/Models/User.swift docs/AdditionalPropertiesClass.md docs/Animal.md docs/AnimalFarm.md diff --git a/samples/client/petstore/swift6/alamofireLibrary/Package.swift b/samples/client/petstore/swift6/alamofireLibrary/Package.swift index 5c25f3a2928..05d92a11b45 100644 --- a/samples/client/petstore/swift6/alamofireLibrary/Package.swift +++ b/samples/client/petstore/swift6/alamofireLibrary/Package.swift @@ -27,7 +27,7 @@ let package = Package( .target( name: "PetstoreClient", dependencies: ["Alamofire", ], - path: "PetstoreClient/Classes" + path: "Sources/PetstoreClient" ), ], swiftLanguageModes: [.v6] diff --git a/samples/client/petstore/swift6/alamofireLibrary/PetstoreClient.podspec b/samples/client/petstore/swift6/alamofireLibrary/PetstoreClient.podspec index be7a108a938..4b5585be60c 100644 --- a/samples/client/petstore/swift6/alamofireLibrary/PetstoreClient.podspec +++ b/samples/client/petstore/swift6/alamofireLibrary/PetstoreClient.podspec @@ -10,6 +10,6 @@ Pod::Spec.new do |s| s.license = 'Proprietary' s.homepage = 'https://github.com/openapitools/openapi-generator' s.summary = 'PetstoreClient' - s.source_files = 'PetstoreClient/Classes/**/*.swift' + s.source_files = 'Sources/PetstoreClient/**/*.swift' s.dependency 'Alamofire', '~> 5.9' end diff --git a/samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/APIs/AnotherFakeAPI.swift similarity index 100% rename from samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift rename to samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/APIs/AnotherFakeAPI.swift diff --git a/samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/APIs/FakeAPI.swift similarity index 100% rename from samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift rename to samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/APIs/FakeAPI.swift diff --git a/samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/APIs/FakeClassnameTags123API.swift similarity index 100% rename from samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift rename to samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/APIs/FakeClassnameTags123API.swift diff --git a/samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/APIs/PetAPI.swift similarity index 100% rename from samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift rename to samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/APIs/PetAPI.swift diff --git a/samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/APIs/StoreAPI.swift similarity index 100% rename from samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift rename to samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/APIs/StoreAPI.swift diff --git a/samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/APIs/UserAPI.swift similarity index 100% rename from samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift rename to samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/APIs/UserAPI.swift diff --git a/samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIHelper.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Infrastructure/APIHelper.swift similarity index 100% rename from samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIHelper.swift rename to samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Infrastructure/APIHelper.swift diff --git a/samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIs.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Infrastructure/APIs.swift similarity index 100% rename from samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIs.swift rename to samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Infrastructure/APIs.swift diff --git a/samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/AlamofireImplementations.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Infrastructure/AlamofireImplementations.swift similarity index 100% rename from samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/AlamofireImplementations.swift rename to samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Infrastructure/AlamofireImplementations.swift diff --git a/samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/CodableHelper.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Infrastructure/CodableHelper.swift similarity index 100% rename from samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/CodableHelper.swift rename to samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Infrastructure/CodableHelper.swift diff --git a/samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Extensions.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Infrastructure/Extensions.swift similarity index 100% rename from samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Extensions.swift rename to samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Infrastructure/Extensions.swift diff --git a/samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONDataEncoding.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Infrastructure/JSONDataEncoding.swift similarity index 100% rename from samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONDataEncoding.swift rename to samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Infrastructure/JSONDataEncoding.swift diff --git a/samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONEncodingHelper.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Infrastructure/JSONEncodingHelper.swift similarity index 100% rename from samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONEncodingHelper.swift rename to samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Infrastructure/JSONEncodingHelper.swift diff --git a/samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONValue.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Infrastructure/JSONValue.swift similarity index 100% rename from samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONValue.swift rename to samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Infrastructure/JSONValue.swift diff --git a/samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Infrastructure/Models.swift similarity index 100% rename from samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift rename to samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Infrastructure/Models.swift diff --git a/samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/OpenAPIDateWithoutTime.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Infrastructure/OpenAPIDateWithoutTime.swift similarity index 100% rename from samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/OpenAPIDateWithoutTime.swift rename to samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Infrastructure/OpenAPIDateWithoutTime.swift diff --git a/samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/OpenISO8601DateFormatter.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Infrastructure/OpenISO8601DateFormatter.swift similarity index 100% rename from samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/OpenISO8601DateFormatter.swift rename to samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Infrastructure/OpenISO8601DateFormatter.swift diff --git a/samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/SynchronizedDictionary.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Infrastructure/SynchronizedDictionary.swift similarity index 100% rename from samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/SynchronizedDictionary.swift rename to samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Infrastructure/SynchronizedDictionary.swift diff --git a/samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Validation.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Infrastructure/Validation.swift similarity index 100% rename from samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Validation.swift rename to samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Infrastructure/Validation.swift diff --git a/samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/AdditionalPropertiesClass.swift similarity index 100% rename from samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift rename to samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/AdditionalPropertiesClass.swift diff --git a/samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Animal.swift similarity index 100% rename from samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift rename to samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Animal.swift diff --git a/samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/AnimalFarm.swift similarity index 100% rename from samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift rename to samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/AnimalFarm.swift diff --git a/samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/ApiResponse.swift similarity index 100% rename from samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift rename to samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/ApiResponse.swift diff --git a/samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/ArrayOfArrayOfNumberOnly.swift similarity index 100% rename from samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift rename to samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/ArrayOfArrayOfNumberOnly.swift diff --git a/samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/ArrayOfNumberOnly.swift similarity index 100% rename from samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift rename to samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/ArrayOfNumberOnly.swift diff --git a/samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/ArrayTest.swift similarity index 100% rename from samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift rename to samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/ArrayTest.swift diff --git a/samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Capitalization.swift similarity index 100% rename from samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift rename to samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Capitalization.swift diff --git a/samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Cat.swift similarity index 100% rename from samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift rename to samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Cat.swift diff --git a/samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Category.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Category.swift similarity index 100% rename from samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Category.swift rename to samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Category.swift diff --git a/samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/ClassModel.swift similarity index 100% rename from samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift rename to samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/ClassModel.swift diff --git a/samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Client.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Client.swift similarity index 100% rename from samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Client.swift rename to samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Client.swift diff --git a/samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Dog.swift similarity index 100% rename from samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift rename to samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Dog.swift diff --git a/samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/EnumArrays.swift similarity index 100% rename from samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift rename to samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/EnumArrays.swift diff --git a/samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumClass.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/EnumClass.swift similarity index 100% rename from samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumClass.swift rename to samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/EnumClass.swift diff --git a/samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/EnumTest.swift similarity index 100% rename from samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift rename to samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/EnumTest.swift diff --git a/samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/File.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/File.swift similarity index 100% rename from samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/File.swift rename to samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/File.swift diff --git a/samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/FileSchemaTestClass.swift similarity index 100% rename from samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift rename to samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/FileSchemaTestClass.swift diff --git a/samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/FormatTest.swift similarity index 100% rename from samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift rename to samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/FormatTest.swift diff --git a/samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/HasOnlyReadOnly.swift similarity index 100% rename from samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift rename to samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/HasOnlyReadOnly.swift diff --git a/samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/List.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/List.swift similarity index 100% rename from samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/List.swift rename to samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/List.swift diff --git a/samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/MapTest.swift similarity index 100% rename from samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift rename to samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/MapTest.swift diff --git a/samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/MixedPropertiesAndAdditionalPropertiesClass.swift similarity index 100% rename from samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift rename to samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/MixedPropertiesAndAdditionalPropertiesClass.swift diff --git a/samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Model200Response.swift similarity index 100% rename from samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift rename to samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Model200Response.swift diff --git a/samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Name.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Name.swift similarity index 100% rename from samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Name.swift rename to samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Name.swift diff --git a/samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/NumberOnly.swift similarity index 100% rename from samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift rename to samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/NumberOnly.swift diff --git a/samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Order.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Order.swift similarity index 100% rename from samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Order.swift rename to samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Order.swift diff --git a/samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/OuterComposite.swift similarity index 100% rename from samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift rename to samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/OuterComposite.swift diff --git a/samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/OuterEnum.swift similarity index 100% rename from samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift rename to samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/OuterEnum.swift diff --git a/samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Pet.swift similarity index 100% rename from samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift rename to samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Pet.swift diff --git a/samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/ReadOnlyFirst.swift similarity index 100% rename from samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift rename to samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/ReadOnlyFirst.swift diff --git a/samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Return.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Return.swift similarity index 100% rename from samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Return.swift rename to samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Return.swift diff --git a/samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/SpecialModelName.swift similarity index 100% rename from samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift rename to samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/SpecialModelName.swift diff --git a/samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/StringBooleanMap.swift similarity index 100% rename from samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift rename to samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/StringBooleanMap.swift diff --git a/samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Tag.swift similarity index 100% rename from samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift rename to samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/Tag.swift diff --git a/samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/TypeHolderDefault.swift similarity index 100% rename from samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift rename to samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/TypeHolderDefault.swift diff --git a/samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/TypeHolderExample.swift similarity index 100% rename from samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift rename to samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/TypeHolderExample.swift diff --git a/samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/User.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/User.swift similarity index 100% rename from samples/client/petstore/swift6/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/User.swift rename to samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/User.swift diff --git a/samples/client/petstore/swift6/alamofireLibrary/project.yml b/samples/client/petstore/swift6/alamofireLibrary/project.yml index 98c6aa3a8c7..21b010a631c 100644 --- a/samples/client/petstore/swift6/alamofireLibrary/project.yml +++ b/samples/client/petstore/swift6/alamofireLibrary/project.yml @@ -4,7 +4,7 @@ targets: type: framework platform: iOS deploymentTarget: "11.0" - sources: [PetstoreClient] + sources: [Sources] info: path: ./Info.plist version: 1.0.0 diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/.openapi-generator/FILES b/samples/client/petstore/swift6/apiNonStaticMethod/.openapi-generator/FILES index 7eb01325c4c..36369982241 100644 --- a/samples/client/petstore/swift6/apiNonStaticMethod/.openapi-generator/FILES +++ b/samples/client/petstore/swift6/apiNonStaticMethod/.openapi-generator/FILES @@ -3,61 +3,61 @@ Cartfile Package.swift PetstoreClient.podspec -PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift -PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift -PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift -PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift -PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift -PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift -PetstoreClient/Classes/OpenAPIs/Infrastructure/APIHelper.swift -PetstoreClient/Classes/OpenAPIs/Infrastructure/APIs.swift -PetstoreClient/Classes/OpenAPIs/Infrastructure/AlamofireImplementations.swift -PetstoreClient/Classes/OpenAPIs/Infrastructure/CodableHelper.swift -PetstoreClient/Classes/OpenAPIs/Infrastructure/Extensions.swift -PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONDataEncoding.swift -PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONEncodingHelper.swift -PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONValue.swift -PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift -PetstoreClient/Classes/OpenAPIs/Infrastructure/OpenISO8601DateFormatter.swift -PetstoreClient/Classes/OpenAPIs/Infrastructure/SynchronizedDictionary.swift -PetstoreClient/Classes/OpenAPIs/Infrastructure/Validation.swift -PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift -PetstoreClient/Classes/OpenAPIs/Models/Animal.swift -PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift -PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift -PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift -PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift -PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift -PetstoreClient/Classes/OpenAPIs/Models/Cat.swift -PetstoreClient/Classes/OpenAPIs/Models/Category.swift -PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift -PetstoreClient/Classes/OpenAPIs/Models/Client.swift -PetstoreClient/Classes/OpenAPIs/Models/Dog.swift -PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift -PetstoreClient/Classes/OpenAPIs/Models/EnumClass.swift -PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift -PetstoreClient/Classes/OpenAPIs/Models/File.swift -PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift -PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift -PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift -PetstoreClient/Classes/OpenAPIs/Models/List.swift -PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift -PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift -PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift -PetstoreClient/Classes/OpenAPIs/Models/Name.swift -PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift -PetstoreClient/Classes/OpenAPIs/Models/Order.swift -PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift -PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift -PetstoreClient/Classes/OpenAPIs/Models/Pet.swift -PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift -PetstoreClient/Classes/OpenAPIs/Models/Return.swift -PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift -PetstoreClient/Classes/OpenAPIs/Models/Tag.swift -PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift -PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift -PetstoreClient/Classes/OpenAPIs/Models/User.swift README.md +Sources/PetstoreClient/APIs/AnotherFakeAPI.swift +Sources/PetstoreClient/APIs/FakeAPI.swift +Sources/PetstoreClient/APIs/FakeClassnameTags123API.swift +Sources/PetstoreClient/APIs/PetAPI.swift +Sources/PetstoreClient/APIs/StoreAPI.swift +Sources/PetstoreClient/APIs/UserAPI.swift +Sources/PetstoreClient/Infrastructure/APIHelper.swift +Sources/PetstoreClient/Infrastructure/APIs.swift +Sources/PetstoreClient/Infrastructure/AlamofireImplementations.swift +Sources/PetstoreClient/Infrastructure/CodableHelper.swift +Sources/PetstoreClient/Infrastructure/Extensions.swift +Sources/PetstoreClient/Infrastructure/JSONDataEncoding.swift +Sources/PetstoreClient/Infrastructure/JSONEncodingHelper.swift +Sources/PetstoreClient/Infrastructure/JSONValue.swift +Sources/PetstoreClient/Infrastructure/Models.swift +Sources/PetstoreClient/Infrastructure/OpenISO8601DateFormatter.swift +Sources/PetstoreClient/Infrastructure/SynchronizedDictionary.swift +Sources/PetstoreClient/Infrastructure/Validation.swift +Sources/PetstoreClient/Models/AdditionalPropertiesClass.swift +Sources/PetstoreClient/Models/Animal.swift +Sources/PetstoreClient/Models/ApiResponse.swift +Sources/PetstoreClient/Models/ArrayOfArrayOfNumberOnly.swift +Sources/PetstoreClient/Models/ArrayOfNumberOnly.swift +Sources/PetstoreClient/Models/ArrayTest.swift +Sources/PetstoreClient/Models/Capitalization.swift +Sources/PetstoreClient/Models/Cat.swift +Sources/PetstoreClient/Models/Category.swift +Sources/PetstoreClient/Models/ClassModel.swift +Sources/PetstoreClient/Models/Client.swift +Sources/PetstoreClient/Models/Dog.swift +Sources/PetstoreClient/Models/EnumArrays.swift +Sources/PetstoreClient/Models/EnumClass.swift +Sources/PetstoreClient/Models/EnumTest.swift +Sources/PetstoreClient/Models/File.swift +Sources/PetstoreClient/Models/FileSchemaTestClass.swift +Sources/PetstoreClient/Models/FormatTest.swift +Sources/PetstoreClient/Models/HasOnlyReadOnly.swift +Sources/PetstoreClient/Models/List.swift +Sources/PetstoreClient/Models/MapTest.swift +Sources/PetstoreClient/Models/MixedPropertiesAndAdditionalPropertiesClass.swift +Sources/PetstoreClient/Models/Model200Response.swift +Sources/PetstoreClient/Models/Name.swift +Sources/PetstoreClient/Models/NumberOnly.swift +Sources/PetstoreClient/Models/Order.swift +Sources/PetstoreClient/Models/OuterComposite.swift +Sources/PetstoreClient/Models/OuterEnum.swift +Sources/PetstoreClient/Models/Pet.swift +Sources/PetstoreClient/Models/ReadOnlyFirst.swift +Sources/PetstoreClient/Models/Return.swift +Sources/PetstoreClient/Models/SpecialModelName.swift +Sources/PetstoreClient/Models/Tag.swift +Sources/PetstoreClient/Models/TypeHolderDefault.swift +Sources/PetstoreClient/Models/TypeHolderExample.swift +Sources/PetstoreClient/Models/User.swift docs/AdditionalPropertiesClass.md docs/Animal.md docs/AnotherFakeAPI.md diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/Package.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Package.swift index 7b9fe177781..2d80589c15e 100644 --- a/samples/client/petstore/swift6/apiNonStaticMethod/Package.swift +++ b/samples/client/petstore/swift6/apiNonStaticMethod/Package.swift @@ -29,7 +29,7 @@ let package = Package( .target( name: "PetstoreClient", dependencies: ["Alamofire", "PromiseKit", "RxSwift"], - path: "PetstoreClient/Classes" + path: "Sources/PetstoreClient" ), ], swiftLanguageModes: [.v6] diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient.podspec b/samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient.podspec index c3933c003f7..856687676df 100644 --- a/samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient.podspec +++ b/samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient.podspec @@ -10,7 +10,7 @@ Pod::Spec.new do |s| s.license = 'Proprietary' s.homepage = 'https://github.com/openapitools/openapi-generator' s.summary = 'PetstoreClient' - s.source_files = 'PetstoreClient/Classes/**/*.swift' + s.source_files = 'Sources/PetstoreClient/**/*.swift' s.dependency 'Alamofire', '~> 5.9' s.dependency 'PromiseKit/CorePromise', '~> 8.1' s.dependency 'RxSwift', '~> 6.7' diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/APIs/AnotherFakeAPI.swift similarity index 100% rename from samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift rename to samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/APIs/AnotherFakeAPI.swift diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/APIs/FakeAPI.swift similarity index 100% rename from samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift rename to samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/APIs/FakeAPI.swift diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/APIs/FakeClassnameTags123API.swift similarity index 100% rename from samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift rename to samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/APIs/FakeClassnameTags123API.swift diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/APIs/PetAPI.swift similarity index 100% rename from samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift rename to samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/APIs/PetAPI.swift diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/APIs/StoreAPI.swift similarity index 100% rename from samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift rename to samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/APIs/StoreAPI.swift diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/APIs/UserAPI.swift similarity index 100% rename from samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift rename to samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/APIs/UserAPI.swift diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIHelper.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Infrastructure/APIHelper.swift similarity index 100% rename from samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIHelper.swift rename to samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Infrastructure/APIHelper.swift diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIs.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Infrastructure/APIs.swift similarity index 100% rename from samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIs.swift rename to samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Infrastructure/APIs.swift diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Infrastructure/AlamofireImplementations.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Infrastructure/AlamofireImplementations.swift similarity index 100% rename from samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Infrastructure/AlamofireImplementations.swift rename to samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Infrastructure/AlamofireImplementations.swift diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Infrastructure/CodableHelper.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Infrastructure/CodableHelper.swift similarity index 100% rename from samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Infrastructure/CodableHelper.swift rename to samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Infrastructure/CodableHelper.swift diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Infrastructure/Extensions.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Infrastructure/Extensions.swift similarity index 100% rename from samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Infrastructure/Extensions.swift rename to samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Infrastructure/Extensions.swift diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONDataEncoding.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Infrastructure/JSONDataEncoding.swift similarity index 100% rename from samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONDataEncoding.swift rename to samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Infrastructure/JSONDataEncoding.swift diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONEncodingHelper.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Infrastructure/JSONEncodingHelper.swift similarity index 100% rename from samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONEncodingHelper.swift rename to samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Infrastructure/JSONEncodingHelper.swift diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONValue.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Infrastructure/JSONValue.swift similarity index 100% rename from samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONValue.swift rename to samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Infrastructure/JSONValue.swift diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Infrastructure/Models.swift similarity index 100% rename from samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift rename to samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Infrastructure/Models.swift diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Infrastructure/OpenISO8601DateFormatter.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Infrastructure/OpenISO8601DateFormatter.swift similarity index 100% rename from samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Infrastructure/OpenISO8601DateFormatter.swift rename to samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Infrastructure/OpenISO8601DateFormatter.swift diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Infrastructure/SynchronizedDictionary.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Infrastructure/SynchronizedDictionary.swift similarity index 100% rename from samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Infrastructure/SynchronizedDictionary.swift rename to samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Infrastructure/SynchronizedDictionary.swift diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Infrastructure/Validation.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Infrastructure/Validation.swift similarity index 100% rename from samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Infrastructure/Validation.swift rename to samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Infrastructure/Validation.swift diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/AdditionalPropertiesClass.swift similarity index 100% rename from samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift rename to samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/AdditionalPropertiesClass.swift diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Animal.swift similarity index 100% rename from samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift rename to samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Animal.swift diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/ApiResponse.swift similarity index 100% rename from samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift rename to samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/ApiResponse.swift diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/ArrayOfArrayOfNumberOnly.swift similarity index 100% rename from samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift rename to samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/ArrayOfArrayOfNumberOnly.swift diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/ArrayOfNumberOnly.swift similarity index 100% rename from samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift rename to samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/ArrayOfNumberOnly.swift diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/ArrayTest.swift similarity index 100% rename from samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift rename to samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/ArrayTest.swift diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Capitalization.swift similarity index 100% rename from samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift rename to samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Capitalization.swift diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Cat.swift similarity index 100% rename from samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift rename to samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Cat.swift diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Models/Category.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Category.swift similarity index 100% rename from samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Models/Category.swift rename to samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Category.swift diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/ClassModel.swift similarity index 100% rename from samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift rename to samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/ClassModel.swift diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Models/Client.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Client.swift similarity index 100% rename from samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Models/Client.swift rename to samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Client.swift diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Dog.swift similarity index 100% rename from samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift rename to samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Dog.swift diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/EnumArrays.swift similarity index 100% rename from samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift rename to samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/EnumArrays.swift diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Models/EnumClass.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/EnumClass.swift similarity index 100% rename from samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Models/EnumClass.swift rename to samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/EnumClass.swift diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/EnumTest.swift similarity index 100% rename from samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift rename to samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/EnumTest.swift diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Models/File.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/File.swift similarity index 100% rename from samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Models/File.swift rename to samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/File.swift diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/FileSchemaTestClass.swift similarity index 100% rename from samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift rename to samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/FileSchemaTestClass.swift diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/FormatTest.swift similarity index 100% rename from samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift rename to samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/FormatTest.swift diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/HasOnlyReadOnly.swift similarity index 100% rename from samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift rename to samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/HasOnlyReadOnly.swift diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Models/List.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/List.swift similarity index 100% rename from samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Models/List.swift rename to samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/List.swift diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/MapTest.swift similarity index 100% rename from samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift rename to samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/MapTest.swift diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/MixedPropertiesAndAdditionalPropertiesClass.swift similarity index 100% rename from samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift rename to samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/MixedPropertiesAndAdditionalPropertiesClass.swift diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Model200Response.swift similarity index 100% rename from samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift rename to samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Model200Response.swift diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Models/Name.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Name.swift similarity index 100% rename from samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Models/Name.swift rename to samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Name.swift diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/NumberOnly.swift similarity index 100% rename from samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift rename to samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/NumberOnly.swift diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Models/Order.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Order.swift similarity index 100% rename from samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Models/Order.swift rename to samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Order.swift diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/OuterComposite.swift similarity index 100% rename from samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift rename to samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/OuterComposite.swift diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/OuterEnum.swift similarity index 100% rename from samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift rename to samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/OuterEnum.swift diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Pet.swift similarity index 100% rename from samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift rename to samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Pet.swift diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/ReadOnlyFirst.swift similarity index 100% rename from samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift rename to samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/ReadOnlyFirst.swift diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Models/Return.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Return.swift similarity index 100% rename from samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Models/Return.swift rename to samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Return.swift diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/SpecialModelName.swift similarity index 100% rename from samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift rename to samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/SpecialModelName.swift diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Tag.swift similarity index 100% rename from samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift rename to samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/Tag.swift diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/TypeHolderDefault.swift similarity index 100% rename from samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift rename to samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/TypeHolderDefault.swift diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/TypeHolderExample.swift similarity index 100% rename from samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift rename to samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/TypeHolderExample.swift diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Models/User.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/User.swift similarity index 100% rename from samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient/Classes/OpenAPIs/Models/User.swift rename to samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/User.swift diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/project.yml b/samples/client/petstore/swift6/apiNonStaticMethod/project.yml index 5af0eaaa04d..afcb51d2e20 100644 --- a/samples/client/petstore/swift6/apiNonStaticMethod/project.yml +++ b/samples/client/petstore/swift6/apiNonStaticMethod/project.yml @@ -4,7 +4,7 @@ targets: type: framework platform: iOS deploymentTarget: "11.0" - sources: [PetstoreClient] + sources: [Sources] info: path: ./Info.plist version: 1.0.0 diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/.openapi-generator/FILES b/samples/client/petstore/swift6/asyncAwaitLibrary/.openapi-generator/FILES index 3689e4184e3..dbd6732f044 100644 --- a/samples/client/petstore/swift6/asyncAwaitLibrary/.openapi-generator/FILES +++ b/samples/client/petstore/swift6/asyncAwaitLibrary/.openapi-generator/FILES @@ -3,63 +3,63 @@ Cartfile Package.swift PetstoreClient.podspec -PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift -PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift -PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift -PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift -PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift -PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift -PetstoreClient/Classes/OpenAPIs/Infrastructure/APIHelper.swift -PetstoreClient/Classes/OpenAPIs/Infrastructure/APIs.swift -PetstoreClient/Classes/OpenAPIs/Infrastructure/CodableHelper.swift -PetstoreClient/Classes/OpenAPIs/Infrastructure/Extensions.swift -PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONDataEncoding.swift -PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONEncodingHelper.swift -PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONValue.swift -PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift -PetstoreClient/Classes/OpenAPIs/Infrastructure/OpenISO8601DateFormatter.swift -PetstoreClient/Classes/OpenAPIs/Infrastructure/SynchronizedDictionary.swift -PetstoreClient/Classes/OpenAPIs/Infrastructure/URLSessionImplementations.swift -PetstoreClient/Classes/OpenAPIs/Infrastructure/Validation.swift -PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift -PetstoreClient/Classes/OpenAPIs/Models/Animal.swift -PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift -PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift -PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift -PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift -PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift -PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift -PetstoreClient/Classes/OpenAPIs/Models/Cat.swift -PetstoreClient/Classes/OpenAPIs/Models/Category.swift -PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift -PetstoreClient/Classes/OpenAPIs/Models/Client.swift -PetstoreClient/Classes/OpenAPIs/Models/Dog.swift -PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift -PetstoreClient/Classes/OpenAPIs/Models/EnumClass.swift -PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift -PetstoreClient/Classes/OpenAPIs/Models/File.swift -PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift -PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift -PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift -PetstoreClient/Classes/OpenAPIs/Models/List.swift -PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift -PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift -PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift -PetstoreClient/Classes/OpenAPIs/Models/Name.swift -PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift -PetstoreClient/Classes/OpenAPIs/Models/Order.swift -PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift -PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift -PetstoreClient/Classes/OpenAPIs/Models/Pet.swift -PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift -PetstoreClient/Classes/OpenAPIs/Models/Return.swift -PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift -PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift -PetstoreClient/Classes/OpenAPIs/Models/Tag.swift -PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift -PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift -PetstoreClient/Classes/OpenAPIs/Models/User.swift README.md +Sources/PetstoreClient/APIs/AnotherFakeAPI.swift +Sources/PetstoreClient/APIs/FakeAPI.swift +Sources/PetstoreClient/APIs/FakeClassnameTags123API.swift +Sources/PetstoreClient/APIs/PetAPI.swift +Sources/PetstoreClient/APIs/StoreAPI.swift +Sources/PetstoreClient/APIs/UserAPI.swift +Sources/PetstoreClient/Infrastructure/APIHelper.swift +Sources/PetstoreClient/Infrastructure/APIs.swift +Sources/PetstoreClient/Infrastructure/CodableHelper.swift +Sources/PetstoreClient/Infrastructure/Extensions.swift +Sources/PetstoreClient/Infrastructure/JSONDataEncoding.swift +Sources/PetstoreClient/Infrastructure/JSONEncodingHelper.swift +Sources/PetstoreClient/Infrastructure/JSONValue.swift +Sources/PetstoreClient/Infrastructure/Models.swift +Sources/PetstoreClient/Infrastructure/OpenISO8601DateFormatter.swift +Sources/PetstoreClient/Infrastructure/SynchronizedDictionary.swift +Sources/PetstoreClient/Infrastructure/URLSessionImplementations.swift +Sources/PetstoreClient/Infrastructure/Validation.swift +Sources/PetstoreClient/Models/AdditionalPropertiesClass.swift +Sources/PetstoreClient/Models/Animal.swift +Sources/PetstoreClient/Models/AnimalFarm.swift +Sources/PetstoreClient/Models/ApiResponse.swift +Sources/PetstoreClient/Models/ArrayOfArrayOfNumberOnly.swift +Sources/PetstoreClient/Models/ArrayOfNumberOnly.swift +Sources/PetstoreClient/Models/ArrayTest.swift +Sources/PetstoreClient/Models/Capitalization.swift +Sources/PetstoreClient/Models/Cat.swift +Sources/PetstoreClient/Models/Category.swift +Sources/PetstoreClient/Models/ClassModel.swift +Sources/PetstoreClient/Models/Client.swift +Sources/PetstoreClient/Models/Dog.swift +Sources/PetstoreClient/Models/EnumArrays.swift +Sources/PetstoreClient/Models/EnumClass.swift +Sources/PetstoreClient/Models/EnumTest.swift +Sources/PetstoreClient/Models/File.swift +Sources/PetstoreClient/Models/FileSchemaTestClass.swift +Sources/PetstoreClient/Models/FormatTest.swift +Sources/PetstoreClient/Models/HasOnlyReadOnly.swift +Sources/PetstoreClient/Models/List.swift +Sources/PetstoreClient/Models/MapTest.swift +Sources/PetstoreClient/Models/MixedPropertiesAndAdditionalPropertiesClass.swift +Sources/PetstoreClient/Models/Model200Response.swift +Sources/PetstoreClient/Models/Name.swift +Sources/PetstoreClient/Models/NumberOnly.swift +Sources/PetstoreClient/Models/Order.swift +Sources/PetstoreClient/Models/OuterComposite.swift +Sources/PetstoreClient/Models/OuterEnum.swift +Sources/PetstoreClient/Models/Pet.swift +Sources/PetstoreClient/Models/ReadOnlyFirst.swift +Sources/PetstoreClient/Models/Return.swift +Sources/PetstoreClient/Models/SpecialModelName.swift +Sources/PetstoreClient/Models/StringBooleanMap.swift +Sources/PetstoreClient/Models/Tag.swift +Sources/PetstoreClient/Models/TypeHolderDefault.swift +Sources/PetstoreClient/Models/TypeHolderExample.swift +Sources/PetstoreClient/Models/User.swift docs/AdditionalPropertiesClass.md docs/Animal.md docs/AnimalFarm.md diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/Package.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Package.swift index dc5bc46564c..0c83fdb8747 100644 --- a/samples/client/petstore/swift6/asyncAwaitLibrary/Package.swift +++ b/samples/client/petstore/swift6/asyncAwaitLibrary/Package.swift @@ -26,7 +26,7 @@ let package = Package( .target( name: "PetstoreClient", dependencies: [], - path: "PetstoreClient/Classes" + path: "Sources/PetstoreClient" ), ], swiftLanguageModes: [.v6] diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient.podspec b/samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient.podspec index d5b8cefeffa..a438db34097 100644 --- a/samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient.podspec +++ b/samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient.podspec @@ -10,5 +10,5 @@ Pod::Spec.new do |s| s.license = 'Proprietary' s.homepage = 'https://github.com/openapitools/openapi-generator' s.summary = 'PetstoreClient' - s.source_files = 'PetstoreClient/Classes/**/*.swift' + s.source_files = 'Sources/PetstoreClient/**/*.swift' end diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/APIs/AnotherFakeAPI.swift similarity index 100% rename from samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift rename to samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/APIs/AnotherFakeAPI.swift diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/APIs/FakeAPI.swift similarity index 100% rename from samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift rename to samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/APIs/FakeAPI.swift diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/APIs/FakeClassnameTags123API.swift similarity index 100% rename from samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift rename to samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/APIs/FakeClassnameTags123API.swift diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/APIs/PetAPI.swift similarity index 100% rename from samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift rename to samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/APIs/PetAPI.swift diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/APIs/StoreAPI.swift similarity index 100% rename from samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift rename to samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/APIs/StoreAPI.swift diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/APIs/UserAPI.swift similarity index 100% rename from samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift rename to samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/APIs/UserAPI.swift diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIHelper.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Infrastructure/APIHelper.swift similarity index 100% rename from samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIHelper.swift rename to samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Infrastructure/APIHelper.swift diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIs.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Infrastructure/APIs.swift similarity index 100% rename from samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIs.swift rename to samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Infrastructure/APIs.swift diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/CodableHelper.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Infrastructure/CodableHelper.swift similarity index 100% rename from samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/CodableHelper.swift rename to samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Infrastructure/CodableHelper.swift diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Extensions.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Infrastructure/Extensions.swift similarity index 100% rename from samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Extensions.swift rename to samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Infrastructure/Extensions.swift diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONDataEncoding.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Infrastructure/JSONDataEncoding.swift similarity index 100% rename from samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONDataEncoding.swift rename to samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Infrastructure/JSONDataEncoding.swift diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONEncodingHelper.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Infrastructure/JSONEncodingHelper.swift similarity index 100% rename from samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONEncodingHelper.swift rename to samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Infrastructure/JSONEncodingHelper.swift diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONValue.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Infrastructure/JSONValue.swift similarity index 100% rename from samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONValue.swift rename to samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Infrastructure/JSONValue.swift diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Infrastructure/Models.swift similarity index 100% rename from samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift rename to samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Infrastructure/Models.swift diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/OpenISO8601DateFormatter.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Infrastructure/OpenISO8601DateFormatter.swift similarity index 100% rename from samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/OpenISO8601DateFormatter.swift rename to samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Infrastructure/OpenISO8601DateFormatter.swift diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/SynchronizedDictionary.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Infrastructure/SynchronizedDictionary.swift similarity index 100% rename from samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/SynchronizedDictionary.swift rename to samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Infrastructure/SynchronizedDictionary.swift diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/URLSessionImplementations.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Infrastructure/URLSessionImplementations.swift similarity index 100% rename from samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/URLSessionImplementations.swift rename to samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Infrastructure/URLSessionImplementations.swift diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Validation.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Infrastructure/Validation.swift similarity index 100% rename from samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Validation.swift rename to samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Infrastructure/Validation.swift diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/AdditionalPropertiesClass.swift similarity index 100% rename from samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift rename to samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/AdditionalPropertiesClass.swift diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Animal.swift similarity index 100% rename from samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift rename to samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Animal.swift diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/AnimalFarm.swift similarity index 100% rename from samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift rename to samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/AnimalFarm.swift diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/ApiResponse.swift similarity index 100% rename from samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift rename to samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/ApiResponse.swift diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/ArrayOfArrayOfNumberOnly.swift similarity index 100% rename from samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift rename to samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/ArrayOfArrayOfNumberOnly.swift diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/ArrayOfNumberOnly.swift similarity index 100% rename from samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift rename to samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/ArrayOfNumberOnly.swift diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/ArrayTest.swift similarity index 100% rename from samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift rename to samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/ArrayTest.swift diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Capitalization.swift similarity index 100% rename from samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift rename to samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Capitalization.swift diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Cat.swift similarity index 100% rename from samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift rename to samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Cat.swift diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Category.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Category.swift similarity index 100% rename from samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Category.swift rename to samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Category.swift diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/ClassModel.swift similarity index 100% rename from samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift rename to samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/ClassModel.swift diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Client.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Client.swift similarity index 100% rename from samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Client.swift rename to samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Client.swift diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Dog.swift similarity index 100% rename from samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift rename to samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Dog.swift diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/EnumArrays.swift similarity index 100% rename from samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift rename to samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/EnumArrays.swift diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumClass.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/EnumClass.swift similarity index 100% rename from samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumClass.swift rename to samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/EnumClass.swift diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/EnumTest.swift similarity index 100% rename from samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift rename to samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/EnumTest.swift diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Models/File.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/File.swift similarity index 100% rename from samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Models/File.swift rename to samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/File.swift diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/FileSchemaTestClass.swift similarity index 100% rename from samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift rename to samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/FileSchemaTestClass.swift diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/FormatTest.swift similarity index 100% rename from samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift rename to samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/FormatTest.swift diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/HasOnlyReadOnly.swift similarity index 100% rename from samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift rename to samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/HasOnlyReadOnly.swift diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Models/List.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/List.swift similarity index 100% rename from samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Models/List.swift rename to samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/List.swift diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/MapTest.swift similarity index 100% rename from samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift rename to samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/MapTest.swift diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/MixedPropertiesAndAdditionalPropertiesClass.swift similarity index 100% rename from samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift rename to samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/MixedPropertiesAndAdditionalPropertiesClass.swift diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Model200Response.swift similarity index 100% rename from samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift rename to samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Model200Response.swift diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Name.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Name.swift similarity index 100% rename from samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Name.swift rename to samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Name.swift diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/NumberOnly.swift similarity index 100% rename from samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift rename to samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/NumberOnly.swift diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Order.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Order.swift similarity index 100% rename from samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Order.swift rename to samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Order.swift diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/OuterComposite.swift similarity index 100% rename from samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift rename to samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/OuterComposite.swift diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/OuterEnum.swift similarity index 100% rename from samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift rename to samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/OuterEnum.swift diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Pet.swift similarity index 100% rename from samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift rename to samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Pet.swift diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/ReadOnlyFirst.swift similarity index 100% rename from samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift rename to samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/ReadOnlyFirst.swift diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Return.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Return.swift similarity index 100% rename from samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Return.swift rename to samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Return.swift diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/SpecialModelName.swift similarity index 100% rename from samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift rename to samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/SpecialModelName.swift diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/StringBooleanMap.swift similarity index 100% rename from samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift rename to samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/StringBooleanMap.swift diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Tag.swift similarity index 100% rename from samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift rename to samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/Tag.swift diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/TypeHolderDefault.swift similarity index 100% rename from samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift rename to samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/TypeHolderDefault.swift diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/TypeHolderExample.swift similarity index 100% rename from samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift rename to samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/TypeHolderExample.swift diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Models/User.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/User.swift similarity index 100% rename from samples/client/petstore/swift6/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Models/User.swift rename to samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/User.swift diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/project.yml b/samples/client/petstore/swift6/asyncAwaitLibrary/project.yml index 92ad41fa08d..f1dcabd67c6 100644 --- a/samples/client/petstore/swift6/asyncAwaitLibrary/project.yml +++ b/samples/client/petstore/swift6/asyncAwaitLibrary/project.yml @@ -4,7 +4,7 @@ targets: type: framework platform: iOS deploymentTarget: "11.0" - sources: [PetstoreClient] + sources: [Sources] info: path: ./Info.plist version: 1.0.0 diff --git a/samples/client/petstore/swift6/combineLibrary/.openapi-generator/FILES b/samples/client/petstore/swift6/combineLibrary/.openapi-generator/FILES index 3689e4184e3..744a4713bba 100644 --- a/samples/client/petstore/swift6/combineLibrary/.openapi-generator/FILES +++ b/samples/client/petstore/swift6/combineLibrary/.openapi-generator/FILES @@ -3,63 +3,63 @@ Cartfile Package.swift PetstoreClient.podspec -PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift -PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift -PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift -PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift -PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift -PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift -PetstoreClient/Classes/OpenAPIs/Infrastructure/APIHelper.swift -PetstoreClient/Classes/OpenAPIs/Infrastructure/APIs.swift -PetstoreClient/Classes/OpenAPIs/Infrastructure/CodableHelper.swift -PetstoreClient/Classes/OpenAPIs/Infrastructure/Extensions.swift -PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONDataEncoding.swift -PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONEncodingHelper.swift -PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONValue.swift -PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift -PetstoreClient/Classes/OpenAPIs/Infrastructure/OpenISO8601DateFormatter.swift -PetstoreClient/Classes/OpenAPIs/Infrastructure/SynchronizedDictionary.swift -PetstoreClient/Classes/OpenAPIs/Infrastructure/URLSessionImplementations.swift -PetstoreClient/Classes/OpenAPIs/Infrastructure/Validation.swift -PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift -PetstoreClient/Classes/OpenAPIs/Models/Animal.swift -PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift -PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift -PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift -PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift -PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift -PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift -PetstoreClient/Classes/OpenAPIs/Models/Cat.swift -PetstoreClient/Classes/OpenAPIs/Models/Category.swift -PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift -PetstoreClient/Classes/OpenAPIs/Models/Client.swift -PetstoreClient/Classes/OpenAPIs/Models/Dog.swift -PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift -PetstoreClient/Classes/OpenAPIs/Models/EnumClass.swift -PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift -PetstoreClient/Classes/OpenAPIs/Models/File.swift -PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift -PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift -PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift -PetstoreClient/Classes/OpenAPIs/Models/List.swift -PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift -PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift -PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift -PetstoreClient/Classes/OpenAPIs/Models/Name.swift -PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift -PetstoreClient/Classes/OpenAPIs/Models/Order.swift -PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift -PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift -PetstoreClient/Classes/OpenAPIs/Models/Pet.swift -PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift -PetstoreClient/Classes/OpenAPIs/Models/Return.swift -PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift -PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift -PetstoreClient/Classes/OpenAPIs/Models/Tag.swift -PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift -PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift -PetstoreClient/Classes/OpenAPIs/Models/User.swift README.md +Sources/CombineLibrary/APIs/AnotherFakeAPI.swift +Sources/CombineLibrary/APIs/FakeAPI.swift +Sources/CombineLibrary/APIs/FakeClassnameTags123API.swift +Sources/CombineLibrary/APIs/PetAPI.swift +Sources/CombineLibrary/APIs/StoreAPI.swift +Sources/CombineLibrary/APIs/UserAPI.swift +Sources/CombineLibrary/Infrastructure/APIHelper.swift +Sources/CombineLibrary/Infrastructure/APIs.swift +Sources/CombineLibrary/Infrastructure/CodableHelper.swift +Sources/CombineLibrary/Infrastructure/Extensions.swift +Sources/CombineLibrary/Infrastructure/JSONDataEncoding.swift +Sources/CombineLibrary/Infrastructure/JSONEncodingHelper.swift +Sources/CombineLibrary/Infrastructure/JSONValue.swift +Sources/CombineLibrary/Infrastructure/Models.swift +Sources/CombineLibrary/Infrastructure/OpenISO8601DateFormatter.swift +Sources/CombineLibrary/Infrastructure/SynchronizedDictionary.swift +Sources/CombineLibrary/Infrastructure/URLSessionImplementations.swift +Sources/CombineLibrary/Infrastructure/Validation.swift +Sources/CombineLibrary/Models/AdditionalPropertiesClass.swift +Sources/CombineLibrary/Models/Animal.swift +Sources/CombineLibrary/Models/AnimalFarm.swift +Sources/CombineLibrary/Models/ApiResponse.swift +Sources/CombineLibrary/Models/ArrayOfArrayOfNumberOnly.swift +Sources/CombineLibrary/Models/ArrayOfNumberOnly.swift +Sources/CombineLibrary/Models/ArrayTest.swift +Sources/CombineLibrary/Models/Capitalization.swift +Sources/CombineLibrary/Models/Cat.swift +Sources/CombineLibrary/Models/Category.swift +Sources/CombineLibrary/Models/ClassModel.swift +Sources/CombineLibrary/Models/Client.swift +Sources/CombineLibrary/Models/Dog.swift +Sources/CombineLibrary/Models/EnumArrays.swift +Sources/CombineLibrary/Models/EnumClass.swift +Sources/CombineLibrary/Models/EnumTest.swift +Sources/CombineLibrary/Models/File.swift +Sources/CombineLibrary/Models/FileSchemaTestClass.swift +Sources/CombineLibrary/Models/FormatTest.swift +Sources/CombineLibrary/Models/HasOnlyReadOnly.swift +Sources/CombineLibrary/Models/List.swift +Sources/CombineLibrary/Models/MapTest.swift +Sources/CombineLibrary/Models/MixedPropertiesAndAdditionalPropertiesClass.swift +Sources/CombineLibrary/Models/Model200Response.swift +Sources/CombineLibrary/Models/Name.swift +Sources/CombineLibrary/Models/NumberOnly.swift +Sources/CombineLibrary/Models/Order.swift +Sources/CombineLibrary/Models/OuterComposite.swift +Sources/CombineLibrary/Models/OuterEnum.swift +Sources/CombineLibrary/Models/Pet.swift +Sources/CombineLibrary/Models/ReadOnlyFirst.swift +Sources/CombineLibrary/Models/Return.swift +Sources/CombineLibrary/Models/SpecialModelName.swift +Sources/CombineLibrary/Models/StringBooleanMap.swift +Sources/CombineLibrary/Models/Tag.swift +Sources/CombineLibrary/Models/TypeHolderDefault.swift +Sources/CombineLibrary/Models/TypeHolderExample.swift +Sources/CombineLibrary/Models/User.swift docs/AdditionalPropertiesClass.md docs/Animal.md docs/AnimalFarm.md diff --git a/samples/client/petstore/swift6/combineLibrary/Package.swift b/samples/client/petstore/swift6/combineLibrary/Package.swift index dc5bc46564c..dc3d9db7cf9 100644 --- a/samples/client/petstore/swift6/combineLibrary/Package.swift +++ b/samples/client/petstore/swift6/combineLibrary/Package.swift @@ -26,7 +26,7 @@ let package = Package( .target( name: "PetstoreClient", dependencies: [], - path: "PetstoreClient/Classes" + path: "Sources/CombineLibrary" ), ], swiftLanguageModes: [.v6] diff --git a/samples/client/petstore/swift6/combineLibrary/PetstoreClient.podspec b/samples/client/petstore/swift6/combineLibrary/PetstoreClient.podspec index d5b8cefeffa..ead132efcb1 100644 --- a/samples/client/petstore/swift6/combineLibrary/PetstoreClient.podspec +++ b/samples/client/petstore/swift6/combineLibrary/PetstoreClient.podspec @@ -10,5 +10,5 @@ Pod::Spec.new do |s| s.license = 'Proprietary' s.homepage = 'https://github.com/openapitools/openapi-generator' s.summary = 'PetstoreClient' - s.source_files = 'PetstoreClient/Classes/**/*.swift' + s.source_files = 'Sources/CombineLibrary/**/*.swift' end diff --git a/samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/APIs/AnotherFakeAPI.swift similarity index 100% rename from samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift rename to samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/APIs/AnotherFakeAPI.swift diff --git a/samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/APIs/FakeAPI.swift similarity index 100% rename from samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift rename to samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/APIs/FakeAPI.swift diff --git a/samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/APIs/FakeClassnameTags123API.swift similarity index 100% rename from samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift rename to samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/APIs/FakeClassnameTags123API.swift diff --git a/samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/APIs/PetAPI.swift similarity index 100% rename from samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift rename to samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/APIs/PetAPI.swift diff --git a/samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/APIs/StoreAPI.swift similarity index 100% rename from samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift rename to samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/APIs/StoreAPI.swift diff --git a/samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/APIs/UserAPI.swift similarity index 100% rename from samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift rename to samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/APIs/UserAPI.swift diff --git a/samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIHelper.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Infrastructure/APIHelper.swift similarity index 100% rename from samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIHelper.swift rename to samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Infrastructure/APIHelper.swift diff --git a/samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIs.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Infrastructure/APIs.swift similarity index 100% rename from samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIs.swift rename to samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Infrastructure/APIs.swift diff --git a/samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/CodableHelper.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Infrastructure/CodableHelper.swift similarity index 100% rename from samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/CodableHelper.swift rename to samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Infrastructure/CodableHelper.swift diff --git a/samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Extensions.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Infrastructure/Extensions.swift similarity index 100% rename from samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Extensions.swift rename to samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Infrastructure/Extensions.swift diff --git a/samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONDataEncoding.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Infrastructure/JSONDataEncoding.swift similarity index 100% rename from samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONDataEncoding.swift rename to samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Infrastructure/JSONDataEncoding.swift diff --git a/samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONEncodingHelper.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Infrastructure/JSONEncodingHelper.swift similarity index 100% rename from samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONEncodingHelper.swift rename to samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Infrastructure/JSONEncodingHelper.swift diff --git a/samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONValue.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Infrastructure/JSONValue.swift similarity index 100% rename from samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONValue.swift rename to samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Infrastructure/JSONValue.swift diff --git a/samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Infrastructure/Models.swift similarity index 100% rename from samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift rename to samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Infrastructure/Models.swift diff --git a/samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/OpenISO8601DateFormatter.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Infrastructure/OpenISO8601DateFormatter.swift similarity index 100% rename from samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/OpenISO8601DateFormatter.swift rename to samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Infrastructure/OpenISO8601DateFormatter.swift diff --git a/samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/SynchronizedDictionary.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Infrastructure/SynchronizedDictionary.swift similarity index 100% rename from samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/SynchronizedDictionary.swift rename to samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Infrastructure/SynchronizedDictionary.swift diff --git a/samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/URLSessionImplementations.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Infrastructure/URLSessionImplementations.swift similarity index 100% rename from samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/URLSessionImplementations.swift rename to samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Infrastructure/URLSessionImplementations.swift diff --git a/samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Validation.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Infrastructure/Validation.swift similarity index 100% rename from samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Validation.swift rename to samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Infrastructure/Validation.swift diff --git a/samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/AdditionalPropertiesClass.swift similarity index 100% rename from samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift rename to samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/AdditionalPropertiesClass.swift diff --git a/samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/Animal.swift similarity index 100% rename from samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift rename to samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/Animal.swift diff --git a/samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/AnimalFarm.swift similarity index 100% rename from samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift rename to samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/AnimalFarm.swift diff --git a/samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/ApiResponse.swift similarity index 100% rename from samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift rename to samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/ApiResponse.swift diff --git a/samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/ArrayOfArrayOfNumberOnly.swift similarity index 100% rename from samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift rename to samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/ArrayOfArrayOfNumberOnly.swift diff --git a/samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/ArrayOfNumberOnly.swift similarity index 100% rename from samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift rename to samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/ArrayOfNumberOnly.swift diff --git a/samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/ArrayTest.swift similarity index 100% rename from samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift rename to samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/ArrayTest.swift diff --git a/samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/Capitalization.swift similarity index 100% rename from samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift rename to samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/Capitalization.swift diff --git a/samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/Cat.swift similarity index 100% rename from samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift rename to samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/Cat.swift diff --git a/samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Category.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/Category.swift similarity index 100% rename from samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Category.swift rename to samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/Category.swift diff --git a/samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/ClassModel.swift similarity index 100% rename from samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift rename to samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/ClassModel.swift diff --git a/samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Client.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/Client.swift similarity index 100% rename from samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Client.swift rename to samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/Client.swift diff --git a/samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/Dog.swift similarity index 100% rename from samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift rename to samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/Dog.swift diff --git a/samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/EnumArrays.swift similarity index 100% rename from samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift rename to samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/EnumArrays.swift diff --git a/samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumClass.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/EnumClass.swift similarity index 100% rename from samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumClass.swift rename to samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/EnumClass.swift diff --git a/samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/EnumTest.swift similarity index 100% rename from samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift rename to samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/EnumTest.swift diff --git a/samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/File.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/File.swift similarity index 100% rename from samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/File.swift rename to samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/File.swift diff --git a/samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/FileSchemaTestClass.swift similarity index 100% rename from samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift rename to samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/FileSchemaTestClass.swift diff --git a/samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/FormatTest.swift similarity index 100% rename from samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift rename to samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/FormatTest.swift diff --git a/samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/HasOnlyReadOnly.swift similarity index 100% rename from samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift rename to samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/HasOnlyReadOnly.swift diff --git a/samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/List.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/List.swift similarity index 100% rename from samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/List.swift rename to samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/List.swift diff --git a/samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/MapTest.swift similarity index 100% rename from samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift rename to samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/MapTest.swift diff --git a/samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/MixedPropertiesAndAdditionalPropertiesClass.swift similarity index 100% rename from samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift rename to samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/MixedPropertiesAndAdditionalPropertiesClass.swift diff --git a/samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/Model200Response.swift similarity index 100% rename from samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift rename to samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/Model200Response.swift diff --git a/samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Name.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/Name.swift similarity index 100% rename from samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Name.swift rename to samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/Name.swift diff --git a/samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/NumberOnly.swift similarity index 100% rename from samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift rename to samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/NumberOnly.swift diff --git a/samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Order.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/Order.swift similarity index 100% rename from samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Order.swift rename to samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/Order.swift diff --git a/samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/OuterComposite.swift similarity index 100% rename from samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift rename to samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/OuterComposite.swift diff --git a/samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/OuterEnum.swift similarity index 100% rename from samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift rename to samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/OuterEnum.swift diff --git a/samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/Pet.swift similarity index 100% rename from samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift rename to samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/Pet.swift diff --git a/samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/ReadOnlyFirst.swift similarity index 100% rename from samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift rename to samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/ReadOnlyFirst.swift diff --git a/samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Return.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/Return.swift similarity index 100% rename from samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Return.swift rename to samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/Return.swift diff --git a/samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/SpecialModelName.swift similarity index 100% rename from samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift rename to samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/SpecialModelName.swift diff --git a/samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/StringBooleanMap.swift similarity index 100% rename from samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift rename to samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/StringBooleanMap.swift diff --git a/samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/Tag.swift similarity index 100% rename from samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift rename to samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/Tag.swift diff --git a/samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/TypeHolderDefault.swift similarity index 100% rename from samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift rename to samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/TypeHolderDefault.swift diff --git a/samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/TypeHolderExample.swift similarity index 100% rename from samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift rename to samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/TypeHolderExample.swift diff --git a/samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/User.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/User.swift similarity index 100% rename from samples/client/petstore/swift6/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/User.swift rename to samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/User.swift diff --git a/samples/client/petstore/swift6/combineLibrary/project.yml b/samples/client/petstore/swift6/combineLibrary/project.yml index 92ad41fa08d..5df2379120f 100644 --- a/samples/client/petstore/swift6/combineLibrary/project.yml +++ b/samples/client/petstore/swift6/combineLibrary/project.yml @@ -4,7 +4,7 @@ targets: type: framework platform: iOS deploymentTarget: "11.0" - sources: [PetstoreClient] + sources: [Sources/CombineLibrary] info: path: ./Info.plist version: 1.0.0 diff --git a/samples/client/petstore/swift6/default/.openapi-generator/FILES b/samples/client/petstore/swift6/default/.openapi-generator/FILES index 2fda2f149a9..514c4440a32 100644 --- a/samples/client/petstore/swift6/default/.openapi-generator/FILES +++ b/samples/client/petstore/swift6/default/.openapi-generator/FILES @@ -3,72 +3,72 @@ Cartfile Package.swift PetstoreClient.podspec -PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift -PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift -PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift -PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift -PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift -PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift -PetstoreClient/Classes/OpenAPIs/Infrastructure/APIHelper.swift -PetstoreClient/Classes/OpenAPIs/Infrastructure/APIs.swift -PetstoreClient/Classes/OpenAPIs/Infrastructure/CodableHelper.swift -PetstoreClient/Classes/OpenAPIs/Infrastructure/Extensions.swift -PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONDataEncoding.swift -PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONEncodingHelper.swift -PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONValue.swift -PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift -PetstoreClient/Classes/OpenAPIs/Infrastructure/OpenISO8601DateFormatter.swift -PetstoreClient/Classes/OpenAPIs/Infrastructure/SynchronizedDictionary.swift -PetstoreClient/Classes/OpenAPIs/Infrastructure/URLSessionImplementations.swift -PetstoreClient/Classes/OpenAPIs/Infrastructure/Validation.swift -PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesAnyType.swift -PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesArray.swift -PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesBoolean.swift -PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift -PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesInteger.swift -PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesNumber.swift -PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesObject.swift -PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesString.swift -PetstoreClient/Classes/OpenAPIs/Models/Animal.swift -PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift -PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift -PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift -PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift -PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift -PetstoreClient/Classes/OpenAPIs/Models/BigCat.swift -PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift -PetstoreClient/Classes/OpenAPIs/Models/Cat.swift -PetstoreClient/Classes/OpenAPIs/Models/Category.swift -PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift -PetstoreClient/Classes/OpenAPIs/Models/Client.swift -PetstoreClient/Classes/OpenAPIs/Models/Dog.swift -PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift -PetstoreClient/Classes/OpenAPIs/Models/EnumClass.swift -PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift -PetstoreClient/Classes/OpenAPIs/Models/File.swift -PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift -PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift -PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift -PetstoreClient/Classes/OpenAPIs/Models/List.swift -PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift -PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift -PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift -PetstoreClient/Classes/OpenAPIs/Models/Name.swift -PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift -PetstoreClient/Classes/OpenAPIs/Models/Order.swift -PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift -PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift -PetstoreClient/Classes/OpenAPIs/Models/Pet.swift -PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift -PetstoreClient/Classes/OpenAPIs/Models/Return.swift -PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift -PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift -PetstoreClient/Classes/OpenAPIs/Models/Tag.swift -PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift -PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift -PetstoreClient/Classes/OpenAPIs/Models/User.swift -PetstoreClient/Classes/OpenAPIs/Models/XmlItem.swift README.md +Sources/PetstoreClient/APIs/AnotherFakeAPI.swift +Sources/PetstoreClient/APIs/FakeAPI.swift +Sources/PetstoreClient/APIs/FakeClassnameTags123API.swift +Sources/PetstoreClient/APIs/PetAPI.swift +Sources/PetstoreClient/APIs/StoreAPI.swift +Sources/PetstoreClient/APIs/UserAPI.swift +Sources/PetstoreClient/Infrastructure/APIHelper.swift +Sources/PetstoreClient/Infrastructure/APIs.swift +Sources/PetstoreClient/Infrastructure/CodableHelper.swift +Sources/PetstoreClient/Infrastructure/Extensions.swift +Sources/PetstoreClient/Infrastructure/JSONDataEncoding.swift +Sources/PetstoreClient/Infrastructure/JSONEncodingHelper.swift +Sources/PetstoreClient/Infrastructure/JSONValue.swift +Sources/PetstoreClient/Infrastructure/Models.swift +Sources/PetstoreClient/Infrastructure/OpenISO8601DateFormatter.swift +Sources/PetstoreClient/Infrastructure/SynchronizedDictionary.swift +Sources/PetstoreClient/Infrastructure/URLSessionImplementations.swift +Sources/PetstoreClient/Infrastructure/Validation.swift +Sources/PetstoreClient/Models/AdditionalPropertiesAnyType.swift +Sources/PetstoreClient/Models/AdditionalPropertiesArray.swift +Sources/PetstoreClient/Models/AdditionalPropertiesBoolean.swift +Sources/PetstoreClient/Models/AdditionalPropertiesClass.swift +Sources/PetstoreClient/Models/AdditionalPropertiesInteger.swift +Sources/PetstoreClient/Models/AdditionalPropertiesNumber.swift +Sources/PetstoreClient/Models/AdditionalPropertiesObject.swift +Sources/PetstoreClient/Models/AdditionalPropertiesString.swift +Sources/PetstoreClient/Models/Animal.swift +Sources/PetstoreClient/Models/AnimalFarm.swift +Sources/PetstoreClient/Models/ApiResponse.swift +Sources/PetstoreClient/Models/ArrayOfArrayOfNumberOnly.swift +Sources/PetstoreClient/Models/ArrayOfNumberOnly.swift +Sources/PetstoreClient/Models/ArrayTest.swift +Sources/PetstoreClient/Models/BigCat.swift +Sources/PetstoreClient/Models/Capitalization.swift +Sources/PetstoreClient/Models/Cat.swift +Sources/PetstoreClient/Models/Category.swift +Sources/PetstoreClient/Models/ClassModel.swift +Sources/PetstoreClient/Models/Client.swift +Sources/PetstoreClient/Models/Dog.swift +Sources/PetstoreClient/Models/EnumArrays.swift +Sources/PetstoreClient/Models/EnumClass.swift +Sources/PetstoreClient/Models/EnumTest.swift +Sources/PetstoreClient/Models/File.swift +Sources/PetstoreClient/Models/FileSchemaTestClass.swift +Sources/PetstoreClient/Models/FormatTest.swift +Sources/PetstoreClient/Models/HasOnlyReadOnly.swift +Sources/PetstoreClient/Models/List.swift +Sources/PetstoreClient/Models/MapTest.swift +Sources/PetstoreClient/Models/MixedPropertiesAndAdditionalPropertiesClass.swift +Sources/PetstoreClient/Models/Model200Response.swift +Sources/PetstoreClient/Models/Name.swift +Sources/PetstoreClient/Models/NumberOnly.swift +Sources/PetstoreClient/Models/Order.swift +Sources/PetstoreClient/Models/OuterComposite.swift +Sources/PetstoreClient/Models/OuterEnum.swift +Sources/PetstoreClient/Models/Pet.swift +Sources/PetstoreClient/Models/ReadOnlyFirst.swift +Sources/PetstoreClient/Models/Return.swift +Sources/PetstoreClient/Models/SpecialModelName.swift +Sources/PetstoreClient/Models/StringBooleanMap.swift +Sources/PetstoreClient/Models/Tag.swift +Sources/PetstoreClient/Models/TypeHolderDefault.swift +Sources/PetstoreClient/Models/TypeHolderExample.swift +Sources/PetstoreClient/Models/User.swift +Sources/PetstoreClient/Models/XmlItem.swift docs/AdditionalPropertiesAnyType.md docs/AdditionalPropertiesArray.md docs/AdditionalPropertiesBoolean.md diff --git a/samples/client/petstore/swift6/default/Package.swift b/samples/client/petstore/swift6/default/Package.swift index dc5bc46564c..0c83fdb8747 100644 --- a/samples/client/petstore/swift6/default/Package.swift +++ b/samples/client/petstore/swift6/default/Package.swift @@ -26,7 +26,7 @@ let package = Package( .target( name: "PetstoreClient", dependencies: [], - path: "PetstoreClient/Classes" + path: "Sources/PetstoreClient" ), ], swiftLanguageModes: [.v6] diff --git a/samples/client/petstore/swift6/default/PetstoreClient.podspec b/samples/client/petstore/swift6/default/PetstoreClient.podspec index d5b8cefeffa..a438db34097 100644 --- a/samples/client/petstore/swift6/default/PetstoreClient.podspec +++ b/samples/client/petstore/swift6/default/PetstoreClient.podspec @@ -10,5 +10,5 @@ Pod::Spec.new do |s| s.license = 'Proprietary' s.homepage = 'https://github.com/openapitools/openapi-generator' s.summary = 'PetstoreClient' - s.source_files = 'PetstoreClient/Classes/**/*.swift' + s.source_files = 'Sources/PetstoreClient/**/*.swift' end diff --git a/samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/APIs/AnotherFakeAPI.swift similarity index 100% rename from samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift rename to samples/client/petstore/swift6/default/Sources/PetstoreClient/APIs/AnotherFakeAPI.swift diff --git a/samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/APIs/FakeAPI.swift similarity index 100% rename from samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift rename to samples/client/petstore/swift6/default/Sources/PetstoreClient/APIs/FakeAPI.swift diff --git a/samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/APIs/FakeClassnameTags123API.swift similarity index 100% rename from samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift rename to samples/client/petstore/swift6/default/Sources/PetstoreClient/APIs/FakeClassnameTags123API.swift diff --git a/samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/APIs/PetAPI.swift similarity index 100% rename from samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift rename to samples/client/petstore/swift6/default/Sources/PetstoreClient/APIs/PetAPI.swift diff --git a/samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/APIs/StoreAPI.swift similarity index 100% rename from samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift rename to samples/client/petstore/swift6/default/Sources/PetstoreClient/APIs/StoreAPI.swift diff --git a/samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/APIs/UserAPI.swift similarity index 100% rename from samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift rename to samples/client/petstore/swift6/default/Sources/PetstoreClient/APIs/UserAPI.swift diff --git a/samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIHelper.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Infrastructure/APIHelper.swift similarity index 100% rename from samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIHelper.swift rename to samples/client/petstore/swift6/default/Sources/PetstoreClient/Infrastructure/APIHelper.swift diff --git a/samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIs.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Infrastructure/APIs.swift similarity index 100% rename from samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIs.swift rename to samples/client/petstore/swift6/default/Sources/PetstoreClient/Infrastructure/APIs.swift diff --git a/samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Infrastructure/CodableHelper.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Infrastructure/CodableHelper.swift similarity index 100% rename from samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Infrastructure/CodableHelper.swift rename to samples/client/petstore/swift6/default/Sources/PetstoreClient/Infrastructure/CodableHelper.swift diff --git a/samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Infrastructure/Extensions.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Infrastructure/Extensions.swift similarity index 100% rename from samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Infrastructure/Extensions.swift rename to samples/client/petstore/swift6/default/Sources/PetstoreClient/Infrastructure/Extensions.swift diff --git a/samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONDataEncoding.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Infrastructure/JSONDataEncoding.swift similarity index 100% rename from samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONDataEncoding.swift rename to samples/client/petstore/swift6/default/Sources/PetstoreClient/Infrastructure/JSONDataEncoding.swift diff --git a/samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONEncodingHelper.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Infrastructure/JSONEncodingHelper.swift similarity index 100% rename from samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONEncodingHelper.swift rename to samples/client/petstore/swift6/default/Sources/PetstoreClient/Infrastructure/JSONEncodingHelper.swift diff --git a/samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONValue.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Infrastructure/JSONValue.swift similarity index 100% rename from samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONValue.swift rename to samples/client/petstore/swift6/default/Sources/PetstoreClient/Infrastructure/JSONValue.swift diff --git a/samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Infrastructure/Models.swift similarity index 100% rename from samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift rename to samples/client/petstore/swift6/default/Sources/PetstoreClient/Infrastructure/Models.swift diff --git a/samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Infrastructure/OpenISO8601DateFormatter.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Infrastructure/OpenISO8601DateFormatter.swift similarity index 100% rename from samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Infrastructure/OpenISO8601DateFormatter.swift rename to samples/client/petstore/swift6/default/Sources/PetstoreClient/Infrastructure/OpenISO8601DateFormatter.swift diff --git a/samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Infrastructure/SynchronizedDictionary.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Infrastructure/SynchronizedDictionary.swift similarity index 100% rename from samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Infrastructure/SynchronizedDictionary.swift rename to samples/client/petstore/swift6/default/Sources/PetstoreClient/Infrastructure/SynchronizedDictionary.swift diff --git a/samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Infrastructure/URLSessionImplementations.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Infrastructure/URLSessionImplementations.swift similarity index 100% rename from samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Infrastructure/URLSessionImplementations.swift rename to samples/client/petstore/swift6/default/Sources/PetstoreClient/Infrastructure/URLSessionImplementations.swift diff --git a/samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Infrastructure/Validation.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Infrastructure/Validation.swift similarity index 100% rename from samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Infrastructure/Validation.swift rename to samples/client/petstore/swift6/default/Sources/PetstoreClient/Infrastructure/Validation.swift diff --git a/samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesAnyType.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/AdditionalPropertiesAnyType.swift similarity index 100% rename from samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesAnyType.swift rename to samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/AdditionalPropertiesAnyType.swift diff --git a/samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesArray.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/AdditionalPropertiesArray.swift similarity index 100% rename from samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesArray.swift rename to samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/AdditionalPropertiesArray.swift diff --git a/samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesBoolean.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/AdditionalPropertiesBoolean.swift similarity index 100% rename from samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesBoolean.swift rename to samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/AdditionalPropertiesBoolean.swift diff --git a/samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/AdditionalPropertiesClass.swift similarity index 100% rename from samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift rename to samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/AdditionalPropertiesClass.swift diff --git a/samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesInteger.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/AdditionalPropertiesInteger.swift similarity index 100% rename from samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesInteger.swift rename to samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/AdditionalPropertiesInteger.swift diff --git a/samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesNumber.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/AdditionalPropertiesNumber.swift similarity index 100% rename from samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesNumber.swift rename to samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/AdditionalPropertiesNumber.swift diff --git a/samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesObject.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/AdditionalPropertiesObject.swift similarity index 100% rename from samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesObject.swift rename to samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/AdditionalPropertiesObject.swift diff --git a/samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesString.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/AdditionalPropertiesString.swift similarity index 100% rename from samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesString.swift rename to samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/AdditionalPropertiesString.swift diff --git a/samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/Animal.swift similarity index 100% rename from samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift rename to samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/Animal.swift diff --git a/samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/AnimalFarm.swift similarity index 100% rename from samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift rename to samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/AnimalFarm.swift diff --git a/samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/ApiResponse.swift similarity index 100% rename from samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift rename to samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/ApiResponse.swift diff --git a/samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/ArrayOfArrayOfNumberOnly.swift similarity index 100% rename from samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift rename to samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/ArrayOfArrayOfNumberOnly.swift diff --git a/samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/ArrayOfNumberOnly.swift similarity index 100% rename from samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift rename to samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/ArrayOfNumberOnly.swift diff --git a/samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/ArrayTest.swift similarity index 100% rename from samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift rename to samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/ArrayTest.swift diff --git a/samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Models/BigCat.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/BigCat.swift similarity index 100% rename from samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Models/BigCat.swift rename to samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/BigCat.swift diff --git a/samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/Capitalization.swift similarity index 100% rename from samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift rename to samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/Capitalization.swift diff --git a/samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/Cat.swift similarity index 100% rename from samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift rename to samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/Cat.swift diff --git a/samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Models/Category.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/Category.swift similarity index 100% rename from samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Models/Category.swift rename to samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/Category.swift diff --git a/samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/ClassModel.swift similarity index 100% rename from samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift rename to samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/ClassModel.swift diff --git a/samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Models/Client.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/Client.swift similarity index 100% rename from samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Models/Client.swift rename to samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/Client.swift diff --git a/samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/Dog.swift similarity index 100% rename from samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift rename to samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/Dog.swift diff --git a/samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/EnumArrays.swift similarity index 100% rename from samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift rename to samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/EnumArrays.swift diff --git a/samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Models/EnumClass.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/EnumClass.swift similarity index 100% rename from samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Models/EnumClass.swift rename to samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/EnumClass.swift diff --git a/samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/EnumTest.swift similarity index 100% rename from samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift rename to samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/EnumTest.swift diff --git a/samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Models/File.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/File.swift similarity index 100% rename from samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Models/File.swift rename to samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/File.swift diff --git a/samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/FileSchemaTestClass.swift similarity index 100% rename from samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift rename to samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/FileSchemaTestClass.swift diff --git a/samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/FormatTest.swift similarity index 100% rename from samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift rename to samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/FormatTest.swift diff --git a/samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/HasOnlyReadOnly.swift similarity index 100% rename from samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift rename to samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/HasOnlyReadOnly.swift diff --git a/samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Models/List.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/List.swift similarity index 100% rename from samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Models/List.swift rename to samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/List.swift diff --git a/samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/MapTest.swift similarity index 100% rename from samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift rename to samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/MapTest.swift diff --git a/samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/MixedPropertiesAndAdditionalPropertiesClass.swift similarity index 100% rename from samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift rename to samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/MixedPropertiesAndAdditionalPropertiesClass.swift diff --git a/samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/Model200Response.swift similarity index 100% rename from samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift rename to samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/Model200Response.swift diff --git a/samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Models/Name.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/Name.swift similarity index 100% rename from samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Models/Name.swift rename to samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/Name.swift diff --git a/samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/NumberOnly.swift similarity index 100% rename from samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift rename to samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/NumberOnly.swift diff --git a/samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Models/Order.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/Order.swift similarity index 100% rename from samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Models/Order.swift rename to samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/Order.swift diff --git a/samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/OuterComposite.swift similarity index 100% rename from samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift rename to samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/OuterComposite.swift diff --git a/samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/OuterEnum.swift similarity index 100% rename from samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift rename to samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/OuterEnum.swift diff --git a/samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/Pet.swift similarity index 100% rename from samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift rename to samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/Pet.swift diff --git a/samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/ReadOnlyFirst.swift similarity index 100% rename from samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift rename to samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/ReadOnlyFirst.swift diff --git a/samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Models/Return.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/Return.swift similarity index 100% rename from samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Models/Return.swift rename to samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/Return.swift diff --git a/samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/SpecialModelName.swift similarity index 100% rename from samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift rename to samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/SpecialModelName.swift diff --git a/samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/StringBooleanMap.swift similarity index 100% rename from samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift rename to samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/StringBooleanMap.swift diff --git a/samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/Tag.swift similarity index 100% rename from samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift rename to samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/Tag.swift diff --git a/samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/TypeHolderDefault.swift similarity index 100% rename from samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift rename to samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/TypeHolderDefault.swift diff --git a/samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/TypeHolderExample.swift similarity index 100% rename from samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift rename to samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/TypeHolderExample.swift diff --git a/samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Models/User.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/User.swift similarity index 100% rename from samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Models/User.swift rename to samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/User.swift diff --git a/samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Models/XmlItem.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/XmlItem.swift similarity index 100% rename from samples/client/petstore/swift6/default/PetstoreClient/Classes/OpenAPIs/Models/XmlItem.swift rename to samples/client/petstore/swift6/default/Sources/PetstoreClient/Models/XmlItem.swift diff --git a/samples/client/petstore/swift6/default/project.yml b/samples/client/petstore/swift6/default/project.yml index 92ad41fa08d..f1dcabd67c6 100644 --- a/samples/client/petstore/swift6/default/project.yml +++ b/samples/client/petstore/swift6/default/project.yml @@ -4,7 +4,7 @@ targets: type: framework platform: iOS deploymentTarget: "11.0" - sources: [PetstoreClient] + sources: [Sources] info: path: ./Info.plist version: 1.0.0 diff --git a/samples/client/petstore/swift6/objcCompatible/.openapi-generator/FILES b/samples/client/petstore/swift6/objcCompatible/.openapi-generator/FILES index 3689e4184e3..dbd6732f044 100644 --- a/samples/client/petstore/swift6/objcCompatible/.openapi-generator/FILES +++ b/samples/client/petstore/swift6/objcCompatible/.openapi-generator/FILES @@ -3,63 +3,63 @@ Cartfile Package.swift PetstoreClient.podspec -PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift -PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift -PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift -PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift -PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift -PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift -PetstoreClient/Classes/OpenAPIs/Infrastructure/APIHelper.swift -PetstoreClient/Classes/OpenAPIs/Infrastructure/APIs.swift -PetstoreClient/Classes/OpenAPIs/Infrastructure/CodableHelper.swift -PetstoreClient/Classes/OpenAPIs/Infrastructure/Extensions.swift -PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONDataEncoding.swift -PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONEncodingHelper.swift -PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONValue.swift -PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift -PetstoreClient/Classes/OpenAPIs/Infrastructure/OpenISO8601DateFormatter.swift -PetstoreClient/Classes/OpenAPIs/Infrastructure/SynchronizedDictionary.swift -PetstoreClient/Classes/OpenAPIs/Infrastructure/URLSessionImplementations.swift -PetstoreClient/Classes/OpenAPIs/Infrastructure/Validation.swift -PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift -PetstoreClient/Classes/OpenAPIs/Models/Animal.swift -PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift -PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift -PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift -PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift -PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift -PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift -PetstoreClient/Classes/OpenAPIs/Models/Cat.swift -PetstoreClient/Classes/OpenAPIs/Models/Category.swift -PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift -PetstoreClient/Classes/OpenAPIs/Models/Client.swift -PetstoreClient/Classes/OpenAPIs/Models/Dog.swift -PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift -PetstoreClient/Classes/OpenAPIs/Models/EnumClass.swift -PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift -PetstoreClient/Classes/OpenAPIs/Models/File.swift -PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift -PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift -PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift -PetstoreClient/Classes/OpenAPIs/Models/List.swift -PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift -PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift -PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift -PetstoreClient/Classes/OpenAPIs/Models/Name.swift -PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift -PetstoreClient/Classes/OpenAPIs/Models/Order.swift -PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift -PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift -PetstoreClient/Classes/OpenAPIs/Models/Pet.swift -PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift -PetstoreClient/Classes/OpenAPIs/Models/Return.swift -PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift -PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift -PetstoreClient/Classes/OpenAPIs/Models/Tag.swift -PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift -PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift -PetstoreClient/Classes/OpenAPIs/Models/User.swift README.md +Sources/PetstoreClient/APIs/AnotherFakeAPI.swift +Sources/PetstoreClient/APIs/FakeAPI.swift +Sources/PetstoreClient/APIs/FakeClassnameTags123API.swift +Sources/PetstoreClient/APIs/PetAPI.swift +Sources/PetstoreClient/APIs/StoreAPI.swift +Sources/PetstoreClient/APIs/UserAPI.swift +Sources/PetstoreClient/Infrastructure/APIHelper.swift +Sources/PetstoreClient/Infrastructure/APIs.swift +Sources/PetstoreClient/Infrastructure/CodableHelper.swift +Sources/PetstoreClient/Infrastructure/Extensions.swift +Sources/PetstoreClient/Infrastructure/JSONDataEncoding.swift +Sources/PetstoreClient/Infrastructure/JSONEncodingHelper.swift +Sources/PetstoreClient/Infrastructure/JSONValue.swift +Sources/PetstoreClient/Infrastructure/Models.swift +Sources/PetstoreClient/Infrastructure/OpenISO8601DateFormatter.swift +Sources/PetstoreClient/Infrastructure/SynchronizedDictionary.swift +Sources/PetstoreClient/Infrastructure/URLSessionImplementations.swift +Sources/PetstoreClient/Infrastructure/Validation.swift +Sources/PetstoreClient/Models/AdditionalPropertiesClass.swift +Sources/PetstoreClient/Models/Animal.swift +Sources/PetstoreClient/Models/AnimalFarm.swift +Sources/PetstoreClient/Models/ApiResponse.swift +Sources/PetstoreClient/Models/ArrayOfArrayOfNumberOnly.swift +Sources/PetstoreClient/Models/ArrayOfNumberOnly.swift +Sources/PetstoreClient/Models/ArrayTest.swift +Sources/PetstoreClient/Models/Capitalization.swift +Sources/PetstoreClient/Models/Cat.swift +Sources/PetstoreClient/Models/Category.swift +Sources/PetstoreClient/Models/ClassModel.swift +Sources/PetstoreClient/Models/Client.swift +Sources/PetstoreClient/Models/Dog.swift +Sources/PetstoreClient/Models/EnumArrays.swift +Sources/PetstoreClient/Models/EnumClass.swift +Sources/PetstoreClient/Models/EnumTest.swift +Sources/PetstoreClient/Models/File.swift +Sources/PetstoreClient/Models/FileSchemaTestClass.swift +Sources/PetstoreClient/Models/FormatTest.swift +Sources/PetstoreClient/Models/HasOnlyReadOnly.swift +Sources/PetstoreClient/Models/List.swift +Sources/PetstoreClient/Models/MapTest.swift +Sources/PetstoreClient/Models/MixedPropertiesAndAdditionalPropertiesClass.swift +Sources/PetstoreClient/Models/Model200Response.swift +Sources/PetstoreClient/Models/Name.swift +Sources/PetstoreClient/Models/NumberOnly.swift +Sources/PetstoreClient/Models/Order.swift +Sources/PetstoreClient/Models/OuterComposite.swift +Sources/PetstoreClient/Models/OuterEnum.swift +Sources/PetstoreClient/Models/Pet.swift +Sources/PetstoreClient/Models/ReadOnlyFirst.swift +Sources/PetstoreClient/Models/Return.swift +Sources/PetstoreClient/Models/SpecialModelName.swift +Sources/PetstoreClient/Models/StringBooleanMap.swift +Sources/PetstoreClient/Models/Tag.swift +Sources/PetstoreClient/Models/TypeHolderDefault.swift +Sources/PetstoreClient/Models/TypeHolderExample.swift +Sources/PetstoreClient/Models/User.swift docs/AdditionalPropertiesClass.md docs/Animal.md docs/AnimalFarm.md diff --git a/samples/client/petstore/swift6/objcCompatible/Package.swift b/samples/client/petstore/swift6/objcCompatible/Package.swift index dc5bc46564c..0c83fdb8747 100644 --- a/samples/client/petstore/swift6/objcCompatible/Package.swift +++ b/samples/client/petstore/swift6/objcCompatible/Package.swift @@ -26,7 +26,7 @@ let package = Package( .target( name: "PetstoreClient", dependencies: [], - path: "PetstoreClient/Classes" + path: "Sources/PetstoreClient" ), ], swiftLanguageModes: [.v6] diff --git a/samples/client/petstore/swift6/objcCompatible/PetstoreClient.podspec b/samples/client/petstore/swift6/objcCompatible/PetstoreClient.podspec index d5b8cefeffa..a438db34097 100644 --- a/samples/client/petstore/swift6/objcCompatible/PetstoreClient.podspec +++ b/samples/client/petstore/swift6/objcCompatible/PetstoreClient.podspec @@ -10,5 +10,5 @@ Pod::Spec.new do |s| s.license = 'Proprietary' s.homepage = 'https://github.com/openapitools/openapi-generator' s.summary = 'PetstoreClient' - s.source_files = 'PetstoreClient/Classes/**/*.swift' + s.source_files = 'Sources/PetstoreClient/**/*.swift' end diff --git a/samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/APIs/AnotherFakeAPI.swift similarity index 100% rename from samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift rename to samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/APIs/AnotherFakeAPI.swift diff --git a/samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/APIs/FakeAPI.swift similarity index 100% rename from samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift rename to samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/APIs/FakeAPI.swift diff --git a/samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/APIs/FakeClassnameTags123API.swift similarity index 100% rename from samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift rename to samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/APIs/FakeClassnameTags123API.swift diff --git a/samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/APIs/PetAPI.swift similarity index 100% rename from samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift rename to samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/APIs/PetAPI.swift diff --git a/samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/APIs/StoreAPI.swift similarity index 100% rename from samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift rename to samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/APIs/StoreAPI.swift diff --git a/samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/APIs/UserAPI.swift similarity index 100% rename from samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift rename to samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/APIs/UserAPI.swift diff --git a/samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIHelper.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Infrastructure/APIHelper.swift similarity index 100% rename from samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIHelper.swift rename to samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Infrastructure/APIHelper.swift diff --git a/samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIs.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Infrastructure/APIs.swift similarity index 100% rename from samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIs.swift rename to samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Infrastructure/APIs.swift diff --git a/samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Infrastructure/CodableHelper.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Infrastructure/CodableHelper.swift similarity index 100% rename from samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Infrastructure/CodableHelper.swift rename to samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Infrastructure/CodableHelper.swift diff --git a/samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Infrastructure/Extensions.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Infrastructure/Extensions.swift similarity index 100% rename from samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Infrastructure/Extensions.swift rename to samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Infrastructure/Extensions.swift diff --git a/samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONDataEncoding.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Infrastructure/JSONDataEncoding.swift similarity index 100% rename from samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONDataEncoding.swift rename to samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Infrastructure/JSONDataEncoding.swift diff --git a/samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONEncodingHelper.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Infrastructure/JSONEncodingHelper.swift similarity index 100% rename from samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONEncodingHelper.swift rename to samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Infrastructure/JSONEncodingHelper.swift diff --git a/samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONValue.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Infrastructure/JSONValue.swift similarity index 100% rename from samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Infrastructure/JSONValue.swift rename to samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Infrastructure/JSONValue.swift diff --git a/samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Infrastructure/Models.swift similarity index 100% rename from samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Infrastructure/Models.swift rename to samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Infrastructure/Models.swift diff --git a/samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Infrastructure/OpenISO8601DateFormatter.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Infrastructure/OpenISO8601DateFormatter.swift similarity index 100% rename from samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Infrastructure/OpenISO8601DateFormatter.swift rename to samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Infrastructure/OpenISO8601DateFormatter.swift diff --git a/samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Infrastructure/SynchronizedDictionary.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Infrastructure/SynchronizedDictionary.swift similarity index 100% rename from samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Infrastructure/SynchronizedDictionary.swift rename to samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Infrastructure/SynchronizedDictionary.swift diff --git a/samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Infrastructure/URLSessionImplementations.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Infrastructure/URLSessionImplementations.swift similarity index 100% rename from samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Infrastructure/URLSessionImplementations.swift rename to samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Infrastructure/URLSessionImplementations.swift diff --git a/samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Infrastructure/Validation.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Infrastructure/Validation.swift similarity index 100% rename from samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Infrastructure/Validation.swift rename to samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Infrastructure/Validation.swift diff --git a/samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/AdditionalPropertiesClass.swift similarity index 100% rename from samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift rename to samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/AdditionalPropertiesClass.swift diff --git a/samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/Animal.swift similarity index 100% rename from samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift rename to samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/Animal.swift diff --git a/samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/AnimalFarm.swift similarity index 100% rename from samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift rename to samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/AnimalFarm.swift diff --git a/samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/ApiResponse.swift similarity index 100% rename from samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift rename to samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/ApiResponse.swift diff --git a/samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/ArrayOfArrayOfNumberOnly.swift similarity index 100% rename from samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift rename to samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/ArrayOfArrayOfNumberOnly.swift diff --git a/samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/ArrayOfNumberOnly.swift similarity index 100% rename from samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift rename to samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/ArrayOfNumberOnly.swift diff --git a/samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/ArrayTest.swift similarity index 100% rename from samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift rename to samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/ArrayTest.swift diff --git a/samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/Capitalization.swift similarity index 100% rename from samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift rename to samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/Capitalization.swift diff --git a/samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/Cat.swift similarity index 100% rename from samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift rename to samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/Cat.swift diff --git a/samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Category.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/Category.swift similarity index 100% rename from samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Category.swift rename to samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/Category.swift diff --git a/samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/ClassModel.swift similarity index 100% rename from samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift rename to samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/ClassModel.swift diff --git a/samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Client.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/Client.swift similarity index 100% rename from samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Client.swift rename to samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/Client.swift diff --git a/samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/Dog.swift similarity index 100% rename from samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift rename to samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/Dog.swift diff --git a/samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/EnumArrays.swift similarity index 100% rename from samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift rename to samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/EnumArrays.swift diff --git a/samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/EnumClass.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/EnumClass.swift similarity index 100% rename from samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/EnumClass.swift rename to samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/EnumClass.swift diff --git a/samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/EnumTest.swift similarity index 100% rename from samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift rename to samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/EnumTest.swift diff --git a/samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/File.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/File.swift similarity index 100% rename from samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/File.swift rename to samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/File.swift diff --git a/samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/FileSchemaTestClass.swift similarity index 100% rename from samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift rename to samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/FileSchemaTestClass.swift diff --git a/samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/FormatTest.swift similarity index 100% rename from samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift rename to samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/FormatTest.swift diff --git a/samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/HasOnlyReadOnly.swift similarity index 100% rename from samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift rename to samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/HasOnlyReadOnly.swift diff --git a/samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/List.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/List.swift similarity index 100% rename from samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/List.swift rename to samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/List.swift diff --git a/samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/MapTest.swift similarity index 100% rename from samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift rename to samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/MapTest.swift diff --git a/samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/MixedPropertiesAndAdditionalPropertiesClass.swift similarity index 100% rename from samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift rename to samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/MixedPropertiesAndAdditionalPropertiesClass.swift diff --git a/samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/Model200Response.swift similarity index 100% rename from samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift rename to samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/Model200Response.swift diff --git a/samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Name.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/Name.swift similarity index 100% rename from samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Name.swift rename to samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/Name.swift diff --git a/samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/NumberOnly.swift similarity index 100% rename from samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift rename to samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/NumberOnly.swift diff --git a/samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Order.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/Order.swift similarity index 100% rename from samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Order.swift rename to samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/Order.swift diff --git a/samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/OuterComposite.swift similarity index 100% rename from samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift rename to samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/OuterComposite.swift diff --git a/samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/OuterEnum.swift similarity index 100% rename from samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift rename to samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/OuterEnum.swift diff --git a/samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/Pet.swift similarity index 100% rename from samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift rename to samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/Pet.swift diff --git a/samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/ReadOnlyFirst.swift similarity index 100% rename from samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift rename to samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/ReadOnlyFirst.swift diff --git a/samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Return.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/Return.swift similarity index 100% rename from samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Return.swift rename to samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/Return.swift diff --git a/samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/SpecialModelName.swift similarity index 100% rename from samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift rename to samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/SpecialModelName.swift diff --git a/samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/StringBooleanMap.swift similarity index 100% rename from samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift rename to samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/StringBooleanMap.swift diff --git a/samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/Tag.swift similarity index 100% rename from samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift rename to samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/Tag.swift diff --git a/samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/TypeHolderDefault.swift similarity index 100% rename from samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift rename to samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/TypeHolderDefault.swift diff --git a/samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/TypeHolderExample.swift similarity index 100% rename from samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift rename to samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/TypeHolderExample.swift diff --git a/samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/User.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/User.swift similarity index 100% rename from samples/client/petstore/swift6/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/User.swift rename to samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/User.swift diff --git a/samples/client/petstore/swift6/objcCompatible/project.yml b/samples/client/petstore/swift6/objcCompatible/project.yml index 92ad41fa08d..f1dcabd67c6 100644 --- a/samples/client/petstore/swift6/objcCompatible/project.yml +++ b/samples/client/petstore/swift6/objcCompatible/project.yml @@ -4,7 +4,7 @@ targets: type: framework platform: iOS deploymentTarget: "11.0" - sources: [PetstoreClient] + sources: [Sources] info: path: ./Info.plist version: 1.0.0