From 018fa27b34e5cabd6e6ed80f3113e03b62beaf72 Mon Sep 17 00:00:00 2001 From: ShihabMehboob Date: Mon, 12 Feb 2018 09:42:32 +0000 Subject: [PATCH 1/6] Support Swift 4.1 --- .travis.yml | 9 +++++++++ Sources/KituraNet/BufferList.swift | 6 +++++- Sources/KituraNet/IncomingSocketProcessor.swift | 6 +++++- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1357740..0b73093 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,6 +21,15 @@ matrix: - os: osx osx_image: xcode9.2 sudo: required + env: SWIFT_SNAPSHOT=4.0.3 + - os: linux + dist: trusty + sudo: required + env: SWIFT_SNAPSHOT=swift-4.1-DEVELOPMENT-SNAPSHOT-2018-02-06-a + - os: osx + osx_image: xcode9.2 + sudo: required + env: SWIFT_SNAPSHOT=swift-4.1-DEVELOPMENT-SNAPSHOT-2018-02-06-a script: - ./build.sh diff --git a/Sources/KituraNet/BufferList.swift b/Sources/KituraNet/BufferList.swift index 1254c00..0541c19 100644 --- a/Sources/KituraNet/BufferList.swift +++ b/Sources/KituraNet/BufferList.swift @@ -90,7 +90,11 @@ public class BufferList { let result = min(length, localData.length - byteIndex) let bytes = localData.bytes.assumingMemoryBound(to: UInt8.self) + byteIndex - UnsafeMutableRawPointer(buffer).copyBytes(from: bytes, count: result) + #if swift(>=4.1) + UnsafeMutableRawPointer(buffer).copyMemory(from: bytes, byteCount: result) + #else + UnsafeMutableRawPointer(buffer).copyBytes(from: bytes, count: result) + #endif byteIndex += result return result diff --git a/Sources/KituraNet/IncomingSocketProcessor.swift b/Sources/KituraNet/IncomingSocketProcessor.swift index b53bd9f..531dc43 100644 --- a/Sources/KituraNet/IncomingSocketProcessor.swift +++ b/Sources/KituraNet/IncomingSocketProcessor.swift @@ -29,7 +29,11 @@ public protocol IncomingSocketProcessor: class { /// A back reference to the `IncomingSocketHandler` processing the socket that /// this `IncomingDataProcessor` is processing. - weak var handler: IncomingSocketHandler? { get set } + #if swift(>=4.1) + var handler: IncomingSocketHandler? { get set } + #else + weak var handler: IncomingSocketHandler? { get set } + #endif /// Process data read from the socket. /// From 04c62165a4b4a11e5ef33c26675bad303ce89ed2 Mon Sep 17 00:00:00 2001 From: ShihabMehboob Date: Thu, 22 Feb 2018 21:23:58 +0000 Subject: [PATCH 2/6] Updates to Swift 4.1 --- .swift-version | 2 +- Package.swift | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.swift-version b/.swift-version index c4e41f9..aa31e71 100644 --- a/.swift-version +++ b/.swift-version @@ -1 +1 @@ -4.0.3 +4.0.3 \ No newline at end of file diff --git a/Package.swift b/Package.swift index 6962b61..36f1621 100644 --- a/Package.swift +++ b/Package.swift @@ -20,9 +20,9 @@ import PackageDescription var dependencies: [Package.Dependency] = [ - .package(url: "https://github.com/IBM-Swift/LoggerAPI.git", .upToNextMinor(from: "1.7.0")), + .package(url: "https://github.com/IBM-Swift/LoggerAPI.git", .upToNextMinor(from: "2.0.0")), .package(url: "https://github.com/IBM-Swift/BlueSocket.git", .upToNextMinor(from: "0.12.0")), - .package(url: "https://github.com/IBM-Swift/CCurl.git", .upToNextMinor(from: "0.4.0")), + .package(url: "https://github.com/IBM-Swift/CCurl.git", .upToNextMinor(from: "0.5.0")), .package(url: "https://github.com/IBM-Swift/BlueSSLService.git", .upToNextMinor(from: "0.12.0")) ] From 0fb42de8358eff560d2e6a7faf98ebeea32f343b Mon Sep 17 00:00:00 2001 From: ShihabMehboob Date: Thu, 22 Feb 2018 21:35:22 +0000 Subject: [PATCH 3/6] Fix logger not found --- Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index 36f1621..9db42be 100644 --- a/Package.swift +++ b/Package.swift @@ -20,7 +20,7 @@ import PackageDescription var dependencies: [Package.Dependency] = [ - .package(url: "https://github.com/IBM-Swift/LoggerAPI.git", .upToNextMinor(from: "2.0.0")), + .package(url: "https://github.com/IBM-Swift/LoggerAPI.git", .upToNextMajor(from: "1.7.0")), .package(url: "https://github.com/IBM-Swift/BlueSocket.git", .upToNextMinor(from: "0.12.0")), .package(url: "https://github.com/IBM-Swift/CCurl.git", .upToNextMinor(from: "0.5.0")), .package(url: "https://github.com/IBM-Swift/BlueSSLService.git", .upToNextMinor(from: "0.12.0")) From bbb53bc3e52b80740f4fc76f549868f4fdc5e801 Mon Sep 17 00:00:00 2001 From: David Jones Date: Fri, 23 Feb 2018 10:34:02 +0000 Subject: [PATCH 4/6] Revert whitespace change --- .swift-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.swift-version b/.swift-version index aa31e71..c4e41f9 100644 --- a/.swift-version +++ b/.swift-version @@ -1 +1 @@ -4.0.3 \ No newline at end of file +4.0.3 From 21846193c5362dfa6d90421591e84993039804b5 Mon Sep 17 00:00:00 2001 From: David Jones Date: Fri, 23 Feb 2018 10:43:59 +0000 Subject: [PATCH 5/6] Correct LoggerAPI dependency, update re-tagged CCurl --- Package.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Package.swift b/Package.swift index 9db42be..55a7bc5 100644 --- a/Package.swift +++ b/Package.swift @@ -20,9 +20,9 @@ import PackageDescription var dependencies: [Package.Dependency] = [ - .package(url: "https://github.com/IBM-Swift/LoggerAPI.git", .upToNextMajor(from: "1.7.0")), + .package(url: "https://github.com/IBM-Swift/LoggerAPI.git", from: "2.0.0"), .package(url: "https://github.com/IBM-Swift/BlueSocket.git", .upToNextMinor(from: "0.12.0")), - .package(url: "https://github.com/IBM-Swift/CCurl.git", .upToNextMinor(from: "0.5.0")), + .package(url: "https://github.com/IBM-Swift/CCurl.git", from: "1.0.0"), .package(url: "https://github.com/IBM-Swift/BlueSSLService.git", .upToNextMinor(from: "0.12.0")) ] From 070117299a1bd3a5a1960d1feec68dba88315d9e Mon Sep 17 00:00:00 2001 From: David Jones Date: Fri, 23 Feb 2018 15:38:43 +0000 Subject: [PATCH 6/6] Remove superfluous guard --- Sources/KituraNet/IncomingSocketProcessor.swift | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Sources/KituraNet/IncomingSocketProcessor.swift b/Sources/KituraNet/IncomingSocketProcessor.swift index 531dc43..d1abcf2 100644 --- a/Sources/KituraNet/IncomingSocketProcessor.swift +++ b/Sources/KituraNet/IncomingSocketProcessor.swift @@ -29,11 +29,7 @@ public protocol IncomingSocketProcessor: class { /// A back reference to the `IncomingSocketHandler` processing the socket that /// this `IncomingDataProcessor` is processing. - #if swift(>=4.1) - var handler: IncomingSocketHandler? { get set } - #else - weak var handler: IncomingSocketHandler? { get set } - #endif + var handler: IncomingSocketHandler? { get set } /// Process data read from the socket. ///