From b3afbe73b94f5dff327013ec7f41bcf238152ed1 Mon Sep 17 00:00:00 2001
From: Robin Eggenkamp <robin.eggenkamp@kizitos.com>
Date: Thu, 20 Aug 2015 16:50:02 +0200
Subject: [PATCH] [Swift] Add missing checks for usePromiseKit

---
 .../main/resources/swift/Cartfile.mustache    |  4 ++--
 .../src/main/resources/swift/Podspec.mustache | 20 +++++++++++++++++++
 .../src/main/resources/swift/api.mustache     |  6 +++---
 3 files changed, 25 insertions(+), 5 deletions(-)
 create mode 100644 modules/swagger-codegen/src/main/resources/swift/Podspec.mustache

diff --git a/modules/swagger-codegen/src/main/resources/swift/Cartfile.mustache b/modules/swagger-codegen/src/main/resources/swift/Cartfile.mustache
index af74617bcf2..f870554a505 100644
--- a/modules/swagger-codegen/src/main/resources/swift/Cartfile.mustache
+++ b/modules/swagger-codegen/src/main/resources/swift/Cartfile.mustache
@@ -1,2 +1,2 @@
-github "Alamofire/Alamofire" >= 1.2
-github "mxcl/PromiseKit" >=1.5.3
+github "Alamofire/Alamofire" >= 1.3{{#usePromiseKit}}
+github "mxcl/PromiseKit" >=1.5.3{{/usePromiseKit}}
diff --git a/modules/swagger-codegen/src/main/resources/swift/Podspec.mustache b/modules/swagger-codegen/src/main/resources/swift/Podspec.mustache
new file mode 100644
index 00000000000..f597a5de688
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/swift/Podspec.mustache
@@ -0,0 +1,20 @@
+Pod::Spec.new do |s|
+  s.name = '{{projectName}}'{{#projectDescription}}
+  s.summary = '{{projectDescription}}'{{/projectDescription}}
+  s.ios.deployment_target = '8.0'
+  s.osx.deployment_target = '10.9'
+  s.version = '{{#podVersion}}{{podVersion}}{{/podVersion}}{{^podVersion}}0.0.1{{/podVersion}}'
+  s.source = {{#podSource}}{{& podSource}}{{/podSource}}{{^podSource}}{ :git => 'git@github.com:swagger-api/swagger-mustache.git', :tag => 'v1.0.0' }{{/podSource}}{{#podAuthors}}
+  s.authors = {{& podAuthors}}{{/podAuthors}}{{#podSocialMediaURL}}
+  s.social_media_url = '{{podSocialMediaURL}}'{{/podSocialMediaURL}}{{#podDocsetURL}}
+  s.docset_url = '{{podDocsetURL}}'{{/podDocsetURL}}
+  s.license = {{#podLicense}}{{& podLicense}}{{/podLicense}}{{^podLicense}}'Apache License, Version 2.0'{{/podLicense}}{{#podHomepage}}
+  s.homepage = '{{podHomepage}}'{{/podHomepage}}{{#podSummary}}
+  s.summary = '{{podSummary}}'{{/podSummary}}{{#podDescription}}
+  s.description = '{{podDescription}}'{{/podDescription}}{{#podScreenshots}}
+  s.screenshots = {{& podScreenshots}}{{/podScreenshots}}{{#podDocumentationURL}}
+  s.documentation_url = '{{podDocumentationURL}}'{{/podDocumentationURL}}
+  s.source_files = '{{projectName}}/Classes/Swaggers/**/*.swift'{{#usePromiseKit}}
+  s.dependency 'PromiseKit', '~> 2.1'{{/usePromiseKit}}
+  s.dependency 'Alamofire', '~> 1.3'
+end
diff --git a/modules/swagger-codegen/src/main/resources/swift/api.mustache b/modules/swagger-codegen/src/main/resources/swift/api.mustache
index e24bdae6773..0dd6cd2ecc1 100644
--- a/modules/swagger-codegen/src/main/resources/swift/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/swift/api.mustache
@@ -5,8 +5,8 @@
 // https://github.com/swagger-api/swagger-codegen
 //
 
-import Alamofire
-import PromiseKit
+import Alamofire{{#usePromiseKit}}
+import PromiseKit{{/usePromiseKit}}
 
 extension {{projectName}}API {
     {{#description}}
@@ -28,7 +28,7 @@ extension {{projectName}}API {
          {{/hasParams}}{{#allParams}}
          :param: {{paramName}} ({{#isFormParam}}form{{/isFormParam}}{{#isQueryParam}}query{{/isQueryParam}}{{#isPathParam}}path{{/isPathParam}}{{#isHeaderParam}}header{{/isHeaderParam}}{{#isBodyParam}}body{{/isBodyParam}}) {{description}}{{/allParams}}
 
-         :returns: Promise<Response<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Void{{/returnType}}>> {{description}}
+         :returns: RequestBuilder<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Void{{/returnType}}> {{description}}
          */
         func {{operationId}}({{#allParams}}{{^secondaryParam}}#{{/secondaryParam}}{{paramName}}: {{{dataType}}}{{^required}}?{{/required}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) -> RequestBuilder<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Void{{/returnType}}> {
             {{^pathParams}}let{{/pathParams}}{{#pathParams}}{{^secondaryParam}}var{{/secondaryParam}}{{/pathParams}} path = "{{path}}"{{#pathParams}}