Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to Zewo 0.13 #17

Merged
merged 9 commits into from
Sep 27, 2016
Merged

Update to Zewo 0.13 #17

merged 9 commits into from
Sep 27, 2016

Conversation

joernroeder
Copy link
Contributor

Tries to update package to use Zewo 0.13, swift 3.0

- changing `ErrorProtocol` to `Error`
- importing `Core`
- `StringLiteralConvertible` -> `ExpressibleByStringLiteral`
- string `split` -> `components`
}

public protocol ConnectionProtocol: class {
associatedtype InternalStatus
associatedtype Result: ResultProtocol
associatedtype Error: ErrorProtocol, CustomStringConvertible
associatedtype ErrorAndStringConvertible: Error, CustomStringConvertible

Choose a reason for hiding this comment

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

Any reason you named this ErrorAndStringConvertible? It reads a lot nicer as Error even if it is CustomStringConvertible

Copy link
Contributor

Choose a reason for hiding this comment

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

I assume it's because Error is a reserved name by swift now. I'll change it to ConnectionError

Copy link
Contributor

Choose a reason for hiding this comment

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

Fixed :)

- Fix .gitignore, .swift-version, .travis.yml, LICENSE
- Remove license headers from files
- Remove trailing whitespace from all files
- ErrorAndStringConvertible -> ConnectionError
@Danappelxx
Copy link
Contributor

I rebased on master and fixed a few things. Your part looks good! Once CI passes I'll merge 👍

@Danappelxx
Copy link
Contributor

Excellent! Merging

@Danappelxx Danappelxx merged commit 232a917 into ZewoGraveyard:master Sep 27, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants