Skip to content

Commit db4625a

Browse files
authored
Merge branch 'main' into jw-more-pcap
2 parents 8b63363 + 4569c69 commit db4625a

Some content is hidden

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

52 files changed

+5913
-210
lines changed

NOTICE.txt

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,14 @@ This product contains a derivation of the Tony Stone's 'process_test_files.rb'.
3232
* https://www.apache.org/licenses/LICENSE-2.0
3333
* HOMEPAGE:
3434
* https://codegists.com/snippet/ruby/generate_xctest_linux_runnerrb_tonystone_ruby
35+
36+
---
37+
38+
This product contains a derivation of "HTTP1ProxyConnectHandler.swift" and accompanying tests from AsyncHTTPClient.
39+
40+
* LICENSE (Apache License 2.0):
41+
* https://www.apache.org/licenses/LICENSE-2.0
42+
* HOMEPAGE:
43+
* https://github.com/swift-server/async-http-client
44+
45+
---

Package.swift

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ var targets: [PackageDescription.Target] = [
2222
"NIOPCAP",
2323
.product(name: "NIO", package: "swift-nio"),
2424
.product(name: "NIOCore", package: "swift-nio"),
25+
.product(name: "NIOHTTP1", package: "swift-nio"),
2526
]),
2627
.target(
2728
name: "NIOHTTPCompression",
@@ -116,6 +117,18 @@ var targets: [PackageDescription.Target] = [
116117
.product(name: "NIOCore", package: "swift-nio"),
117118
.product(name: "NIOPosix", package: "swift-nio"),
118119
]),
120+
name: "NIONFS3",
121+
dependencies: [
122+
.product(name: "NIOCore", package: "swift-nio"),
123+
]),
124+
.testTarget(
125+
name: "NIONFS3Tests",
126+
dependencies: [
127+
"NIONFS3",
128+
.product(name: "NIOCore", package: "swift-nio"),
129+
.product(name: "NIOEmbedded", package: "swift-nio"),
130+
.product(name: "NIOTestUtils", package: "swift-nio"),
131+
]),
119132
]
120133

121134
let package = Package(

[email protected]

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ var targets: [PackageDescription.Target] = [
2222
"NIOPCAP",
2323
.product(name: "NIO", package: "swift-nio"),
2424
.product(name: "NIOCore", package: "swift-nio"),
25+
.product(name: "NIOHTTP1", package: "swift-nio")
2526
]),
2627
.target(
2728
name: "NIOHTTPCompression",
@@ -116,6 +117,17 @@ var targets: [PackageDescription.Target] = [
116117
.product(name: "NIOCore", package: "swift-nio"),
117118
.product(name: "NIOPosix", package: "swift-nio"),
118119
]),
120+
name: "NIONFS3",
121+
dependencies: [
122+
.product(name: "NIOCore", package: "swift-nio"),
123+
]),
124+
.testTarget(
125+
name: "NIONFS3Tests",
126+
dependencies: [
127+
"NIONFS3",
128+
.product(name: "NIOCore", package: "swift-nio"),
129+
.product(name: "NIOTestUtils", package: "swift-nio"),
130+
]),
119131
]
120132

121133
let package = Package(

0 commit comments

Comments
 (0)