Compatibility with KituraNIO (#83)

Author: mamabusi

.travis.yml

@@ -10,33 +10,38 @@ matrix:
     - os: linux
       dist: trusty
       sudo: required
-      env: SWIFT_SNAPSHOT=4.0.3
-      env: TESTDB_NAME=testdb_1
+      env: SWIFT_SNAPSHOT=4.0.3 TESTDB_NAME=testdb_1
     - os: linux
       dist: trusty
       sudo: required
       env: TESTDB_NAME=testdb_2
     - os: linux
       dist: trusty
       sudo: required
-      env: SWIFT_SNAPSHOT=swift-4.2-DEVELOPMENT-SNAPSHOT-2018-06-19-a
-      env: TESTDB_NAME=testdb_3
+      env: SWIFT_SNAPSHOT=4.2 TESTDB_NAME=testdb_3
+    - os: linux
+      dist: trusty
+      sudo: required
+      env: SWIFT_SNAPSHOT=4.2 KITURA_NIO=1 TESTDB_NAME=testdb_4
     - os: osx
       osx_image: xcode9.2
       sudo: required
-      env: SWIFT_SNAPSHOT=4.0.3
-      env: TESTDB_NAME=testdb_4
+      env: SWIFT_SNAPSHOT=4.0.3 TESTDB_NAME=testdb_5
     - os: osx
       osx_image: xcode9.4
       sudo: required
-      env: TESTDB_NAME=testdb_5
+      env: TESTDB_NAME=testdb_6
+    - os: osx
+      osx_image: xcode10
+      sudo: required
+      env: SWIFT_SNAPSHOT=4.2 TESTDB_NAME=testdb_7
     - os: osx
-      osx_image: xcode9.4
+      osx_image: xcode10
       sudo: required
-      env: SWIFT_SNAPSHOT=swift-4.2-DEVELOPMENT-SNAPSHOT-2018-06-04-a
-      env: TESTDB_NAME=testdb_6
+      env: SWIFT_SNAPSHOT=4.2 KITURA_NIO=1 TESTDB_NAME=testdb_8
 
 before_install:
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update && brew install libressl ; fi
   - git clone https://github.com/IBM-Swift/Package-Builder.git
   - git clone -b master "https://$GITHUB_USER:$GITHUB_PWD@github.com/IBM-Swift/Kitura-TestingCredentials.git"
 

Package.swift

@@ -18,6 +18,15 @@
  **/
 
 import PackageDescription
+import Foundation
+
+var kituraNetPackage: Package.Dependency
+
+if ProcessInfo.processInfo.environment["KITURA_NIO"] != nil {
+    kituraNetPackage = .package(url: "https://github.com/IBM-Swift/Kitura-NIO.git", from: "1.0.0")
+} else {
+    kituraNetPackage = .package(url: "https://github.com/IBM-Swift/Kitura-net.git", from: "2.1.0")
+}
 
 let package = Package(
     name: "Kitura-CouchDB",
@@ -31,7 +40,7 @@ let package = Package(
         // Dependencies declare other packages that this package depends on.
         // .package(url: /* package url */, from: "1.0.0"),
         .package(url: "https://github.com/IBM-Swift/HeliumLogger.git", from: "1.7.0"),
-        .package(url: "https://github.com/IBM-Swift/Kitura-net.git", from: "2.1.0"),
+        kituraNetPackage,
         .package(url: "https://github.com/IBM-Swift/SwiftyJSON.git", from: "17.0.0"),
     ],
     targets: [

Tests/CouchDBTests/CouchDBTest.swift

@@ -21,6 +21,7 @@ import XCTest
     import Darwin
 #endif
 import Foundation
+import Dispatch
 
 @testable import CouchDB