Skip to content

Commit

Permalink
Add Swift 2.2 support
Browse files Browse the repository at this point in the history
  • Loading branch information
Tamar Nachmany authored and jpsim committed Apr 5, 2016
1 parent a485292 commit f904257
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Expand Up @@ -11,5 +11,5 @@ notifications:
slack: realmio:vPdpsG9NLDo2DNlbqtcMAQuE
matrix:
include:
- osx_image: xcode7.2
env: TRAVIS_SWIFT_VERSION=2.1.1
- osx_image: xcode7.3
env: TRAVIS_SWIFT_VERSION=2.2
2 changes: 2 additions & 0 deletions CHANGELOG.md
Expand Up @@ -12,6 +12,8 @@
format includes contextual information that one might use to lint
documentation in an automated fashion.
[Jeff Verkoeyen](https://github.com/jverkoey)
* Add Swift 2.2 support.
[Tamar Nachmany](https://github.com/tamarnachmany)

##### Enhancements

Expand Down
2 changes: 1 addition & 1 deletion lib/jazzy/config.rb
Expand Up @@ -159,7 +159,7 @@ def expand_path(path)

config_attr :swift_version,
command_line: '--swift-version VERSION',
default: '2.1.1',
default: '2.2',
parse: ->(v) do
raise 'jazzy only supports Swift 2.0 or later.' if v.to_f < 2
v
Expand Down
4 changes: 2 additions & 2 deletions spec/integration_spec.rb
Expand Up @@ -145,7 +145,7 @@
end
end

describe 'jazzy swift 2.1.1' do
describe 'jazzy swift 2.2' do
describe 'Creates docs for a podspec with dependencies and subspecs' do
behaves_like cli_spec 'document_moya_podspec', '--podspec=Moya.podspec'
end
Expand Down Expand Up @@ -194,5 +194,5 @@
behaves_like cli_spec 'misc_jazzy_features',
'-x -dry-run --theme fullwidth'
end
end if !travis_swift || travis_swift == '2.1.1'
end if !travis_swift || travis_swift == '2.2'
end

0 comments on commit f904257

Please sign in to comment.