Skip to content

Commit 77751d4

Browse files
authored
Support latest NIO code; Make Swift 5.2 the minimum supported version (#254)
* Support latest NIO code; Make Swift 5.2 the minimum supported version (required by NIO) * Package.swift updates for Swift 5.2 * remove .swift-version file * Fix BlueSSLService dependency reference * Remove Xcode 11 support because it requires Swift 5.1
1 parent 082a207 commit 77751d4

3 files changed

Lines changed: 16 additions & 13 deletions

File tree

.swift-version

Lines changed: 0 additions & 1 deletion
This file was deleted.

.travis.yml

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,7 @@ matrix:
1515
dist: xenial
1616
sudo: required
1717
services: docker
18-
env: DOCKER_IMAGE=docker.kitura.net/kitura/swift-ci:5.0.3 SWIFT_SNAPSHOT=5.0.3 DOCKER_PRIVILEGED=true SWIFT_TEST_ARGS="--parallel"
19-
- os: linux
20-
dist: xenial
21-
sudo: required
22-
services: docker
23-
env: DOCKER_IMAGE=docker.kitura.net/kitura/swift-ci-ubuntu16.04:5.1.5 DOCKER_PRIVILEGED=true SWIFT_TEST_ARGS="--parallel --sanitize=thread" CUSTOM_TEST_SCRIPT=.kitura-test.sh
18+
env: DOCKER_IMAGE=docker.kitura.net/kitura/swift-ci-ubuntu16.04:5.2.5 DOCKER_PRIVILEGED=true SWIFT_TEST_ARGS="--parallel --sanitize=thread" CUSTOM_TEST_SCRIPT=.kitura-test.sh
2419
- os: linux
2520
dist: xenial
2621
sudo: required
@@ -33,11 +28,11 @@ matrix:
3328
env: DOCKER_IMAGE=docker.kitura.net/kitura/swift-ci-ubuntu18.04:latest USE_SWIFT_DEVELOPMENT_SNAPSHOT=1 DOCKER_PRIVILEGED=true SWIFT_TEST_ARGS="--parallel --sanitize=thread"
3429

3530
- os: osx
36-
osx_image: xcode11.3
31+
osx_image: xcode12.2
3732
sudo: required
3833
env: JAZZY_ELIGIBLE=true SWIFT_TEST_ARGS="--parallel --sanitize=thread"
3934
- os: osx
40-
osx_image: xcode12.2
35+
osx_image: xcode12.5
4136
sudo: required
4237
env: SWIFT_TEST_ARGS="--parallel --sanitize=thread"
4338
- os: osx

Package.swift

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// swift-tools-version:5.0
1+
// swift-tools-version:5.2
22
// The swift-tools-version declares the minimum version of Swift required to build this package.
33
/*
44
* Copyright IBM Corporation and the Kitura project authors 2016-2020
@@ -27,10 +27,10 @@ let package = Package(
2727
],
2828
dependencies: [
2929
// Dependencies declare other packages that this package depends on.
30-
.package(url: "https://github.com/apple/swift-nio.git", from: "2.8.0"),
30+
.package(url: "https://github.com/apple/swift-nio.git", from: "2.33.0"),
3131
.package(url: "https://github.com/apple/swift-nio-ssl.git", from: "2.0.0"),
3232
.package(url: "https://github.com/apple/swift-nio-extras.git", from: "1.0.0"),
33-
.package(url: "https://github.com/Kitura/BlueSSLService.git", from: "2.0.0"),
33+
.package(name: "SSLService", url: "https://github.com/Kitura/BlueSSLService.git", from: "2.0.1"),
3434
.package(url: "https://github.com/Kitura/LoggerAPI.git", from: "2.0.0")
3535
],
3636
targets: [
@@ -39,7 +39,16 @@ let package = Package(
3939
dependencies: []),
4040
.target(
4141
name: "KituraNet",
42-
dependencies: ["NIO", "NIOFoundationCompat", "NIOHTTP1", "NIOSSL", "SSLService", "LoggerAPI", "NIOWebSocket", "CLinuxHelpers", "NIOConcurrencyHelpers", "NIOExtras"]),
42+
dependencies: [
43+
.product(name: "NIO", package: "swift-nio"),
44+
.product(name: "NIOFoundationCompat", package: "swift-nio"),
45+
.product(name: "NIOHTTP1", package: "swift-nio"),
46+
.product(name: "NIOSSL", package: "swift-nio-ssl"),
47+
"SSLService",
48+
.product(name: "NIOWebSocket", package: "swift-nio"),
49+
.product(name: "NIOConcurrencyHelpers", package: "swift-nio"),
50+
.product(name: "NIOExtras", package: "swift-nio-extras"),
51+
"LoggerAPI", "CLinuxHelpers"]),
4352
.testTarget(
4453
name: "KituraNetTests",
4554
dependencies: ["KituraNet"])

0 commit comments

Comments
 (0)