From e1685ae770ca1175409a766aaf344c3491007181 Mon Sep 17 00:00:00 2001 From: Cory Benfield Date: Fri, 15 Mar 2019 14:48:05 +0000 Subject: [PATCH] Prepare for convergence. (#27) Motivation: Once every few thousand years, an event called syzygy (or "convergence") occurs in our solar system. When these events occur, the fabric of spacetime becomes thin, allowing reflections of a possible future to appear in our reality. This gives a few brave souls the opportunity to experience a future: a possibility of the way the universe may one day be. But be warned: to toy with causality is to risk unbearable pain and suffering. Only the bravest of souls should look too closely at these shadows of the future. Modifications: - Chose a firm anchor point in the SwiftNIO timeline. - Removed the braces that kept time travellers safe. - Said a quiet prayer. Result: Opportunity. --- Package.swift | 10 +++++----- .../NIOTransportServices/NIOTSListenerBootstrap.swift | 1 - .../NIOTSConnectionChannelTests.swift | 1 - 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/Package.swift b/Package.swift index 38c854d..fad8f95 100644 --- a/Package.swift +++ b/Package.swift @@ -26,16 +26,16 @@ let package = Package( .executable(name: "NIOTSHTTPServer", targets: ["NIOTSHTTPServer"]), ], dependencies: [ - .package(url: "https://github.com/apple/swift-nio.git", .branch("master")), + .package(url: "https://github.com/apple/swift-nio.git", .branch("2.0.0-convergence.1")), ], targets: [ .target(name: "NIOTransportServices", - dependencies: ["NIO", "NIOFoundationCompat", "NIOConcurrencyHelpers", "NIOTLS", "_NIO1APIShims"]), + dependencies: ["NIO", "NIOFoundationCompat", "NIOConcurrencyHelpers", "NIOTLS"]), .target(name: "NIOTSHTTPClient", - dependencies: ["NIO", "NIOTransportServices", "NIOHTTP1", "_NIO1APIShims"]), + dependencies: ["NIO", "NIOTransportServices", "NIOHTTP1"]), .target(name: "NIOTSHTTPServer", - dependencies: ["NIO", "NIOTransportServices", "NIOHTTP1", "_NIO1APIShims"]), + dependencies: ["NIO", "NIOTransportServices", "NIOHTTP1"]), .testTarget(name: "NIOTransportServicesTests", - dependencies: ["NIO", "NIOTransportServices", "_NIO1APIShims"]), + dependencies: ["NIO", "NIOTransportServices"]), ] ) diff --git a/Sources/NIOTransportServices/NIOTSListenerBootstrap.swift b/Sources/NIOTransportServices/NIOTSListenerBootstrap.swift index b2731bb..e99f432 100644 --- a/Sources/NIOTransportServices/NIOTSListenerBootstrap.swift +++ b/Sources/NIOTransportServices/NIOTSListenerBootstrap.swift @@ -16,7 +16,6 @@ import NIO import Dispatch import Network -import _NIO1APIShims public final class NIOTSListenerBootstrap { private let group: EventLoopGroup diff --git a/Tests/NIOTransportServicesTests/NIOTSConnectionChannelTests.swift b/Tests/NIOTransportServicesTests/NIOTSConnectionChannelTests.swift index 2fec4da..c40bfe6 100644 --- a/Tests/NIOTransportServicesTests/NIOTSConnectionChannelTests.swift +++ b/Tests/NIOTransportServicesTests/NIOTSConnectionChannelTests.swift @@ -18,7 +18,6 @@ import Network import NIO import NIOTransportServices import Foundation -import _NIO1APIShims final class ConnectRecordingHandler: ChannelOutboundHandler {