Skip to content
This repository was archived by the owner on Aug 17, 2022. It is now read-only.

Updated Travis to Xcode 8 #17

Merged
merged 4 commits into from
Jan 7, 2017
Merged

Conversation

codesman
Copy link

@codesman codesman commented Jan 7, 2017

This includes changes from #16

@codesman codesman mentioned this pull request Jan 7, 2017
Copy link
Contributor

@aranasaurus aranasaurus left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good! Merging and then I'll do the clicks to get Travis set up.

@codesman thanks for getting CI set up for us. You rock!
@juliand665 nice work with all the challenges in one shot!

In the future though, let's keep the PRs separate. One PR for all the entries from @juliand665 and one that addressed #12 would have been my preferred set up, the merge conflicts should be handled after whichever one gets merged first, and preferably as a rebase.

@@ -36,7 +36,8 @@ struct ClockChallenge: CodeChallengeType {
ethanSchatzlineClockEntry,
brandonShegaClockEntry,
matthijsClockEntry,
felixdumitClockEntry
felixdumitClockEntry,
juliand665ClockEntry,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't think Swift supported trailing commas in array literals, but I see this builds and runs so 👍

return combs
}

private let numbersToLetters: [Character: [String]] = [ // explicit declaration reduces compile time
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I need to update the README for Swift 3, but this should be fileprivate. Don't worry about changing it @juliand665, I'll do it when I update the README, but just wanted to point it out here.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually I take that back... I always forget that private is more restrictive than fileprivate, so nevermind! No changes needed :)

@aranasaurus aranasaurus merged commit 06dbeb3 into iosdevelopershq:master Jan 7, 2017
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants