OpenAPITools · wing328 · Sep 25, 2024 · Sep 16, 2024 · Sep 16, 2024 · Sep 17, 2024
diff --git a/README.md b/README.md
@@ -1049,6 +1049,7 @@ Here is a list of template creators:
    * Swift 3: @hexelon
    * Swift 4: @ehyche
    * Swift 5: @4brunu
+   * Swift 6: @4brunu
    * Swift Combine: @dydus0x14
    * TypeScript (Angular1): @mhardorf
    * TypeScript (Angular2): @roni-frantchi

diff --git a/bin/configs/swift6-alamofireLibrary.yaml b/bin/configs/swift6-alamofireLibrary.yaml
@@ -0,0 +1,12 @@
+generatorName: swift6
+outputDir: samples/client/petstore/swift6/alamofireLibrary
+library: alamofire
+inputSpec: modules/openapi-generator/src/test/resources/2_0/swift/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-generator/src/main/resources/swift6
+generateAliasAsModel: true
+useCustomDateWithoutTime: true
+additionalProperties:
+  podAuthors: ""
+  podSummary: PetstoreClient
+  projectName: PetstoreClient
+  podHomepage: https://github.com/openapitools/openapi-generator
diff --git a/bin/configs/swift6-any-codable.yaml b/bin/configs/swift6-any-codable.yaml
@@ -0,0 +1,10 @@
+generatorName: swift6
+outputDir: samples/client/petstore/swift6/anycodableLibrary
+inputSpec: modules/openapi-generator/src/test/resources/3_0/any_codable.yaml
+modelNamePrefix: Prefix
+modelNameSuffix: Suffix
+additionalProperties:
+  podAuthors: ""
+  podSummary: PetstoreClient
+  projectName: PetstoreClient
+  podHomepage: https://github.com/openapitools/openapi-generator
diff --git a/bin/configs/swift6-api-non-static-method.yaml b/bin/configs/swift6-api-non-static-method.yaml
@@ -0,0 +1,12 @@
+generatorName: swift6
+outputDir: samples/client/petstore/swift6/apiNonStaticMethod
+library: alamofire
+inputSpec: modules/openapi-generator/src/test/resources/2_0/swift/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-generator/src/main/resources/swift6
+additionalProperties:
+  responseAs: AsyncAwait,Combine,Result,PromiseKit,RxSwift
+  apiStaticMethod: false
+  podAuthors: ""
+  podSummary: PetstoreClient
+  projectName: PetstoreClient
+  podHomepage: https://github.com/openapitools/openapi-generator
diff --git a/bin/configs/swift6-asyncAwaitLibrary.yaml b/bin/configs/swift6-asyncAwaitLibrary.yaml
@@ -0,0 +1,11 @@
+generatorName: swift6
+outputDir: samples/client/petstore/swift6/asyncAwaitLibrary
+inputSpec: modules/openapi-generator/src/test/resources/2_0/swift/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-generator/src/main/resources/swift6
+generateAliasAsModel: true
+additionalProperties:
+  responseAs: AsyncAwait
+  podAuthors: ""
+  podSummary: PetstoreClient
+  projectName: PetstoreClient
+  podHomepage: https://github.com/openapitools/openapi-generator
diff --git a/bin/configs/swift6-combineDeferredLibrary.yaml b/bin/configs/swift6-combineDeferredLibrary.yaml
@@ -0,0 +1,11 @@
+generatorName: swift6
+outputDir: samples/client/petstore/swift6/combineDeferredLibrary
+inputSpec: modules/openapi-generator/src/test/resources/2_0/swift/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-generator/src/main/resources/swift6
+generateAliasAsModel: true
+additionalProperties:
+  responseAs: Combine
+  podAuthors: ""
+  podSummary: PetstoreClient
+  projectName: PetstoreClient
+  podHomepage: https://github.com/openapitools/openapi-generator
diff --git a/bin/configs/swift6-combineLibrary.yaml b/bin/configs/swift6-combineLibrary.yaml
@@ -0,0 +1,12 @@
+generatorName: swift6
+outputDir: samples/client/petstore/swift6/combineLibrary
+inputSpec: modules/openapi-generator/src/test/resources/2_0/swift/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-generator/src/main/resources/swift6
+generateAliasAsModel: true
+additionalProperties:
+  responseAs: Combine
+  combineDeferred: false
+  podAuthors: ""
+  podSummary: PetstoreClient
+  projectName: PetstoreClient
+  podHomepage: https://github.com/openapitools/openapi-generator
diff --git a/bin/configs/swift6-default.yaml b/bin/configs/swift6-default.yaml
@@ -0,0 +1,12 @@
+generatorName: swift6
+outputDir: samples/client/petstore/swift6/default
+inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-generator/src/main/resources/swift6
+generateAliasAsModel: true
+additionalProperties:
+  podAuthors: ""
+  podSummary: PetstoreClient
+  projectName: PetstoreClient
+  podHomepage: https://github.com/openapitools/openapi-generator
+enumNameMappings:
+  delivered: shipped
diff --git a/bin/configs/swift6-deprecated.yaml b/bin/configs/swift6-deprecated.yaml
@@ -0,0 +1,10 @@
+generatorName: swift6
+outputDir: samples/client/petstore/swift6/deprecated
+inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-deprecated-fields.yaml
+templateDir: modules/openapi-generator/src/main/resources/swift6
+generateAliasAsModel: true
+additionalProperties:
+  podAuthors: ""
+  podSummary: PetstoreClient
+  projectName: PetstoreClient
+  podHomepage: https://github.com/openapitools/openapi-generator
diff --git a/bin/configs/swift6-frozenEnums.yaml b/bin/configs/swift6-frozenEnums.yaml
@@ -0,0 +1,12 @@
+generatorName: swift6
+outputDir: samples/client/petstore/swift6/frozenEnums
+inputSpec: modules/openapi-generator/src/test/resources/2_0/swift/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-generator/src/main/resources/swift6
+generateAliasAsModel: true
+additionalProperties:
+  podAuthors: ""
+  podSummary: PetstoreClient
+  sortParamsByRequiredFlag: false
+  enumUnknownDefaultCase: true
+  projectName: PetstoreClient
+  podHomepage: https://github.com/openapitools/openapi-generator
diff --git a/bin/configs/swift6-nonPublicApi.yaml b/bin/configs/swift6-nonPublicApi.yaml
@@ -0,0 +1,21 @@
+generatorName: swift6
+outputDir: samples/client/petstore/swift6/nonPublicApi
+inputSpec: modules/openapi-generator/src/test/resources/2_0/swift/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-generator/src/main/resources/swift6
+generateAliasAsModel: true
+additionalProperties:
+  podAuthors: ""
+  podSummary: PetstoreClient
+  sortParamsByRequiredFlag: false
+  nonPublicApi: true
+  projectName: PetstoreClient
+  podHomepage: https://github.com/openapitools/openapi-generator
+nameMappings:
+  _type: underscoreType
+  type_: typeWithUnderscore
+  -type: dashType
+parameterNameMappings:
+  _type: underscoreType
+  type_: typeWithUnderscore
+  -type: dashType
+
diff --git a/bin/configs/swift6-objcCompatible.yaml b/bin/configs/swift6-objcCompatible.yaml
@@ -0,0 +1,11 @@
+generatorName: swift6
+outputDir: samples/client/petstore/swift6/objcCompatible
+inputSpec: modules/openapi-generator/src/test/resources/2_0/swift/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-generator/src/main/resources/swift6
+generateAliasAsModel: true
+additionalProperties:
+  podAuthors: ""
+  podSummary: PetstoreClient
+  objcCompatible: true
+  projectName: PetstoreClient
+  podHomepage: https://github.com/openapitools/openapi-generator
diff --git a/bin/configs/swift6-oneOf.yaml b/bin/configs/swift6-oneOf.yaml
@@ -0,0 +1,10 @@
+generatorName: swift6
+outputDir: samples/client/petstore/swift6/oneOf
+inputSpec: modules/openapi-generator/src/test/resources/3_0/oneOf.yaml
+templateDir: modules/openapi-generator/src/main/resources/swift6
+generateAliasAsModel: true
+additionalProperties:
+  podAuthors: ""
+  podSummary: PetstoreClient
+  projectName: PetstoreClient
+  podHomepage: https://github.com/openapitools/openapi-generator
diff --git a/bin/configs/swift6-promisekitLibrary.yaml b/bin/configs/swift6-promisekitLibrary.yaml
@@ -0,0 +1,11 @@
+generatorName: swift6
+outputDir: samples/client/petstore/swift6/promisekitLibrary
+inputSpec: modules/openapi-generator/src/test/resources/2_0/swift/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-generator/src/main/resources/swift6
+generateAliasAsModel: true
+additionalProperties:
+  responseAs: PromiseKit
+  podAuthors: ""
+  podSummary: PetstoreClient
+  projectName: PetstoreClient
+  podHomepage: https://github.com/openapitools/openapi-generator
diff --git a/bin/configs/swift6-readonlyProperties.yaml b/bin/configs/swift6-readonlyProperties.yaml
@@ -0,0 +1,11 @@
+generatorName: swift6
+outputDir: samples/client/petstore/swift6/readonlyProperties
+inputSpec: modules/openapi-generator/src/test/resources/2_0/swift/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-generator/src/main/resources/swift6
+generateAliasAsModel: true
+additionalProperties:
+  podAuthors: ""
+  podSummary: PetstoreClient
+  readonlyProperties: true
+  projectName: PetstoreClient
+  podHomepage: https://github.com/openapitools/openapi-generator
diff --git a/bin/configs/swift6-resultLibrary.yaml b/bin/configs/swift6-resultLibrary.yaml
@@ -0,0 +1,11 @@
+generatorName: swift6
+outputDir: samples/client/petstore/swift6/resultLibrary
+inputSpec: modules/openapi-generator/src/test/resources/2_0/swift/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-generator/src/main/resources/swift6
+generateAliasAsModel: true
+additionalProperties:
+  responseAs: Result
+  podAuthors: ""
+  podSummary: PetstoreClient
+  projectName: PetstoreClient
+  podHomepage: https://github.com/openapitools/openapi-generator
diff --git a/bin/configs/swift6-rxswiftLibrary.yaml b/bin/configs/swift6-rxswiftLibrary.yaml
@@ -0,0 +1,13 @@
+generatorName: swift6
+outputDir: samples/client/petstore/swift6/rxswiftLibrary
+inputSpec: modules/openapi-generator/src/test/resources/2_0/swift/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-generator/src/main/resources/swift6
+generateAliasAsModel: true
+additionalProperties:
+  responseAs: RxSwift
+  podAuthors: ""
+  podSummary: PetstoreClient
+  projectName: PetstoreClient
+  podHomepage: https://github.com/openapitools/openapi-generator
+  useBacktickEscapes: true
+  generateModelAdditionalProperties: false
diff --git a/bin/configs/swift6-urlsessionLibrary.yaml b/bin/configs/swift6-urlsessionLibrary.yaml
@@ -0,0 +1,14 @@
+generatorName: swift6
+outputDir: samples/client/petstore/swift6/urlsessionLibrary
+library: urlsession
+inputSpec: modules/openapi-generator/src/test/resources/2_0/swift/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-generator/src/main/resources/swift6
+generateAliasAsModel: true
+additionalProperties:
+  podAuthors: ""
+  podSummary: PetstoreClient
+  projectName: PetstoreClient
+  podHomepage: https://github.com/openapitools/openapi-generator
+  useSPMFileStructure: true
+  useClasses: true
+  swiftUseApiNamespace: true
diff --git a/bin/configs/swift6-validation.yaml b/bin/configs/swift6-validation.yaml
@@ -0,0 +1,10 @@
+generatorName: swift6
+outputDir: samples/client/petstore/swift6/validation
+inputSpec: modules/openapi-generator/src/test/resources/3_0/validation.yaml
+templateDir: modules/openapi-generator/src/main/resources/swift6
+generateAliasAsModel: true
+additionalProperties:
+  podAuthors: ""
+  podSummary: PetstoreClient
+  projectName: PetstoreClient
+  podHomepage: https://github.com/openapitools/openapi-generator
diff --git a/bin/configs/swift6-vapor.yaml b/bin/configs/swift6-vapor.yaml
@@ -0,0 +1,12 @@
+generatorName: swift6
+outputDir: samples/client/petstore/swift6/vaporLibrary
+library: vapor
+inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-generator/src/main/resources/swift6
+generateAliasAsModel: true
+additionalProperties:
+  projectName: PetstoreClient
+  useSPMFileStructure: true
+  useClasses: true
+  useBacktickEscapes: true
+  mapFileBinaryToData: true
diff --git a/bin/configs/swift6-x-swift-hashable.yaml b/bin/configs/swift6-x-swift-hashable.yaml
@@ -0,0 +1,11 @@
+generatorName: swift6
+outputDir: samples/client/petstore/swift6/x-swift-hashable
+inputSpec: modules/openapi-generator/src/test/resources/2_0/swift/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-generator/src/main/resources/swift6
+generateAliasAsModel: true
+additionalProperties:
+  podAuthors: ""
+  podSummary: PetstoreClient
+  projectName: PetstoreClient
+  podHomepage: https://github.com/openapitools/openapi-generator
+  hashableModels: false
diff --git a/bitrise.yml b/bitrise.yml
@@ -18,6 +18,15 @@ workflows:
             #!/usr/bin/env bash
 
             sudo gem install cocoapods
+    - [email protected]:
+        title: Run Swift6 tests
+        inputs:
+        - content: |
+            #!/usr/bin/env bash
+
+            set -e
+
+            ./samples/client/petstore/swift6/swift6_test_all.sh
     - [email protected]:
         title: Run Swift5 tests
         inputs:
@@ -39,4 +48,4 @@ workflows:
 
 meta:
   bitrise.io:
-    stack: osx-xcode-14.3.x-ventura
+    stack: osx-xcode-16.0.x
diff --git a/docs/generators.md b/docs/generators.md
@@ -65,6 +65,7 @@ The following generators are available:
 * [scalaz](generators/scalaz.md)  
 * [swift-combine](generators/swift-combine.md)  
 * [swift5](generators/swift5.md)  
+* [swift6 (experimental)](generators/swift6.md)  
 * [typescript (experimental)](generators/typescript.md)  
 * [typescript-angular](generators/typescript-angular.md)  
 * [typescript-aurelia](generators/typescript-aurelia.md)