Merge pull request #193 from bignerdranch/zwaldowski/swift-3_2

zwaldowski · web-flow · commit a89dd499192f · 2017-09-14T22:17:44.000-07:00
Swift 3.2 improvements
diff --git a/.fastlane/report.xml b/.fastlane/report.xml
diff --git a/.swift-version b/.swift-version
@@ -1 +1 @@
-3.1.1
+DEVELOPMENT-SNAPSHOT-2017-09-13-a
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,6 @@
 language: objective-c
 os: osx
-osx_image: xcode8.3
+osx_image: xcode9
 rvm:
   - 2.3.1
 install:
diff --git a/BNRDeferred.podspec b/BNRDeferred.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
   # ―――  Spec Metadata  ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
   s.name         = "BNRDeferred"
-  s.version      = "3.1.2"
+  s.version      = "3.2.0"
   s.summary      = "Work with values that haven't been determined yet."
 
   s.description  = <<-DESC
diff --git a/Configurations/Base.xcconfig b/Configurations/Base.xcconfig
@@ -18,7 +18,7 @@ TVOS_DEPLOYMENT_TARGET = 9.0
 ALWAYS_SEARCH_USER_PATHS = NO
 
 // Versioning
-CURRENT_PROJECT_VERSION = 3.1.2
+CURRENT_PROJECT_VERSION = 3.2.0
 VERSION_INFO_PREFIX =
 VERSIONING_SYSTEM = apple-generic
 
diff --git a/Gemfile b/Gemfile
@@ -1,3 +1,4 @@
 source "https://rubygems.org"
 
-gem "fastlane"
+gem 'fastlane'
+gem 'semantic'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -2,29 +2,29 @@ GEM
   remote: https://rubygems.org/
   specs:
     CFPropertyList (2.3.5)
-    addressable (2.5.1)
-      public_suffix (~> 2.0, >= 2.0.2)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
     babosa (1.0.2)
     claide (1.0.2)
     colored (1.2)
     colored2 (3.1.2)
     commander-fastlane (4.4.5)
       highline (~> 1.7.2)
-    declarative (0.0.9)
+    declarative (0.0.10)
     declarative-option (0.1.0)
     domain_name (0.5.20170404)
       unf (>= 0.0.5, < 1.0.0)
     dotenv (2.2.1)
-    excon (0.57.1)
-    faraday (0.12.2)
+    excon (0.59.0)
+    faraday (0.13.1)
       multipart-post (>= 1.2, < 3)
     faraday-cookie_jar (0.0.6)
       faraday (>= 0.7.4)
       http-cookie (~> 1.0.0)
-    faraday_middleware (0.11.0.1)
+    faraday_middleware (0.12.2)
       faraday (>= 0.7.4, < 1.0)
     fastimage (2.1.0)
-    fastlane (2.47.0)
+    fastlane (2.56.0)
       CFPropertyList (>= 2.3, < 3.0.0)
       addressable (>= 2.3, < 3.0.0)
       babosa (>= 1.0.2, < 2.0.0)
@@ -38,26 +38,27 @@ GEM
       faraday_middleware (~> 0.9)
       fastimage (>= 2.1.0, < 3.0.0)
       gh_inspector (>= 1.0.1, < 2.0.0)
-      google-api-client (>= 0.12.0, < 0.13.0)
+      google-api-client (>= 0.13.1, < 0.14.0)
       highline (>= 1.7.2, < 2.0.0)
       json (< 3.0.0)
       mini_magick (~> 4.5.1)
       multi_json
       multi_xml (~> 0.5)
       multipart-post (~> 2.0.0)
       plist (>= 3.1.0, < 4.0.0)
+      public_suffix (~> 2.0.0)
       rubyzip (>= 1.1.0, < 2.0.0)
       security (= 0.1.3)
       slack-notifier (>= 1.3, < 2.0.0)
       terminal-notifier (>= 1.6.2, < 2.0.0)
       terminal-table (>= 1.4.5, < 2.0.0)
       tty-screen (~> 0.5.0)
       word_wrap (~> 1.0.0)
-      xcodeproj (>= 1.4.4, < 2.0.0)
+      xcodeproj (>= 1.5.0, < 2.0.0)
       xcpretty (>= 0.2.4, < 1.0.0)
       xcpretty-travis-formatter (>= 0.0.3)
     gh_inspector (1.0.3)
-    google-api-client (0.12.0)
+    google-api-client (0.13.6)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (~> 0.5)
       httpclient (>= 2.8.1, < 3.0)
@@ -87,7 +88,7 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
     mini_magick (4.5.1)
-    multi_json (1.12.1)
+    multi_json (1.12.2)
     multi_xml (0.6.0)
     multipart-post (2.0.0)
     nanaimo (0.2.3)
@@ -98,10 +99,11 @@ GEM
       declarative (< 0.1.0)
       declarative-option (< 0.2.0)
       uber (< 0.2.0)
-    retriable (3.0.2)
+    retriable (3.1.1)
     rouge (2.0.7)
     rubyzip (1.2.1)
     security (0.1.3)
+    semantic (1.6.0)
     signet (0.7.3)
       addressable (~> 2.3)
       faraday (~> 0.9)
@@ -133,6 +135,7 @@ PLATFORMS
 
 DEPENDENCIES
   fastlane
+  semantic
 
 BUNDLED WITH
    1.14.6
diff --git a/Sources/Atomics/include/Atomics.h b/Sources/Atomics/include/Atomics.h
@@ -120,7 +120,7 @@ static inline void *_Nullable bnr_atomic_ptr_load(volatile bnr_atomic_ptr_t *_No
 
 OS_ALWAYS_INLINE
 static inline bool bnr_atomic_ptr_compare_and_swap(volatile bnr_atomic_ptr_t *_Nonnull target, void *_Nullable expected, void *_Nullable desired, bnr_atomic_memory_order_t order) {
-    return __c11_atomic_compare_exchange_strong(&target->value, &expected, desired, __ATOMIC_ACQ_REL, __ATOMIC_RELAXED);
+    return __c11_atomic_compare_exchange_strong(&target->value, &expected, desired, order, __ATOMIC_RELAXED);
 }
 
 OS_SWIFT_NAME(UnsafeAtomicBool)
diff --git a/Sources/Deferred/Deferred.swift b/Sources/Deferred/Deferred.swift
@@ -64,9 +64,9 @@ public final class Deferred<Value>: FutureProtocol, PromiseProtocol {
     }
 
     public func upon(_ executor: Executor, execute body: @escaping(Value) -> Void) {
-        if let queue = executor.underlyingQueue {
+        if let queue = executor as? DispatchQueue {
             return upon(queue, execute: body)
-        } else if let queue = executor as? DispatchQueue {
+        } else if let queue = executor.underlyingQueue {
             return upon(queue, execute: body)
         }
 
diff --git a/Sources/Deferred/Promise.swift b/Sources/Deferred/Promise.swift
@@ -57,3 +57,17 @@ extension PromiseProtocol {
         }
     }
 }
+
+#if swift(>=3.2)
+extension PromiseProtocol where Value == Void {
+    /// Determines the promised event.
+    ///
+    /// Filling a deferred event should usually be attempted only once.
+    ///
+    /// - returns: Whether the promise was fulfilled.
+    @discardableResult @available(swift 4)
+    func fill() -> Bool {
+        return fill(with: ())
+    }
+}
+#endif
diff --git a/Sources/Task/ExistentialTask.swift b/Sources/Task/ExistentialTask.swift
@@ -41,6 +41,7 @@ public final class Task<SuccessValue>: NSObject {
     ///
     /// If the task does not report progress, this progress is indeterminate,
     /// and becomes determinate and completed when the task is finished.
+    @objc dynamic
     public let progress: Progress
 
     /// Creates a task given a `future` and its `progress`.
diff --git a/Sources/Task/ResultPromise.swift b/Sources/Task/ResultPromise.swift
@@ -27,3 +27,13 @@ extension PromiseProtocol where Value: Either {
         return fill(with: Value(failure: error))
     }
 }
+
+#if swift(>=3.2)
+extension PromiseProtocol where Value: Either, Value.Right == Void {
+    /// Notes the completion of the event with a success.
+    @discardableResult @available(swift 4)
+    public func succeed() -> Bool {
+        return succeed(with: ())
+    }
+}
+#endif
diff --git a/Sources/Task/TaskResult.swift b/Sources/Task/TaskResult.swift
@@ -102,3 +102,15 @@ extension TaskResult: Either {
 private enum TaskResultInitializerError: Error {
     case invalidInput
 }
+
+#if swift(>=3.2)
+extension Task.Result where SuccessValue == Void {
+
+    /// Creates the success value.
+    @available(swift 4)
+    public init() {
+        self = .success(())
+    }
+
+}
+#endif
diff --git a/Tests/AllTestsCommon.swift b/Tests/AllTestsCommon.swift
@@ -56,25 +56,23 @@ func sleep(_ duration: DispatchTimeInterval) {
 #endif
 
 extension XCTestCase {
-    func waitForExpectations(file: StaticString = #file, line: UInt = #line) {
-        let timeout: Double = 10
+    func waitForExpectations(file: StaticString = #file, line: Int = #line) {
         #if os(macOS) || os(iOS) || os(watchOS) || os(tvOS)
-            waitForExpectations(timeout: timeout, handler: nil)
+            waitForExpectations(timeout: 10, handler: nil)
         #else
-            waitForExpectations(timeout: timeout, file: file, line: line, handler: nil)
+            waitForExpectations(timeout: 10, file: file, line: numericCast(line), handler: nil)
         #endif
     }
 
-    func waitForExpectationsShort(file: StaticString = #file, line: UInt = #line) {
-        let timeout: Double = 3
+    func waitForExpectationsShort(file: StaticString = #file, line: Int = #line) {
         #if os(macOS) || os(iOS) || os(watchOS) || os(tvOS)
-            waitForExpectations(timeout: timeout, handler: nil)
+            waitForExpectations(timeout: 3, handler: nil)
         #else
-            waitForExpectations(timeout: timeout, file: file, line: line, handler: nil)
+            waitForExpectations(timeout: 3, file: file, line: numericCast(line), handler: nil)
         #endif
     }
 
-    func afterDelay(upon queue: DispatchQueue = .main, execute body: @escaping() -> ()) {
+    func afterDelay(upon queue: DispatchQueue = .main, execute body: @escaping() -> Void) {
         queue.asyncAfter(deadline: .now() + 0.15, execute: body)
     }
 }
@@ -105,16 +103,16 @@ class CustomExecutorTestCase: XCTestCase {
         return CountingExecutor(owner: self)
     }
 
-    func assertExecutorCalled(_ times: Int, inFile file: StaticString = #file, atLine line: UInt = #line) {
-        XCTAssert(submitCount.withReadLock({ $0 == times }), "Executor was not called exactly \(times) times")
+    func assertExecutorCalled(_ times: Int, inFile file: StaticString = #file, atLine line: Int = #line) {
+        XCTAssert(submitCount.withReadLock({ $0 == times }), "Executor was not called exactly \(times) times", file: file, line: numericCast(line))
     }
 
-    func assertExecutorCalled(atLeast times: Int, inFile file: StaticString = #file, atLine line: UInt = #line) {
-        XCTAssert(submitCount.withReadLock({ $0 >= times }), "Executor was never called", file: file, line: line)
+    func assertExecutorCalled(atLeast times: Int, inFile file: StaticString = #file, atLine line: Int = #line) {
+        XCTAssert(submitCount.withReadLock({ $0 >= times }), "Executor was never called", file: file, line: numericCast(line))
     }
 }
 
-extension RandomAccessCollection {
+extension Collection {
 
     func random() -> Iterator.Element {
         precondition(!isEmpty, "Should not be called on empty collection")
diff --git a/Tests/DeferredTests/LockingTests.swift b/Tests/DeferredTests/LockingTests.swift
@@ -157,7 +157,7 @@ class LockingTests: XCTestCase {
         }
     }
 
-    func measureReadsSingleThread(lock: Locking, iterations: Int, file: StaticString = #file, line: UInt = #line) {
+    func measureReadsSingleThread(lock: Locking, iterations: Int, file: StaticString = #file, line: Int = #line) {
         let doNothing: () -> () = {}
         func body() {
             for _ in 0 ..< iterations {
@@ -168,11 +168,11 @@ class LockingTests: XCTestCase {
         #if os(macOS) || os(iOS) || os(watchOS) || os(tvOS)
             measure(body)
         #else
-            measure(file: file, line: line, block: body)
+            measure(file: file, line: numericCast(line), block: body)
         #endif
     }
 
-    func measureWritesSingleThread(lock: Locking, iterations: Int, file: StaticString = #file, line: UInt = #line) {
+    func measureWritesSingleThread(lock: Locking, iterations: Int, file: StaticString = #file, line: Int = #line) {
         let doNothing: () -> () = {}
         func body() {
             for _ in 0 ..< iterations {
@@ -183,7 +183,7 @@ class LockingTests: XCTestCase {
         #if os(macOS) || os(iOS) || os(watchOS) || os(tvOS)
             measure(body)
         #else
-            measure(file: file, line: line, block: body)
+            measure(file: file, line: numericCast(line), block: body)
         #endif
     }
 
@@ -215,7 +215,7 @@ class LockingTests: XCTestCase {
         measureWritesSingleThread(lock: nsLock, iterations: 250_000)
     }
 
-    func measure90PercentReads(lock: Locking, iterations: Int, numberOfThreads: Int = max(ProcessInfo.processInfo.processorCount, 2), file: StaticString = #file, line: UInt = #line) {
+    func measure90PercentReads(lock: Locking, iterations: Int, numberOfThreads: Int = max(ProcessInfo.processInfo.processorCount, 2), file: StaticString = #file, line: Int = #line) {
         let group = DispatchGroup()
         let queue = DispatchQueue(label: String(#function), attributes: .concurrent)
         func doNothing() {}
@@ -239,7 +239,7 @@ class LockingTests: XCTestCase {
         #if os(macOS) || os(iOS) || os(watchOS) || os(tvOS)
             measure(body)
         #else
-            measure(file: file, line: line, block: body)
+            measure(file: file, line: numericCast(line), block: body)
         #endif
     }
 
diff --git a/Tests/TaskTests/TaskTests.swift b/Tests/TaskTests/TaskTests.swift
@@ -213,12 +213,20 @@ class TaskTests: CustomExecutorTestCase {
 
         let task = Task<Int>(Deferred<Task<Int>.Result>(), progress: progress)
 
+        #if swift(>=3.2)
+        XCTAssertEqual(task.progress.fractionCompleted, 0, accuracy: 0.001)
+        #else
         XCTAssertEqualWithAccuracy(task.progress.fractionCompleted, 0, accuracy: 0.001)
+        #endif
         XCTAssertEqual(progress.userInfo[key] as? Bool, true)
         XCTAssert(task.progress.isCancellable)
 
         progress.completedUnitCount = 5
+        #if swift(>=3.2)
+        XCTAssertEqual(task.progress.fractionCompleted, 0.5, accuracy: 0.001)
+        #else
         XCTAssertEqualWithAccuracy(task.progress.fractionCompleted, 0.5, accuracy: 0.001)
+        #endif
     }
 
     func testTaskCreatedUnfilledIs100PercentCompleted() {
diff --git a/Tests/TaskTests/TaskTestsCommon.swift b/Tests/TaskTests/TaskTestsCommon.swift
@@ -15,14 +15,14 @@ import XCTest
 #endif
 
 extension XCTestCase {
-    func waitForTaskToComplete<T>(_ task: Task<T>, file: StaticString = #file, line: UInt = #line) -> Task<T>.Result {
+    func waitForTaskToComplete<T>(_ task: Task<T>, file: StaticString = #file, line: Int = #line) -> Task<T>.Result {
         let expectation = self.expectation(description: "task completed")
         var result: Task<T>.Result?
         task.upon(.main) { [weak expectation] in
             result = $0
             expectation?.fulfill()
         }
-        waitForExpectations(file: file, line: line)
+        waitForExpectations(file: file, line: numericCast(line))
 
         return result!
     }

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-3.1.1`
	`1`	`+DEVELOPMENT-SNAPSHOT-2017-09-13-a`
Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ static inline void _Nullable bnr_atomic_ptr_load(volatile bnr_atomic_ptr_t _No`
`120`	`120`
`121`	`121`	`OS_ALWAYS_INLINE`
`122`	`122`	`static inline bool bnr_atomic_ptr_compare_and_swap(volatile bnr_atomic_ptr_t _Nonnull target, void _Nullable expected, void *_Nullable desired, bnr_atomic_memory_order_t order) {`
`123`		`- return __c11_atomic_compare_exchange_strong(&target->value, &expected, desired, __ATOMIC_ACQ_REL, __ATOMIC_RELAXED);`
	`123`	`+ return __c11_atomic_compare_exchange_strong(&target->value, &expected, desired, order, __ATOMIC_RELAXED);`
`124`	`124`	`}`
`125`	`125`
`126`	`126`	`OS_SWIFT_NAME(UnsafeAtomicBool)`
Original file line number	Diff line number	Diff line change
`@@ -64,9 +64,9 @@ public final class Deferred<Value>: FutureProtocol, PromiseProtocol {`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`public func upon(_ executor: Executor, execute body: @escaping(Value) -> Void) {`
`67`		`- if let queue = executor.underlyingQueue {`
	`67`	`+ if let queue = executor as? DispatchQueue {`
`68`	`68`	`return upon(queue, execute: body)`
`69`		`- } else if let queue = executor as? DispatchQueue {`
	`69`	`+ } else if let queue = executor.underlyingQueue {`
`70`	`70`	`return upon(queue, execute: body)`
`71`	`71`	`}`
`72`	`72`
Original file line number	Diff line number	Diff line change
`@@ -57,3 +57,17 @@ extension PromiseProtocol {`
`57`	`57`	`}`
`58`	`58`	`}`
`59`	`59`	`}`
	`60`	`+`
	`61`	`+#if swift(>=3.2)`
	`62`	`+extension PromiseProtocol where Value == Void {`
	`63`	`+ /// Determines the promised event.`
	`64`	`+ ///`
	`65`	`+ /// Filling a deferred event should usually be attempted only once.`
	`66`	`+ ///`
	`67`	`+ /// - returns: Whether the promise was fulfilled.`
	`68`	`+ @discardableResult @available(swift 4)`
	`69`	`+ func fill() -> Bool {`
	`70`	`+ return fill(with: ())`
	`71`	`+ }`
	`72`	`+}`
	`73`	`+#endif`