Merge branch 'develop'

Author: helje5

.travis.yml

@@ -7,26 +7,16 @@ matrix:
  include:
  - os: Linux
  dist: trusty
- env: SWIFT_SNAPSHOT_NAME="https://swift.org/builds/swift-4.0.3-release/ubuntu1404/swift-4.0.3-RELEASE/swift-4.0.3-RELEASE-ubuntu14.04.tar.gz"
+ env: SWIFT_SNAPSHOT_NAME="https://swift.org/builds/swift-4.2.3-release/ubuntu1404/swift-4.2.3-RELEASE/swift-4.2.3-RELEASE-ubuntu14.04.tar.gz"
  sudo: required
  - os: Linux
  dist: trusty
- env: SWIFT_SNAPSHOT_NAME="https://swift.org/builds/swift-4.1.1-release/ubuntu1404/swift-4.1.1-RELEASE/swift-4.1.1-RELEASE-ubuntu14.04.tar.gz"
+ env: SWIFT_SNAPSHOT_NAME="https://swift.org/builds/swift-5.0-release/ubuntu1404/swift-5.0-RELEASE/swift-5.0-RELEASE-ubuntu14.04.tar.gz"
  sudo: required
- - os: Linux
- dist: trusty
- env: SWIFT_SNAPSHOT_NAME="https://swift.org/builds/swift-4.2.1-release/ubuntu1404/swift-4.2.1-RELEASE/swift-4.2.1-RELEASE-ubuntu14.04.tar.gz"
- sudo: required
- - os: osx
- osx_image: xcode9
- - os: osx
- osx_image: xcode9.3
- - os: osx
- osx_image: xcode9.4
- - os: osx
- osx_image: xcode10
  - os: osx
  osx_image: xcode10.1
+ - os: osx
+ osx_image: xcode10.2
 
 
 before_install:

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:4.0
+// swift-tools-version:4.2
 
 import PackageDescription
 
@@ -9,7 +9,7 @@ let package = Package(
  ],
  dependencies: [
  .package(url: "https://github.com/apple/swift-nio.git", 
- from: "1.9.2")
+ from: "1.13.2")
  ],
  targets: [
  .target(name: "NIOIRC", dependencies: [ "NIO" ])

Sources/NIOIRC/IRCCommandParser.swift

@@ -21,7 +21,7 @@ public extension IRCCommand {
  * The parser validates the argument counts etc and throws exceptions on
  * unexpected input.
  */
- public init(_ command: String, arguments: [ String ]) throws {
+ init(_ command: String, arguments: [ String ]) throws {
  typealias Error = IRCParserError
 
  func expect(argc: Int) throws {
@@ -255,7 +255,7 @@ public extension IRCCommand {
  * The parser validates the argument counts etc and throws exceptions on
  * unexpected input.
  */
- public init(_ v: Int, arguments: [ String ]) throws {
+ init(_ v: Int, arguments: [ String ]) throws {
  if let code = IRCCommandCode(rawValue: v) {
  self = .numeric(code, arguments)
  }
@@ -271,7 +271,7 @@ public extension IRCCommand {
  * The parser validates the argument counts etc and throws exceptions on
  * unexpected input.
  */
- public init(_ s: String, _ arguments: String...) throws {
+ init(_ s: String, _ arguments: String...) throws {
  try self.init(s, arguments: arguments)
  }
 
@@ -282,7 +282,7 @@ public extension IRCCommand {
  * The parser validates the argument counts etc and throws exceptions on
  * unexpected input.
  */
- public init(_ v: Int, _ arguments: String...) throws {
+ init(_ v: Int, _ arguments: String...) throws {
  try self.init(v, arguments: arguments)
  }
 }

Sources/NIOIRC/Model/IRCChannelName.swift

@@ -42,9 +42,15 @@ public struct IRCChannelName : Hashable, CustomStringConvertible {
  return storage
  }
 
- public var hashValue: Int {
- return normalized.hashValue
- }
+ #if compiler(>=5)
+ public func hash(into hasher: inout Hasher) {
+ normalized.hash(into: &hasher)
+ }
+ #else
+ public var hashValue: Int {
+ return normalized.hashValue
+ }
+ #endif
 
  public static func ==(lhs: IRCChannelName, rhs: IRCChannelName) -> Bool {
  return lhs.normalized == rhs.normalized

Sources/NIOIRC/Model/IRCMessageRecipient.swift

@@ -22,13 +22,23 @@ public enum IRCMessageRecipient : Hashable {
  // or: user, or user%host, @server, etc
  // or: nickname!user@host
 
- public var hashValue: Int {
- switch self {
- case .channel (let name): return name.hashValue
- case .nickname(let name): return name.hashValue
- case .everything: return 42
+ #if compiler(>=5)
+ public func hash(into hasher: inout Hasher) {
+ switch self {
+ case .channel (let name): return name.hash(into: &hasher)
+ case .nickname(let name): return name.hash(into: &hasher)
+ case .everything: return 42.hash(into: &hasher) // TBD?
+ }
  }
- }
+ #else
+ public var hashValue: Int {
+ switch self {
+ case .channel (let name): return name.hashValue
+ case .nickname(let name): return name.hashValue
+ case .everything: return 42
+ }
+ }
+ #endif
 
  public static func ==(lhs: IRCMessageRecipient, rhs: IRCMessageRecipient)
  -> Bool
@@ -44,7 +54,7 @@ public enum IRCMessageRecipient : Hashable {
 
 public extension IRCMessageRecipient {
 
- public init?(_ s: String) {
+ init?(_ s: String) {
  if s == "*" {
  self = .everything
  }
@@ -59,7 +69,7 @@ public extension IRCMessageRecipient {
  }
  }
 
- public var stringValue : String {
+ var stringValue : String {
  switch self {
  case .channel (let name): return name.stringValue
  case .nickname(let name): return name.stringValue

Sources/NIOIRC/Model/IRCNickName.swift

@@ -37,9 +37,15 @@ public struct IRCNickName : Hashable, CustomStringConvertible {
  return storage
  }
 
- public var hashValue: Int {
- return normalized.hashValue
- }
+ #if compiler(>=5)
+ public func hash(into hasher: inout Hasher) {
+ normalized.hash(into: &hasher)
+ }
+ #else
+ public var hashValue: Int {
+ return normalized.hashValue
+ }
+ #endif
 
  public static func ==(lhs: IRCNickName, rhs: IRCNickName) -> Bool {
  return lhs.normalized == rhs.normalized

Sources/NIOIRC/Model/IRCServerName.swift

@@ -34,9 +34,15 @@ public struct IRCServerName : Hashable {
  return storage
  }
 
- public var hashValue: Int {
- return normalized.hashValue
- }
+ #if compiler(>=5)
+ public func hash(into hasher: inout Hasher) {
+ normalized.hash(into: &hasher)
+ }
+ #else
+ public var hashValue: Int {
+ return normalized.hashValue
+ }
+ #endif
 
  public static func ==(lhs: IRCServerName, rhs: IRCServerName) -> Bool {
  return lhs.normalized == rhs.normalized

Sources/NIOIRC/Model/IRCUserID.swift

@@ -52,7 +52,11 @@ public struct IRCUserID : Hashable, CustomStringConvertible {
  }
  }
 
- public var hashValue: Int { return nick.hashValue }
+ #if compiler(>=5)
+ public func hash(into hasher: inout Hasher) { nick.hash(into: &hasher) }
+ #else
+ public var hashValue: Int { return nick.hashValue }
+ #endif
 
  public static func ==(lhs: IRCUserID, rhs: IRCUserID) -> Bool {
  return lhs.nick == rhs.nick && lhs.user == rhs.user && lhs.host == rhs.host