Merge branch 'develop' into main

.github/workflows/swift.yml

@@ -0,0 +1,41 @@
+name: Build and Test
+
+on:
+  push:
+  pull_request:
+  schedule:
+    - cron: "0 9 * * 1"
+
+jobs:
+  linux:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        image:
+          - swift:5.0.3-xenial
+          - swift:5.1.5-xenial
+          - swift:5.2.5-xenial
+          - swift:5.3.2-xenial
+          - swift:5.3.2-bionic
+    container: ${{ matrix.image }}
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v2
+      - name: Build Swift Debug Package
+        run: swift build -c debug
+      - name: Build Swift Release Package
+        run: swift build -c release
+  nextstep:
+    runs-on: macos-latest
+    steps:
+      - name: Select latest available Xcode
+        uses: maxim-lobanov/[email protected]
+        with:
+          xcode-version: 12.2
+      - name: Checkout Repository
+        uses: actions/checkout@v2
+      - name: Build Swift Debug Package
+        run: swift build -c debug
+      - name: Build Swift Release Package
+        run: swift build -c release

Package.swift

@@ -4,15 +4,15 @@ import PackageDescription
 
 var packageDependencies : [ Package.Dependency ] = [
     .package(url:  "https://github.com/apple/swift-nio.git",
-             from: "2.18.0"),
+             from: "2.25.1"),
     .package(url:  "https://github.com/SwiftNIOExtras/swift-nio-irc.git",
              from: "0.8.0")
 ]
 var targetDependencies : [ Target.Dependency ] = [ "NIO", "NIOIRC" ]
 if #available(OSX 10.14, iOS 12.0, tvOS 12.0, watchOS 6.0, *) {
     packageDependencies += [
         .package(url:  "https://github.com/apple/swift-nio-transport-services",
-                 from: "1.6.0")
+                 from: "1.9.1")
     ]
     targetDependencies += [ "NIOTransportServices" ]
 }

Sources/IRC/IRCClient.swift

@@ -2,7 +2,7 @@
 //
 // This source file is part of the swift-nio-irc open source project
 //
-// Copyright (c) 2018 ZeeZide GmbH. and the swift-nio-irc project authors
+// Copyright (c) 2018-2020 ZeeZide GmbH. and the swift-nio-irc project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
@@ -132,15 +132,19 @@ open class IRCClient : IRCClientMessageTarget {
     self.eventLoop = eventLoop
 
     // what a mess :-)
-    var overrideBootstrap : NIOClientTCPBootstrapProtocol?
     #if canImport(NIOTransportServices)
       #if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
+        var overrideBootstrap : NIOClientTCPBootstrapProtocol?
         if #available(OSX 10.14, iOS 12.0, tvOS 12.0, watchOS 6.0, *) {
           if options.eventLoopGroup is NIOTSEventLoopGroup {
             overrideBootstrap = NIOTSConnectionBootstrap(group: eventLoop)
           }
         }
+      #else
+        let overrideBootstrap : NIOClientTCPBootstrapProtocol? = nil
       #endif
+    #else
+      let overrideBootstrap : NIOClientTCPBootstrapProtocol? = nil
     #endif
 
     self.bootstrap = overrideBootstrap ?? ClientBootstrap(group: eventLoop)
@@ -408,7 +412,7 @@ open class IRCClient : IRCClientMessageTarget {
 
     func errorCaught(context: ChannelHandlerContext, error: Error) {
       self.client.handlerCaughtError(error, in: context)
-      _ = context.close(promise: nil)
+      context.close(promise: nil)
     }
   }