Skip to content

Commit dfd4588

Browse files
authored
Import concrete NIO modules (#105)
* Import concrete NIO modules # Motivation We should import the correct NIO submodules instead of the umbrella. # Modification Fix up import statements # Result We are now importing the proper submodules * Fix the timespec import
1 parent f21792b commit dfd4588

File tree

79 files changed

+108
-83
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+108
-83
lines changed

Package.swift

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@ let package = Package(
3434
.target(
3535
name: "NIOSSH",
3636
dependencies: [
37-
.product(name: "NIO", package: "swift-nio"),
37+
.product(name: "NIOCore", package: "swift-nio"),
38+
.product(name: "NIOConcurrencyHelpers", package: "swift-nio"),
3839
.product(name: "NIOFoundationCompat", package: "swift-nio"),
3940
.product(name: "Crypto", package: "swift-crypto"),
4041
]
@@ -43,15 +44,17 @@ let package = Package(
4344
name: "NIOSSHClient",
4445
dependencies: [
4546
"NIOSSH",
46-
.product(name: "NIO", package: "swift-nio"),
47+
.product(name: "NIOCore", package: "swift-nio"),
48+
.product(name: "NIOPosix", package: "swift-nio"),
4749
.product(name: "NIOConcurrencyHelpers", package: "swift-nio"),
4850
]
4951
),
5052
.target(
5153
name: "NIOSSHServer",
5254
dependencies: [
5355
"NIOSSH",
54-
.product(name: "NIO", package: "swift-nio"),
56+
.product(name: "NIOCore", package: "swift-nio"),
57+
.product(name: "NIOPosix", package: "swift-nio"),
5558
.product(name: "NIOFoundationCompat", package: "swift-nio"),
5659
.product(name: "Crypto", package: "swift-crypto"),
5760
]
@@ -60,15 +63,17 @@ let package = Package(
6063
name: "NIOSSHPerformanceTester",
6164
dependencies: [
6265
"NIOSSH",
63-
.product(name: "NIO", package: "swift-nio"),
66+
.product(name: "NIOCore", package: "swift-nio"),
67+
.product(name: "NIOEmbedded", package: "swift-nio"),
6468
.product(name: "Crypto", package: "swift-crypto"),
6569
]
6670
),
6771
.testTarget(
6872
name: "NIOSSHTests",
6973
dependencies: [
7074
"NIOSSH",
71-
.product(name: "NIO", package: "swift-nio"),
75+
.product(name: "NIOCore", package: "swift-nio"),
76+
.product(name: "NIOEmbedded", package: "swift-nio"),
7277
.product(name: "NIOFoundationCompat", package: "swift-nio"),
7378
]
7479
),

Sources/NIOSSH/ByteBuffer+SSH.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
//
1313
//===----------------------------------------------------------------------===//
1414

15-
import NIO
15+
import NIOCore
1616

1717
extension ByteBuffer {
1818
/// Gets an SSH boolean field from a `ByteBuffer`.

Sources/NIOSSH/Child Channels/ChildChannelOptions.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
//
1313
//===----------------------------------------------------------------------===//
1414

15-
import NIO
15+
import NIOCore
1616

1717
/// The various channel options specific to `SSHChildChannel`s.
1818
///

Sources/NIOSSH/Child Channels/ChildChannelUserEvents.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
//
1313
//===----------------------------------------------------------------------===//
1414

15-
import NIO
15+
import NIOCore
1616

1717
/// A namespace for SSH channel request events.
1818
public enum SSHChannelRequestEvent {

Sources/NIOSSH/Child Channels/SSHChannelData.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
//
1313
//===----------------------------------------------------------------------===//
1414

15-
import NIO
15+
import NIOCore
1616

1717
/// `SSHChannelData` is the data type that is passed around in `SSHChildChannel` objects.
1818
///

Sources/NIOSSH/Child Channels/SSHChannelMultiplexer.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
//
1313
//===----------------------------------------------------------------------===//
1414

15-
import NIO
15+
import NIOCore
1616

1717
/// An object that controls multiplexing messages to multiple child channels.
1818
final class SSHChannelMultiplexer {

Sources/NIOSSH/Child Channels/SSHChannelType.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// SPDX-License-Identifier: Apache-2.0
1212
//
1313
//===----------------------------------------------------------------------===//
14-
import NIO
14+
import NIOCore
1515

1616
/// `SSHChannelType` represents the type of a single SSH channel.
1717
///

Sources/NIOSSH/Child Channels/SSHChildChannel.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
//
1313
//===----------------------------------------------------------------------===//
1414

15-
import NIO
1615
import NIOConcurrencyHelpers
16+
import NIOCore
1717

1818
/// A NIO `Channel` that encapsulates a single SSH `Channel`.
1919
///

Sources/NIOSSH/Connection State Machine/Operations/SendsChannelMessages.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
//
1313
//===----------------------------------------------------------------------===//
1414

15-
import NIO
15+
import NIOCore
1616

1717
// Right now this doesn't do that much, but we may use it in future for supporting re-keying.
1818
protocol SendsChannelMessages {

Sources/NIOSSH/Connection State Machine/Operations/SendsKeyExchangeMessages.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
//
1313
//===----------------------------------------------------------------------===//
1414

15-
import NIO
15+
import NIOCore
1616

1717
protocol SendsKeyExchangeMessages {
1818
var keyExchangeStateMachine: SSHKeyExchangeStateMachine { get set }

0 commit comments

Comments
 (0)