Swift 2.0 #261
Swift 2.0 #261
Conversation
| @@ -168,12 +166,6 @@ def self.make_doc_info(doc, declaration) | |||
| @documented_count += 1 | |||
| end | |||
|
|
|||
| def self.string_until_first_rest_definition(string) | |||
There was a problem hiding this comment.
need to keep this in case we're running against swift 1.2
|
FYI: I'll be rebasing this on master, cutting a final release of jazzy targeting Swift 1.2, and then intend to merge this PR. If you'd like to review these changes, now's the time. |
jpsim
force-pushed
the
swift-2.0
branch
4 times, most recently
from
c346207 to
a3c16ce
Compare
|
Please rebase, I'll try and review this weekend |
|
This has now been rebased against master, and is no longer work-in-progress. I consider this ready to be merged, but will leave this open over the weekend in case anyone wants to review @segiddins @pcantrell |
|
FWIW, I’ve been working exclusively off this branch for the Siesta docs, and things have been working just fine. |
|
Awesome. |
jpsim
force-pushed
the
swift-2.0
branch
2 times, most recently
from
a0ecf29 to
8a9ead8
Compare
Most of these changes are related to decoupling directory structure from navigation structure.
e.g. Classes/Request/TaskDelegate.html, not Classes/TaskDelegate.html
Wow, 80 char limit. No fooling around here!
| type = SourceDeclaration::Type.new(doc['key.kind']) | ||
| return true if type.enum_element? | ||
| if type.extension? | ||
| return (doc['key.substructure'] || []).any? do |subdoc| |
There was a problem hiding this comment.
Array(doc['key.substructure'])
There was a problem hiding this comment.
I think this version is more explicit, and actually shorter.
There was a problem hiding this comment.
Except it's less safe, since Array() coerces anything to an array, including arrays, nil, and a single object.
There was a problem hiding this comment.
I prefer || [] for exactly the same reason @segiddins prefers the other: it’s clear what it does, whereas Array() uses to_ary and sometimes works in surprising ways. Probably fine in this situation though.
|
CHANGELOG? |
|
Riiiight, so since Travis runs the |
|
Ok, I finally got a Xcode 6.4/7 matrix working on Travis. |
…& Realm Swift tests for Swift 1.2
|
I think we're all good here! Thanks @pcantrell and @segiddins for making this release happen |
|
Does the Requirements section of the main ReadMe need to change? "Requirements |
|
Exactly. Xcode 7 no longer is in beta (except the upcoming 7.1, of course...) and Swift 2 is the current version of the language now. |
|
I've updated the README in b71256f to reflect this, thanks! |
AFAICT this is more or less working, but I've been making changes to SourceKitten ad-hoc (and here a bit too), so I'll probably rework that quite a bit before ever shipping a release to either.
I make no promises as to the state of things, but feel free to experiment if you're feeling adventurous!