Merge pull request #621 from Quick/7.x-pr619

[7.x] Fix Swift 4.2 compatibility on Linux

Author: ikesyo

.travis.yml

@@ -26,11 +26,17 @@ matrix:
     - os: osx
       env: TYPE=macos
       osx_image: xcode9.4
+    - os: osx
+      env: TYPE=macos
+      osx_image: xcode10.1
     - os: osx
       env: TYPE=swiftpm
     - os: osx
       env: TYPE=swiftpm
       osx_image: xcode9
+    - os: osx
+      env: TYPE=swiftpm
+      osx_image: xcode10.1
     - os: linux
       dist: trusty
       sudo: required
@@ -42,9 +48,33 @@ matrix:
       sudo: required
       env:
         - TYPE=swiftpm
-        - SWIFT_VERSION=4.0.2
+        - SWIFT_VERSION=4.0.3
+      install:
+        - eval "$(curl -sL https://gist.githubusercontent.com/kylef/5c0475ff02b7c7671d2a/raw/9f442512a46d7a2af7b850d65a7e9bd31edfb09b/swiftenv-install.sh)"
+    - os: linux
+      dist: trusty
+      sudo: required
+      env:
+        - TYPE=swiftpm
+        - SWIFT_VERSION=4.1.3
+      install:
+        - eval "$(curl -sL https://gist.githubusercontent.com/kylef/5c0475ff02b7c7671d2a/raw/9f442512a46d7a2af7b850d65a7e9bd31edfb09b/swiftenv-install.sh)"
+    - os: linux
+      dist: trusty
+      sudo: required
+      env:
+        - TYPE=swiftpm
+        - SWIFT_VERSION=4.2.1
       install:
         - eval "$(curl -sL https://gist.githubusercontent.com/kylef/5c0475ff02b7c7671d2a/raw/9f442512a46d7a2af7b850d65a7e9bd31edfb09b/swiftenv-install.sh)"
+#     - os: linux
+#       dist: trusty
+#       sudo: required
+#       env:
+#         - TYPE=swiftpm
+#         - SWIFT_VERSION=5.0-DEVELOPMENT-SNAPSHOT-2019-01-13-a
+#       install:
+#         - eval "$(curl -sL https://gist.githubusercontent.com/kylef/5c0475ff02b7c7671d2a/raw/9f442512a46d7a2af7b850d65a7e9bd31edfb09b/swiftenv-install.sh)"
 install:
   - if [[ "$TYPE" == "podspec" ]]; then sudo gem install bundler; bundle install; fi
 script:

Sources/Nimble/Adapters/NimbleEnvironment.swift

@@ -3,7 +3,7 @@ import Foundation
 
 /// "Global" state of Nimble is stored here. Only DSL functions should access / be aware of this
 /// class' existence
-internal class NimbleEnvironment {
+internal class NimbleEnvironment: NSObject {
     static var activeInstance: NimbleEnvironment {
         get {
             let env = Thread.current.threadDictionary["NimbleEnvironment"]
@@ -29,7 +29,7 @@ internal class NimbleEnvironment {
     var suppressTVOSAssertionWarning: Bool = false
     var awaiter: Awaiter
 
-    init() {
+    override init() {
         let timeoutQueue: DispatchQueue
         if #available(OSX 10.10, *) {
             timeoutQueue = DispatchQueue.global(qos: .userInitiated)
@@ -40,6 +40,9 @@ internal class NimbleEnvironment {
         awaiter = Awaiter(
             waitLock: AssertionWaitLock(),
             asyncQueue: .main,
-            timeoutQueue: timeoutQueue)
+            timeoutQueue: timeoutQueue
+        )
+
+        super.init()
     }
 }

Sources/Nimble/Matchers/BeIdenticalTo.swift

@@ -5,14 +5,38 @@ import Foundation
 public func beIdenticalTo(_ expected: Any?) -> Predicate<Any> {
     return Predicate.define { actualExpression in
         #if os(Linux)
-            let actual = try actualExpression.evaluate() as? AnyObject
+            #if swift(>=4.0)
+                #if !swift(>=4.1.50)
+                    let actual = try actualExpression.evaluate() as? AnyObject
+                #else
+                    let actual = try actualExpression.evaluate() as AnyObject?
+                #endif
+            #else
+                #if !swift(>=3.4)
+                    let actual = try actualExpression.evaluate() as? AnyObject
+                #else
+                    let actual = try actualExpression.evaluate() as AnyObject?
+                #endif
+            #endif
         #else
             let actual = try actualExpression.evaluate() as AnyObject?
         #endif
 
         let bool: Bool
         #if os(Linux)
-            bool = actual === (expected as? AnyObject) && actual !== nil
+            #if swift(>=4.0)
+                #if !swift(>=4.1.50)
+                    bool = actual === (expected as? AnyObject) && actual !== nil
+                #else
+                    bool = actual === (expected as AnyObject?) && actual !== nil
+                #endif
+            #else
+                #if !swift(>=3.4)
+                    bool = actual === (expected as? AnyObject) && actual !== nil
+                #else
+                    bool = actual === (expected as AnyObject?) && actual !== nil
+                #endif
+            #endif
         #else
             bool = actual === (expected as AnyObject?) && actual !== nil
         #endif

Sources/Nimble/Utils/Await.swift

@@ -263,7 +263,7 @@ internal class AwaitPromiseBuilder<T> {
             self.trigger.timeoutSource.resume()
             while self.promise.asyncResult.isIncomplete() {
                 // Stopping the run loop does not work unless we run only 1 mode
-                #if swift(>=4.2)
+                #if swift(>=4.2) && (os(macOS) || os(iOS) || os(tvOS))
                 _ = RunLoop.current.run(mode: .default, before: .distantFuture)
                 #else
                 _ = RunLoop.current.run(mode: .defaultRunLoopMode, before: .distantFuture)

Sources/Nimble/Utils/Stringers.swift

@@ -3,7 +3,19 @@ import Foundation
 internal func identityAsString(_ value: Any?) -> String {
     let anyObject: AnyObject?
 #if os(Linux)
-    anyObject = value as? AnyObject
+    #if swift(>=4.0)
+        #if !swift(>=4.1.50)
+            anyObject = value as? AnyObject
+        #else
+            anyObject = value as AnyObject?
+        #endif
+    #else
+        #if !swift(>=3.4)
+            anyObject = value as? AnyObject
+        #else
+            anyObject = value as AnyObject?
+        #endif
+    #endif
 #else
     anyObject = value as AnyObject?
 #endif

test

@@ -80,7 +80,7 @@ function test_podspec {
 
 function test_swiftpm {
     if [ -d .build ]; then
-        run swift build --clean
+        run swift build --clean || swift package clean
     fi
     run swift build && swift test
 }