Merge pull request #416 from nlutsenko/patch-1

Use Swift 2.1.1 from Xcode 7.2 by default.
realm · Dec 14, 2015 · 4f4235f · 4f4235f
2 parents 4c7b9bb + d0c9e93
commit 4f4235f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -13,5 +13,5 @@ matrix:
   include:
     - osx_image: xcode6.4
       env: TRAVIS_SWIFT_VERSION=1.2
-    - osx_image: xcode7.1
-      env: TRAVIS_SWIFT_VERSION=2.1
+    - osx_image: xcode7.2
+      env: TRAVIS_SWIFT_VERSION=2.1.1
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,9 @@
 
 ##### Breaking
 
-* None.
+* `--swift-version` now defaults to 2.1.1 instead of 2.1.
+  [Nikita Lutsenko](https://github.com/nlutsenko)
+  [#416](https://github.com/realm/jazzy/pull/416)
 
 ##### Enhancements
 

diff --git a/lib/jazzy/config.rb b/lib/jazzy/config.rb
@@ -142,7 +142,7 @@ def expand_path(path)
 
     config_attr :swift_version,
       command_line: '--swift-version VERSION',
-      default: '2.1'
+      default: '2.1.1'
 
     # ──────── Metadata ────────
 

diff --git a/spec/integration_spec.rb b/spec/integration_spec.rb
@@ -111,7 +111,7 @@
     end
   end if !travis_swift || travis_swift == '1.2'
 
-  describe 'jazzy swift 2.1' do
+  describe 'jazzy swift 2.1.1' do
     describe 'Creates docs with a module name, author name, project URL, ' \
       'xcodebuild options, and github info' do
       behaves_like cli_spec 'document_alamofire',
@@ -176,5 +176,5 @@
     describe 'Creates docs for Swift project with a variety of contents' do
       behaves_like cli_spec 'misc_jazzy_features', '-x -dry-run'
     end
-  end if !travis_swift || travis_swift == '2.1'
+  end if !travis_swift || travis_swift == '2.1.1'
 end