Skip to content

update package to swift 5 #114

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

update package to swift 5 #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,18 @@
// swift-tools-version:4.2
// swift-tools-version:5.0
import PackageDescription

let package = Package(
name: "Embassy",
products: [.library(name: "Embassy", targets: ["Embassy"])],
targets: [.target(name: "Embassy", path: "./Sources")]
platforms: [
.iOS(.v12),
.tvOS(.v12),
.macOS(.v10_13)
],
products: [
.library(name: "Embassy", targets: ["Embassy"])
],
targets: [
.target(name: "Embassy", path: "./Sources"),
.testTarget(name: "EmbassyTests", dependencies: ["Embassy"], path: "./Tests/EmbassyTests")
]
)
4 changes: 2 additions & 2 deletions Tests/EmbassyTests/HTTPHeaderParserTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ import XCTest
}
#endif

extension HTTPHeaderParser.Element: Equatable {
}
extension HTTPHeaderParser.Element: @retroactive Equatable {}

public func == (lhs: HTTPHeaderParser.Element, rhs: HTTPHeaderParser.Element) -> Bool {
switch lhs {
case .head(let lhsMethod, let lhsPath, let lhsVersion):
Expand Down
2 changes: 1 addition & 1 deletion Tests/EmbassyTests/TestingHelpers.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ func makeRandomString(_ length: Int) -> String {
let endIndex = UInt32(letters.count - 1)
let result: [Any?] = Array(repeating: nil, count: length)
return String(result.map({ _ in
letters[String.Index(encodedOffset: Int(arc4random_uniform(endIndex)))]
letters[String.Index(utf16Offset: Int(arc4random_uniform(endIndex)), in: letters)]
}))
}

Expand Down
70 changes: 35 additions & 35 deletions Tests/EmbassyTests/TransportTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,25 +52,25 @@ class TransportTests: XCTestCase {
].reduce(0) { $0 + $1.count }

let clientSocket = try! TCPSocket()
let clientTransport = Transport(socket: clientSocket, eventLoop: loop) { data in
clientReceivedData.append(String(bytes: data, encoding: String.Encoding.utf8)!)
totalReceivedSize += clientReceivedData.last!.count
if totalReceivedSize >= totalDataSize {
loop.stop()
}
let clientTransport = Transport(socket: clientSocket, eventLoop: loop, readDataCallback: { data in
clientReceivedData.append(String(bytes: data, encoding: String.Encoding.utf8)!)
totalReceivedSize += clientReceivedData.last!.count
if totalReceivedSize >= totalDataSize {
loop.stop()
}
})
var acceptedSocket: TCPSocket!
var serverTransport: Transport!

loop.setReader(listenSocket.fileDescriptor) {
acceptedSocket = try! listenSocket.accept()
serverTransport = Transport(socket: acceptedSocket, eventLoop: loop) { data in
serverReceivedData.append(String(bytes: data, encoding: String.Encoding.utf8)!)
totalReceivedSize += serverReceivedData.last!.count
if totalReceivedSize >= totalDataSize {
loop.stop()
}
serverTransport = Transport(socket: acceptedSocket, eventLoop: loop, readDataCallback: { data in
serverReceivedData.append(String(bytes: data, encoding: String.Encoding.utf8)!)
totalReceivedSize += serverReceivedData.last!.count
if totalReceivedSize >= totalDataSize {
loop.stop()
}
})
}

try! clientSocket.connect(host: "::1", port: port)
Expand Down Expand Up @@ -125,23 +125,23 @@ class TransportTests: XCTestCase {
var serverReceivedData: [String] = []

let clientSocket = try! TCPSocket()
let clientTransport = Transport(socket: clientSocket, eventLoop: loop) { data in
clientReceivedData.append(String(bytes: data, encoding: String.Encoding.utf8)!)
if clientReceivedData.count >= 3 && serverReceivedData.count >= 3 {
loop.stop()
}
let clientTransport = Transport(socket: clientSocket, eventLoop: loop, readDataCallback: { data in
clientReceivedData.append(String(bytes: data, encoding: String.Encoding.utf8)!)
if clientReceivedData.count >= 3 && serverReceivedData.count >= 3 {
loop.stop()
}
})
var acceptedSocket: TCPSocket!
var serverTransport: Transport!

loop.setReader(listenSocket.fileDescriptor) {
acceptedSocket = try! listenSocket.accept()
serverTransport = Transport(socket: acceptedSocket, eventLoop: loop) { data in
serverReceivedData.append(String(bytes: data, encoding: String.Encoding.utf8)!)
if clientReceivedData.count >= 3 && serverReceivedData.count >= 3 {
loop.stop()
}
serverTransport = Transport(socket: acceptedSocket, eventLoop: loop, readDataCallback: { data in
serverReceivedData.append(String(bytes: data, encoding: String.Encoding.utf8)!)
if clientReceivedData.count >= 3 && serverReceivedData.count >= 3 {
loop.stop()
}
})
}

try! clientSocket.connect(host: "::1", port: port)
Expand Down Expand Up @@ -184,9 +184,9 @@ class TransportTests: XCTestCase {
try! listenSocket.listen()

let clientSocket = try! TCPSocket()
let clientTransport = Transport(socket: clientSocket, eventLoop: loop) { _ in

}
let clientTransport = Transport(socket: clientSocket, eventLoop: loop, readDataCallback: { _ in
})
var acceptedSocket: TCPSocket!
var serverTransport: Transport!
var serverReceivedData: [String] = []
Expand Down Expand Up @@ -251,23 +251,23 @@ class TransportTests: XCTestCase {
var serverReceivedData: [String] = []

let clientSocket = try! TCPSocket()
let clientTransport = Transport(socket: clientSocket, eventLoop: loop) { data in
clientReceivedData.append(String(bytes: data, encoding: String.Encoding.utf8)!)
if clientReceivedData.count >= 3 && serverReceivedData.count >= 3 {
loop.stop()
}
let clientTransport = Transport(socket: clientSocket, eventLoop: loop, readDataCallback: { data in
clientReceivedData.append(String(bytes: data, encoding: String.Encoding.utf8)!)
if clientReceivedData.count >= 3 && serverReceivedData.count >= 3 {
loop.stop()
}
})
var acceptedSocket: TCPSocket!
var serverTransport: Transport!

loop.setReader(listenSocket.fileDescriptor) {
acceptedSocket = try! listenSocket.accept()
serverTransport = Transport(socket: acceptedSocket, eventLoop: loop) { data in
serverReceivedData.append(String(bytes: data, encoding: String.Encoding.utf8)!)
if clientReceivedData.count >= 3 && serverReceivedData.count >= 3 {
loop.stop()
}
serverTransport = Transport(socket: acceptedSocket, eventLoop: loop, readDataCallback: { data in
serverReceivedData.append(String(bytes: data, encoding: String.Encoding.utf8)!)
if clientReceivedData.count >= 3 && serverReceivedData.count >= 3 {
loop.stop()
}
})
}

try! clientSocket.connect(host: "::1", port: port)
Expand Down