Skip to content

Commit

Permalink
Merge pull request #800 from realm/jp-xcode-8.3.2-specs
Browse files Browse the repository at this point in the history
Build integration specs with Xcode 8.3.2
  • Loading branch information
jpsim authored May 11, 2017
2 parents 8e75232 + 63ab44d commit 8a21d33
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 4 deletions.
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ git push
You'll need push access to the integration specs repo to do this. You can
request access from one of the maintainers when filing your PR.

You must have Xcode 8.2 installed to build the integration specs.
You must have Xcode 8.3.2 installed to build the integration specs.

## Making changes to SourceKitten

Expand Down
2 changes: 1 addition & 1 deletion circle.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
machine:
xcode:
version: "8.2"
version: "8.3.2"

checkout:
post:
Expand Down
1 change: 1 addition & 0 deletions lib/jazzy/config.rb
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,7 @@ def expand_path(path)
command_line: '--swift-version VERSION',
default: nil,
parse: ->(v) do
return nil if v.empty?
raise 'jazzy only supports Swift 2.0 or later.' if v.to_f < 2
v
end
Expand Down
5 changes: 4 additions & 1 deletion spec/integration_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,10 @@

describe 'Creates Siesta docs' do
behaves_like cli_spec 'document_siesta',
'--output api-docs' # Siesta already has Docs/
# Siesta already has Docs/
'--output api-docs',
# Use default Swift rather than the specified 3.0.2
'--swift-version='
end

describe 'Creates docs for Swift project with a variety of contents' do
Expand Down
2 changes: 1 addition & 1 deletion spec/integration_specs
Submodule integration_specs updated 315 files

0 comments on commit 8a21d33

Please sign in to comment.