[swift5][client] code formatting and dependencies ordering (#10370)

modules/openapi-generator/src/main/resources/swift5/Cartfile.mustache

@@ -1,4 +1,4 @@
-{{#useAlamofire}}github "Alamofire/Alamofire" ~> 5.4.3{{/useAlamofire}}{{#usePromiseKit}}
+github "Flight-School/AnyCodable" ~> 0.6.1{{#useAlamofire}}
+github "Alamofire/Alamofire" ~> 5.4.3{{/useAlamofire}}{{#usePromiseKit}}
 github "mxcl/PromiseKit" ~> 6.15.3{{/usePromiseKit}}{{#useRxSwift}}
 github "ReactiveX/RxSwift" ~> 6.2.0{{/useRxSwift}}
-github "Flight-School/AnyCodable" ~> 0.6.1

modules/openapi-generator/src/main/resources/swift5/Extensions.mustache

@@ -235,5 +235,4 @@ extension Set: RequestDecodable where Element: Content {
 
 extension Set: Content where Element: Content { }
 
-extension AnyCodable: Content {}
+extension AnyCodable: Content {}{{/useVapor}}
-{{/useVapor}}

modules/openapi-generator/src/main/resources/swift5/Package.swift.mustache

@@ -35,15 +35,15 @@ let package = Package(
         {{#useAlamofire}}
         .package(url: "https://github.com/Alamofire/Alamofire", from: "5.4.3"),
         {{/useAlamofire}}
-        {{#useVapor}}
-        .package(url: "https://github.com/vapor/vapor", from: "4.0.0")
-        {{/useVapor}}
         {{#usePromiseKit}}
         .package(url: "https://github.com/mxcl/PromiseKit", from: "6.15.3"),
         {{/usePromiseKit}}
         {{#useRxSwift}}
         .package(url: "https://github.com/ReactiveX/RxSwift", from: "6.2.0"),
         {{/useRxSwift}}
+        {{#useVapor}}
+        .package(url: "https://github.com/vapor/vapor", from: "4.0.0")
+        {{/useVapor}}
     ],
     targets: [
         // Targets are the basic building blocks of a package. A target can define a module or a test suite.

modules/openapi-generator/src/main/resources/swift5/Podspec.mustache

@@ -33,14 +33,14 @@ Pod::Spec.new do |s|
   s.documentation_url = '{{.}}'
   {{/podDocumentationURL}}
   s.source_files = '{{swiftPackagePath}}{{^swiftPackagePath}}{{#useSPMFileStructure}}Sources/{{projectName}}{{/useSPMFileStructure}}{{^useSPMFileStructure}}{{projectName}}/Classes{{/useSPMFileStructure}}{{/swiftPackagePath}}/**/*.swift'
+  s.dependency 'AnyCodable-FlightSchool', '~> 0.6.1'
+  {{#useAlamofire}}
+  s.dependency 'Alamofire', '~> 5.4.3'
+  {{/useAlamofire}}
   {{#usePromiseKit}}
   s.dependency 'PromiseKit/CorePromise', '~> 6.15.3'
   {{/usePromiseKit}}
   {{#useRxSwift}}
   s.dependency 'RxSwift', '~> 6.2.0'
   {{/useRxSwift}}
-  {{#useAlamofire}}
-  s.dependency 'Alamofire', '~> 5.4.3'
-  {{/useAlamofire}}
-  s.dependency 'AnyCodable-FlightSchool', '~> 0.6.1'
 end

modules/openapi-generator/src/main/resources/swift5/XcodeGen.mustache

@@ -13,6 +13,6 @@ targets:
     scheme: {}
     dependencies:
     - carthage: AnyCodable{{#useAlamofire}}
-    - carthage: Alamofire{{/useAlamofire}}{{#useRxSwift}}
+    - carthage: Alamofire{{/useAlamofire}}{{#usePromiseKit}}
-    - carthage: RxSwift{{/useRxSwift}}{{#usePromiseKit}}
+    - carthage: PromiseKit{{/usePromiseKit}}{{#useRxSwift}}
-    - carthage: PromiseKit{{/usePromiseKit}}
+    - carthage: RxSwift{{/useRxSwift}}

samples/client/petstore/swift5/alamofireLibrary/Cartfile

@@ -1,2 +1,2 @@
-github "Alamofire/Alamofire" ~> 5.4.3
 github "Flight-School/AnyCodable" ~> 0.6.1
+github "Alamofire/Alamofire" ~> 5.4.3

samples/client/petstore/swift5/alamofireLibrary/PetstoreClient.podspec

@@ -11,6 +11,6 @@ Pod::Spec.new do |s|
   s.homepage = 'https://github.com/openapitools/openapi-generator'
   s.summary = 'PetstoreClient'
   s.source_files = 'PetstoreClient/Classes/**/*.swift'
-  s.dependency 'Alamofire', '~> 5.4.3'
   s.dependency 'AnyCodable-FlightSchool', '~> 0.6.1'
+  s.dependency 'Alamofire', '~> 5.4.3'
 end

samples/client/petstore/swift5/combineLibrary/Cartfile

@@ -1,2 +1 @@
-
 github "Flight-School/AnyCodable" ~> 0.6.1

samples/client/petstore/swift5/default/Cartfile

@@ -1,2 +1 @@
-
 github "Flight-School/AnyCodable" ~> 0.6.1

samples/client/petstore/swift5/deprecated/Cartfile

@@ -1,2 +1 @@
-
 github "Flight-School/AnyCodable" ~> 0.6.1

samples/client/petstore/swift5/nonPublicApi/Cartfile

@@ -1,2 +1 @@
-
 github "Flight-School/AnyCodable" ~> 0.6.1

samples/client/petstore/swift5/objcCompatible/Cartfile

@@ -1,2 +1 @@
-
 github "Flight-School/AnyCodable" ~> 0.6.1

samples/client/petstore/swift5/oneOf/Cartfile

@@ -1,2 +1 @@
-
 github "Flight-School/AnyCodable" ~> 0.6.1

samples/client/petstore/swift5/promisekitLibrary/Cartfile

@@ -1,3 +1,2 @@
-
-github "mxcl/PromiseKit" ~> 6.15.3
 github "Flight-School/AnyCodable" ~> 0.6.1
+github "mxcl/PromiseKit" ~> 6.15.3

samples/client/petstore/swift5/promisekitLibrary/PetstoreClient.podspec

@@ -11,6 +11,6 @@ Pod::Spec.new do |s|
   s.homepage = 'https://github.com/openapitools/openapi-generator'
   s.summary = 'PetstoreClient'
   s.source_files = 'PetstoreClient/Classes/**/*.swift'
-  s.dependency 'PromiseKit/CorePromise', '~> 6.15.3'
   s.dependency 'AnyCodable-FlightSchool', '~> 0.6.1'
+  s.dependency 'PromiseKit/CorePromise', '~> 6.15.3'
 end

samples/client/petstore/swift5/readonlyProperties/Cartfile

@@ -1,2 +1 @@
-
 github "Flight-School/AnyCodable" ~> 0.6.1

samples/client/petstore/swift5/resultLibrary/Cartfile

@@ -1,2 +1 @@
-
 github "Flight-School/AnyCodable" ~> 0.6.1

samples/client/petstore/swift5/rxswiftLibrary/Cartfile

@@ -1,3 +1,2 @@
-
-github "ReactiveX/RxSwift" ~> 6.2.0
 github "Flight-School/AnyCodable" ~> 0.6.1
+github "ReactiveX/RxSwift" ~> 6.2.0

samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient.podspec

@@ -11,6 +11,6 @@ Pod::Spec.new do |s|
   s.homepage = 'https://github.com/openapitools/openapi-generator'
   s.summary = 'PetstoreClient'
   s.source_files = 'PetstoreClient/Classes/**/*.swift'
-  s.dependency 'RxSwift', '~> 6.2.0'
   s.dependency 'AnyCodable-FlightSchool', '~> 0.6.1'
+  s.dependency 'RxSwift', '~> 6.2.0'
 end

samples/client/petstore/swift5/urlsessionLibrary/Cartfile

@@ -1,2 +1 @@
-
 github "Flight-School/AnyCodable" ~> 0.6.1

samples/client/petstore/swift5/x-swift-hashable/Cartfile

@@ -1,2 +1 @@
-
 github "Flight-School/AnyCodable" ~> 0.6.1