Merge pull request #242 from IBM-Swift/issue.swift41-2

Support Swift 4.1

.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

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", 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", from: "1.0.0"),
  .package(url: "https://github.com/IBM-Swift/BlueSSLService.git", .upToNextMinor(from: "0.12.0"))
 ]
 

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

Sources/KituraNet/IncomingSocketProcessor.swift

@@ -29,7 +29,7 @@ public protocol IncomingSocketProcessor: class {
 
  /// A back reference to the `IncomingSocketHandler` processing the socket that
  /// this `IncomingDataProcessor` is processing.
- weak var handler: IncomingSocketHandler? { get set }
+ var handler: IncomingSocketHandler? { get set }
 
  /// Process data read from the socket.
  ///