Skip to content

Commit 51ab22d

Browse files
committed
Merge branch 'develop'
2 parents f94018a + 2f09907 commit 51ab22d

9 files changed

+15
-903
lines changed

.travis.yml

+7-1
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,18 @@ matrix:
1111
sudo: required
1212
- os: Linux
1313
dist: trusty
14-
env: SWIFT_SNAPSHOT_NAME="https://swift.org/builds/swift-4.1-release/ubuntu1404/swift-4.1-RELEASE/swift-4.1-RELEASE-ubuntu14.04.tar.gz"
14+
env: SWIFT_SNAPSHOT_NAME="https://swift.org/builds/swift-4.1.1-release/ubuntu1404/swift-4.1.1-RELEASE/swift-4.1.1-RELEASE-ubuntu14.04.tar.gz"
15+
sudo: required
16+
- os: Linux
17+
dist: trusty
18+
env: SWIFT_SNAPSHOT_NAME="https://swift.org/builds/swift-4.2-branch/ubuntu1404/swift-4.2-DEVELOPMENT-SNAPSHOT-2018-07-24-a/swift-4.2-DEVELOPMENT-SNAPSHOT-2018-07-24-a-ubuntu14.04.tar.gz"
1519
sudo: required
1620
- os: osx
1721
osx_image: xcode9
1822
- os: osx
1923
osx_image: xcode9.3
24+
- os: osx
25+
osx_image: xcode9.4
2026

2127

2228
before_install:

Package.swift

+2-4
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,13 @@ import PackageDescription
55
let package = Package(
66
name: "swift-nio-irc",
77
products: [
8-
.library (name: "NIOIRC", targets: [ "NIOIRC" ]),
9-
.library (name: "IRC", targets: [ "IRC" ])
8+
.library(name: "NIOIRC", targets: [ "NIOIRC" ])
109
],
1110
dependencies: [
1211
.package(url: "https://github.com/apple/swift-nio.git",
1312
from: "1.8.0")
1413
],
1514
targets: [
16-
.target(name: "NIOIRC", dependencies: [ "NIO" ]),
17-
.target(name: "IRC", dependencies: [ "NIOIRC" ])
15+
.target(name: "NIOIRC", dependencies: [ "NIO" ])
1816
]
1917
)

README.md

+6-9
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,11 @@
88

99
SwiftNIO-IRC is a Internet Relay Chat
1010
[protocol implementation](Sources/NIOIRC) for
11-
[SwiftNIO](https://github.com/apple/swift-nio)
12-
and a simple
13-
[IRC client](Sources/IRC).
11+
[SwiftNIO](https://github.com/apple/swift-nio).
1412

15-
This module contains the protocol implementation and the client, we also
13+
This module contains just the protocol implementation. We also
1614
provide:
15+
- [swift-nio-irc-client](https://github.com/NozeIO/swift-nio-irc-client) - a simple IRC client lib
1716
- [swift-nio-irc-webclient](https://github.com/NozeIO/swift-nio-irc-webclient) -
1817
a simple IRC webclient + WebSocket gateway based on this module,
1918
- [swift-nio-irc-eliza](https://github.com/NozeIO/swift-nio-irc-eliza) -
@@ -42,14 +41,12 @@ import PackageDescription
4241
let package = Package(
4342
name: "IRCTests",
4443
dependencies: [
45-
.package(url: "https://github.com/NozeIO/swift-nio-irc.git",
46-
from: "0.5.0")
44+
.package(url: "https://github.com/SwiftNIOExtras/swift-nio-irc.git",
45+
from: "0.6.0")
4746
],
4847
targets: [
4948
.target(name: "MyProtocolTool",
50-
dependencies: [ "NIOIRC" ]),
51-
.target(name: "MyIRCClient",
52-
dependencies: [ "IRC" ])
49+
dependencies: [ "NIOIRC" ])
5350
]
5451
)
5552
```

0 commit comments

Comments
 (0)