Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Swift3/Swift4] update all cocoapods for swift3/swift4 #6441

Merged
merged 2 commits into from
Sep 6, 2017
Merged

[Swift3/Swift4] update all cocoapods for swift3/swift4 #6441

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
28699ca
[Swift] update all cocoapods for swift3/swift4
jaz-ah Sep 5, 2017
41b7fb4
fix subspec specification
jaz-ah Sep 5, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions modules/swagger-codegen/src/main/resources/swift3/Podspec.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Pod::Spec.new do |s|
s.screenshots = {{& podScreenshots}}{{/podScreenshots}}{{#podDocumentationURL}}
s.documentation_url = '{{podDocumentationURL}}'{{/podDocumentationURL}}
s.source_files = '{{projectName}}/Classes/**/*.swift'{{#usePromiseKit}}
s.dependency 'PromiseKit', '~> 4.2.2'{{/usePromiseKit}}{{#useRxSwift}}
s.dependency 'PromiseKit/CorePromise', '~> 4.4.0'{{/usePromiseKit}}{{#useRxSwift}}
s.dependency 'RxSwift', '~> 3.4.1'{{/useRxSwift}}
s.dependency 'Alamofire', '~> 4.0'
s.dependency 'Alamofire', '~> 4.5.0'
end
4 changes: 2 additions & 2 deletions modules/swagger-codegen/src/main/resources/swift4/Podspec.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Pod::Spec.new do |s|
s.screenshots = {{& podScreenshots}}{{/podScreenshots}}{{#podDocumentationURL}}
s.documentation_url = '{{podDocumentationURL}}'{{/podDocumentationURL}}
s.source_files = '{{projectName}}/Classes/**/*.swift'{{#usePromiseKit}}
s.dependency 'PromiseKit', '~> 4.2.2'{{/usePromiseKit}}{{#useRxSwift}}
s.dependency 'PromiseKit/CorePromise', '~> 4.4.0'{{/usePromiseKit}}{{#useRxSwift}}
s.dependency 'RxSwift', '~> 3.4.1'{{/useRxSwift}}
s.dependency 'Alamofire', '~> 4.5'
s.dependency 'Alamofire', '~> 4.5.0'
end
2 changes: 1 addition & 1 deletion samples/client/petstore/swift3/default/PetstoreClient.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ Pod::Spec.new do |s|
s.homepage = 'https:/swagger-api/swagger-codegen'
s.summary = 'PetstoreClient'
s.source_files = 'PetstoreClient/Classes/**/*.swift'
s.dependency 'Alamofire', '~> 4.0'
s.dependency 'Alamofire', '~> 4.5.0'
end
12 changes: 6 additions & 6 deletions samples/client/petstore/swift3/default/SwaggerClientTests/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
PODS:
- Alamofire (4.4.0)
- Alamofire (4.5.0)
- PetstoreClient (0.0.1):
- Alamofire (~> 4.0)
- Alamofire (~> 4.5.0)

DEPENDENCIES:
- PetstoreClient (from `../`)

EXTERNAL SOURCES:
PetstoreClient:
:path: "../"
:path: ../

SPEC CHECKSUMS:
Alamofire: dc44b1600b800eb63da6a19039a0083d62a6a62d
PetstoreClient: 0f65d85b2a09becd32938348b3783a9394a07346
Alamofire: f28cdffd29de33a7bfa022cbd63ae95a27fae140
PetstoreClient: bbb95cd0adc059bbdbe541b384f8294f4e241226

PODFILE CHECKSUM: 417049e9ed0e4680602b34d838294778389bd418

COCOAPODS: 1.1.1
COCOAPODS: 1.3.1
Loading