Skip to content

Commit 6f47da1

Browse files
committed
Fix Swift 4.2 compatibility on Linux
1 parent 8a5e6b8 commit 6f47da1

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

Sources/Nimble/Matchers/BeIdenticalTo.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ import Foundation
44
/// as the expected instance.
55
public func beIdenticalTo(_ expected: Any?) -> Predicate<Any> {
66
return Predicate.define { actualExpression in
7-
#if os(Linux)
7+
#if os(Linux) && !swift(>=4.1.50)
88
let actual = try actualExpression.evaluate() as? AnyObject
99
#else
1010
let actual = try actualExpression.evaluate() as AnyObject?
1111
#endif
1212

1313
let bool: Bool
14-
#if os(Linux)
14+
#if os(Linux) && !swift(>=4.1.50)
1515
bool = actual === (expected as? AnyObject) && actual !== nil
1616
#else
1717
bool = actual === (expected as AnyObject?) && actual !== nil

Sources/Nimble/Utils/Await.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ internal class AwaitPromiseBuilder<T> {
261261
self.trigger.timeoutSource.resume()
262262
while self.promise.asyncResult.isIncomplete() {
263263
// Stopping the run loop does not work unless we run only 1 mode
264-
#if swift(>=4.2)
264+
#if swift(>=4.2) && (os(macOS) || os(iOS) || os(tvOS))
265265
_ = RunLoop.current.run(mode: .default, before: .distantFuture)
266266
#else
267267
_ = RunLoop.current.run(mode: .defaultRunLoopMode, before: .distantFuture)

Sources/Nimble/Utils/Stringers.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import Foundation
22

33
internal func identityAsString(_ value: Any?) -> String {
44
let anyObject: AnyObject?
5-
#if os(Linux)
5+
#if os(Linux) && !swift(>=4.1.50)
66
anyObject = value as? AnyObject
77
#else
88
anyObject = value as AnyObject?

test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ function test_podspec {
8484

8585
function test_swiftpm {
8686
if [ -d .build ]; then
87-
run swift build --clean
87+
run swift package clean
8888
fi
8989
run swift build && swift test
9090
}

0 commit comments

Comments
 (0)