[Swift] Updates for Swift 4.2 (OpenAPITools#1443)

* [Swift] Update Alamofire version and update tests and Swift version to 4.2 for default and RxSwift variants

* Update promiseKit for Swift 4.0

* Update project files.

* Merge branch 'master' of https://github.com/OpenAPITools/openapi-generator into OpenAPITools-master

# Conflicts:
#	samples/client/petstore/swift4/default/SwaggerClientTests/SwaggerClient.xcodeproj/project.pbxproj

* Merge in latest master

* Remove typo in bash file

Author: joeboyscout04

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

@@ -34,5 +34,5 @@ Pod::Spec.new do |s|
   {{#useRxSwift}}
   s.dependency 'RxSwift', '~> 4.0'
   {{/useRxSwift}}
-  s.dependency 'Alamofire', '~> 4.5.0'
+  s.dependency 'Alamofire', '~> 4.7.0'
 end

modules/openapi-generator/src/main/resources/swift4/api.mustache

@@ -147,7 +147,7 @@ open class {{classname}} {
             {{/hasFormParams}}
         {{/bodyParam}}{{#hasQueryParams}}
         var url = URLComponents(string: URLString)
-        url?.queryItems = APIHelper.mapValuesToQueryItems([
+        url?.queryItems = APIHelper.mapValuesToQueryItems([{{^queryParams}}:{{/queryParams}}
             {{#queryParams}}
             {{> _param}}{{#hasMore}}, {{/hasMore}}
             {{/queryParams}}

samples/client/petstore/swift/default/SwaggerClientTests/SwaggerClient.xcodeproj/project.pbxproj

@@ -1 +1 @@
-3.3.3-SNAPSHOT
+3.3.4-SNAPSHOT

samples/client/petstore/swift4/default/.openapi-generator/VERSION

@@ -10,5 +10,5 @@ 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', '~> 4.5.0'
+  s.dependency 'Alamofire', '~> 4.7.0'
 end

samples/client/petstore/swift4/default/PetstoreClient.podspec

@@ -8,11 +8,3 @@ target 'SwaggerClient' do
         inherit! :search_paths
     end
 end
-
-post_install do |installer|
-    installer.pods_project.targets.each do |target|
-        target.build_configurations.each do |configuration|
-            configuration.build_settings['SWIFT_VERSION'] = "3.0"
-        end
-    end
-end

samples/client/petstore/swift4/default/SwaggerClientTests/Podfile

@@ -1,7 +1,7 @@
 PODS:
-  - Alamofire (4.5.0)
+  - Alamofire (4.7.3)
   - PetstoreClient (0.0.1):
-    - Alamofire (~> 4.5.0)
+    - Alamofire (~> 4.7.0)
 
 DEPENDENCIES:
   - PetstoreClient (from `../`)
@@ -15,9 +15,9 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  Alamofire: f28cdffd29de33a7bfa022cbd63ae95a27fae140
-  PetstoreClient: a9f241d378687facad5c691a1747b21f64b405fa
+  Alamofire: c7287b6e5d7da964a70935e5db17046b7fde6568
+  PetstoreClient: ed26185215a5241fa4e937e806321d611f3d0c30
 
-PODFILE CHECKSUM: 417049e9ed0e4680602b34d838294778389bd418
+PODFILE CHECKSUM: cedb3058b02f4776d7c31f6d92ae2f674fdf424d
 
 COCOAPODS: 1.5.3