Merge pull request #51 from IBM-Swift/swift5

Support Swift 5

.swift-version

@@ -1 +1 @@
-4.2.3
+5.0

.travis.yml

@@ -25,30 +25,34 @@ matrix:
       dist: xenial
       sudo: required
       services: docker
-      env: DOCKER_IMAGE=swift:4.2.3
+      env: DOCKER_IMAGE=swift:4.2.4 SWIFT_SNAPSHOT=4.2.4
     - os: linux
       dist: xenial
       sudo: required
       services: docker
-      env: DOCKER_IMAGE=swift:4.2.3 SWIFT_SNAPSHOT=$SWIFT_DEVELOPMENT_SNAPSHOT
+      env: DOCKER_IMAGE=swift:5.0-xenial
     - os: linux
       dist: xenial
       sudo: required
       services: docker
-      env: DOCKER_IMAGE=ubuntu:18.04
+      env: DOCKER_IMAGE=swift:5.0 SWIFT_SNAPSHOT=$SWIFT_DEVELOPMENT_SNAPSHOT
     - os: osx
       osx_image: xcode9.2
       sudo: required
       env: SWIFT_SNAPSHOT=4.0.3
     - os: osx
       osx_image: xcode9.4
       sudo: required
-      env: SWIFT_SNAPSHOT=4.1.2 JAZZY_ELIGIBLE=true
+      env: SWIFT_SNAPSHOT=4.1.2
     - os: osx
       osx_image: xcode10.1
       sudo: required
+      env: SWIFT_SNAPSHOT=4.2.1 JAZZY_ELIGIBLE=true
     - os: osx
-      osx_image: xcode10.1
+      osx_image: xcode10.2
+      sudo: required
+    - os: osx
+      osx_image: xcode10.2
       sudo: required
       env: SWIFT_SNAPSHOT=$SWIFT_DEVELOPMENT_SNAPSHOT
 

Package.swift

@@ -1,8 +1,8 @@
-// swift-tools-version:4.0
+// swift-tools-version:5.0
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 /**
- * Copyright IBM Corporation 2016, 2017
+ * Copyright IBM Corporation 2016-2019
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Package@swift-4.swift

@@ -0,0 +1,43 @@
+// swift-tools-version:4.0
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+
+/**
+ * Copyright IBM Corporation 2016, 2017
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+import PackageDescription
+
+let package = Package(
+    name: "CircuitBreaker",
+    products: [
+      .library(
+        name: "CircuitBreaker",
+        targets: ["CircuitBreaker"]
+      )
+    ],
+    dependencies: [
+        .package(url: "https://github.com/IBM-Swift/LoggerAPI.git", .upToNextMajor(from: "1.0.0"))
+    ],
+    targets: [
+      .target(
+        name: "CircuitBreaker",
+        dependencies: ["LoggerAPI"]
+      ),
+      .testTarget(
+        name: "CircuitBreakerTests",
+        dependencies: ["CircuitBreaker"]
+      )
+    ]
+)

Tests/CircuitBreakerTests/CircuitBreakerTests.swift

@@ -125,6 +125,10 @@ class CircuitBreakerTests: XCTestCase {
   func time(milliseconds: Int) {
     #if os(Linux)
     usleep(UInt32(milliseconds * 1000))
+    #elseif swift(>=4.2)
+    RunLoop.current.run(mode: RunLoop.Mode.default, before: Date(timeIntervalSinceNow: 0.001))
+    let time: Double = Double(milliseconds) / 1000
+    RunLoop.current.run(mode: RunLoop.Mode.default, before: Date(timeIntervalSinceNow: time))
     #else
     RunLoop.current.run(mode: .defaultRunLoopMode, before: Date(timeIntervalSinceNow: 0.001))
     let time: Double = Double(milliseconds) / 1000
@@ -330,8 +334,8 @@ class CircuitBreakerTests: XCTestCase {
     let expectation1 = expectation(description: "Breaker will be closed after successful bulkhead request in halfopen state.")
 
     func testHalfOpen(invocation: Invocation<Void, Void>) {
-      expectation1.fulfill()
       invocation.notifySuccess()
+      expectation1.fulfill()
     }
 
     let breaker = CircuitBreaker(name: "Test", bulkhead: 3, command: testHalfOpen, fallback: dummyFallback)