Merge pull request #24 from ibm-bluemix-mobile-services/development

Update to Swift 4 and Kitura-net 2.0

.swift-version

@@ -1 +1 @@
-3.1.1
+4.0

.travis.yml

@@ -7,6 +7,7 @@ language: generic
 env:
   global:
   - SWIFT_VERSION=3.1.1
+  - SWIFT_VERSION=4.0.3
 
 notifications:
   email:
@@ -17,7 +18,7 @@ sudo: required
 
 dist: trusty
 
-osx_image: xcode8.3
+osx_image: xcode9.2
 
 before_install:
     - rvm install 2.4.0
@@ -34,8 +35,6 @@ install:
   - git --version
 
 script:
-  - swift build --clean # clean built artifacts if present
-  - swift package fetch # clones all dependencies
   - swift build # build project
   - swift test # run tests
 

Package@swift-4.swift

@@ -0,0 +1,22 @@
+// swift-tools-version:4.0
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+
+import PackageDescription
+
+let package = Package(
+    name: "SimpleHttpClient",
+    products: [
+        // Products define the executables and libraries produced by a package, and make them visible to other packages.
+        .library(name: "SimpleHttpClient", targets: ["SimpleHttpClient"]),
+    ],
+    dependencies:[
+        .package(url: "https://github.com/ibm-bluemix-mobile-services/bluemix-simple-logger-swift.git", .upToNextMinor(from: "0.5.0")),
+        .package(url: "https://github.com/IBM-Swift/Kitura-net.git", .upToNextMinor(from: "2.0.0")),
+    ],
+    targets: [
+        // Targets are the basic building blocks of a package. A target defines a module or a test suite.
+        // Targets can depend on other targets in this package, and on products in packages which this package depends on.
+        .target(name: "SimpleHttpClient", dependencies: ["KituraNet", "SimpleLogger"]),
+        .testTarget(name: "SimpleHttpClientTests", dependencies: ["SimpleHttpClient"]),
+    ]
+)

Sources/HttpClient.swift → Sources/SimpleHttpClient/HttpClient.swift

@@ -18,7 +18,7 @@ import KituraNet
 /// An alias for a network request completion handler, receives back error, status, headers and data
 public typealias NetworkRequestCompletionHandler = (_ error:HttpError?, _ status:Int?, _ headers: [String:String]?, _ data:Data?) -> Void
 
-internal let NOOPNetworkRequestCompletionHandler:NetworkRequestCompletionHandler = {(a,b,c,d)->Void in}
+public let NOOPNetworkRequestCompletionHandler:NetworkRequestCompletionHandler = {(a,b,c,d)->Void in}
 
 /// Use HttpClient to make Http requests
 public class HttpClient{