Skip to content

Commit

Permalink
bump up dependencies
Browse files Browse the repository at this point in the history
supporting swift version 05-31
  • Loading branch information
Tomohisa Takaoka committed Jun 14, 2016
1 parent c2afc59 commit 83cdad8
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .swift-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
swift-DEVELOPMENT-SNAPSHOT-2016-05-09-a
swift-DEVELOPMENT-SNAPSHOT-2016-05-31-a
6 changes: 3 additions & 3 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ let package = Package(
name: "WebSocketClient",
dependencies: [
.Package(url: "https://github.com/Zewo/WebSocket.git", majorVersion: 0, minor: 8),
.Package(url: "https://github.com/Zewo/HTTP.git", majorVersion: 0, minor: 7),
.Package(url: "https://github.com/Zewo/HTTP.git", majorVersion: 0, minor: 8),
.Package(url: "https://github.com/Zewo/Base64.git", majorVersion: 0, minor: 8),
.Package(url: "https://github.com/VeniceX/HTTPClient.git", majorVersion: 0, minor: 7),
.Package(url: "https://github.com/VeniceX/HTTPSClient.git", majorVersion: 0, minor: 7),
.Package(url: "https://github.com/VeniceX/HTTPClient.git", majorVersion: 0, minor: 8),
.Package(url: "https://github.com/VeniceX/HTTPSClient.git", majorVersion: 0, minor: 8),
]
)
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import PackageDescription

let package = Package(
dependencies: [
.Package(url: "https://github.com/Zewo/WebSocketClient.git", majorVersion: 0, minor: 1),
.Package(url: "https://github.com/Zewo/WebSocketClient.git", majorVersion: 0, minor: 2),
]
)
```
Expand Down
12 changes: 6 additions & 6 deletions Sources/Client.swift
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public struct Client {
"Connection": "Upgrade",
"Upgrade": "websocket",
"Sec-WebSocket-Version": "13",
"Sec-WebSocket-Key": [key],
"Sec-WebSocket-Key": key,
]

let request = try Request(method: .get, uri: path, headers: headers) { response, stream in
Expand All @@ -85,7 +85,7 @@ public struct Client {
try webSocket.start()
}

try client.respond(to: request)
_ = try client.respond(to: request)
}

public func connectInBackground(_ path: String, failure: (ErrorProtocol) -> Void = Client.logError) {
Expand All @@ -105,18 +105,18 @@ public struct Client {

public extension Response {
public var webSocketVersion: String? {
return headers["Sec-Websocket-Version"].first
return headers["Sec-Websocket-Version"]
}

public var webSocketKey: String? {
return headers["Sec-Websocket-Key"].first
return headers["Sec-Websocket-Key"]
}

public var webSocketAccept: String? {
return headers["Sec-WebSocket-Accept"].first
return headers["Sec-WebSocket-Accept"]
}

public var isWebSocket: Bool {
return connection.first?.lowercased() == "upgrade" && upgrade.first?.lowercased() == "websocket"
return connection?.lowercased() == "upgrade" && upgrade?.lowercased() == "websocket"
}
}

0 comments on commit 83cdad8

Please sign in to comment.