Skip to content

Commit 738f3eb

Browse files
authored
Merge pull request #152 from vapor/beta
sockets beta
2 parents a778166 + 32414fd commit 738f3eb

Some content is hidden

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

64 files changed

+1430
-2581
lines changed

.circleci/config.yml

Lines changed: 0 additions & 37 deletions
This file was deleted.

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,5 @@ Packages
33
*.xcodeproj
44
Package.pins
55
.DS_Store
6+
Package.resolved
7+

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2016 Qutheory, LLC
3+
Copyright (c) 2018 Qutheory, LLC
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

Package.resolved

Lines changed: 0 additions & 34 deletions
This file was deleted.

Package.swift

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,20 @@
1-
// swift-tools-version:3.0
1+
// swift-tools-version:4.0
22
import PackageDescription
33

44
let package = Package(
55
name: "Sockets",
6-
targets: [
7-
Target(name: "Transport"),
8-
Target(name: "Sockets", dependencies: ["Transport"])
6+
products: [
7+
.library(name: "TCP", targets: ["TCP"]),
98
],
109
dependencies: [
11-
// Core extensions, type-aliases, and functions that facilitate common tasks.
12-
.Package(url: "https://github.com/vapor/core.git", majorVersion: 2),
10+
// ⏱ Promises and reactive-streams in Swift built for high-performance and scalability.
11+
.package(url: "https://github.com/vapor/async.git", from: "1.0.0-rc"),
12+
13+
// 🌎 Utility package containing tools for byte manipulation, Codable, OS APIs, and debugging.
14+
.package(url: "https://github.com/vapor/core.git", from: "3.0.0-rc"),
15+
],
16+
targets: [
17+
.target(name: "TCP", dependencies: ["Async", "Bits", "COperatingSystem", "Debugging"]),
18+
.testTarget(name: "TCPTests", dependencies: ["Async", "TCP"]),
1319
]
1420
)

Package@swift-4.swift

Lines changed: 0 additions & 19 deletions
This file was deleted.

README.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<p align="center">
2-
<img src="https://cloud.githubusercontent.com/assets/1977704/25429944/0135848e-2a7b-11e7-8194-b2f566e55776.png" width="320" alt="Sockets">
2+
<img src="https://user-images.githubusercontent.com/1342803/36575217-ab24b066-1817-11e8-859d-e71cdd16a902.png" height="64" alt="Sockets">
33
<br>
44
<br>
5-
<a href="https://docs.vapor.codes/sockets/package/">
6-
<img src="http://img.shields.io/badge/read_the-docs-92A8D1.svg" alt="Documentation">
5+
<a href="https://docs.vapor.codes/3.0/">
6+
<img src="http://img.shields.io/badge/read_the-docs-2196f3.svg" alt="Documentation">
77
</a>
88
<a href="http://vapor.team">
99
<img src="http://vapor.team/badge.svg" alt="Slack Team">
@@ -15,15 +15,15 @@
1515
<img src="https://circleci.com/gh/vapor/sockets.svg?style=shield" alt="Continuous Integration">
1616
</a>
1717
<a href="https://swift.org">
18-
<img src="http://img.shields.io/badge/swift-3.1-brightgreen.svg" alt="Swift 3.1">
18+
<img src="http://img.shields.io/badge/swift-4.1-brightgreen.svg" alt="Swift 4.1">
1919
</a>
2020
</center>
2121

22-
## 👥 Authors
22+
<hr>
2323

24-
Honza Dvorsky - http://honzadvorsky.com, [@czechboy0](http://twitter.com/czechboy0)
25-
Matthias Kreileder - [@matthiaskr1](https://twitter.com/matthiaskr1)
24+
**Original authors**
2625

27-
## 💙 Code of Conduct
26+
- Honza Dvorsky - http://honzadvorsky.com, [@czechboy0](http://twitter.com/czechboy0)
27+
- Matthias Kreileder - [@matthiaskr1](https://twitter.com/matthiaskr1)
2828

29-
Our goal is to create a safe and empowering environment for anyone who decides to use or contribute to Vapor. Please help us make the community a better place by abiding to this [Code of Conduct](https://github.com/vapor/vapor/blob/master/Documents/CODE_OF_CONDUCT.md) during your interactions surrounding this project.
29+
At the request of the original authors, we ask you to please help us make the community a better place by abiding to this [Code of Conduct](https://github.com/vapor/vapor/blob/master/CODE_OF_CONDUCT.md) during your interactions surrounding this project.

Sources/Sockets/Address/Address+C.swift

Lines changed: 0 additions & 85 deletions
This file was deleted.

0 commit comments

Comments
 (0)