Merge pull request #1223 from mxcl/v7-rc

--warnings; reduce deploy targets as poss

Author: mxcl

Package.swift

@@ -4,9 +4,9 @@ import PackageDescription
 
 let pkg = Package(name: "PromiseKit")
 pkg.platforms = [
-    .macOS(.v10_12), //FIXME strictly 10.10 (only tests need 10.12)
-    .iOS(.v10),      //FIXME strictly 8.0
-    .tvOS(.v10),     //FIXME strictly 9.0
+    .macOS(.v10_10),
+    .iOS(.v10),       //FIXME strictly 8.0, but Tests require 10
+    .tvOS(.v10),      //FIXME strictly 9.0, but Tests require 10
     .watchOS(.v3)
 ]
 pkg.swiftLanguageVersions = [.v5]

Sources/PMKCloudKit/CKContainer+Promise.swift

@@ -32,6 +32,7 @@ public extension CKContainer {
     }
 
     /// Retrieves information about a single user based on the ID of the corresponding user record.
+    @available(macOS 10.12, iOS 10, tvOS 10, *)
     func discoverUserIdentity(withUserRecordID recordID: CKRecord.ID) -> Promise<CKUserIdentity> {
         return Promise { discoverUserIdentity(withUserRecordID: recordID, completionHandler: $0.resolve) }
     }
@@ -43,6 +44,7 @@ public extension CKContainer {
 }
 
 #if !os(tvOS)
+@available(macOS 10.12, iOS 10, tvOS 10, *)
 public extension CKContainer {
     func discoverAllIdentities() -> Promise<[CKUserIdentity]> {
         return Promise { discoverAllIdentities(completionHandler: $0.resolve) }

Tests/Cancel/CatchableTests.swift

@@ -470,11 +470,12 @@ extension CatchableTests {
     func testCatchOnly_Type_Ignored() {
         let x = expectation(description: #file + #function)
 
-        enum Foo: Swift.Error {}
+        enum Foo: Swift.Error {
+            case a
+        }
 
         Promise<Int>(error: Error.dummy).cancellize().catch(only: Foo.self) { _ in
             XCTFail()
-            x.fulfill()
         }.catch { _ in
             x.fulfill()
         }
@@ -647,10 +648,12 @@ extension CatchableTests {
     func testRecoverOnly_Type_PatternMatch() {
         let x = expectation(description: #file + #function)
 
-        enum Foo: Swift.Error {}
+        enum Foo: Swift.Error {
+            case a
+        }
 
         Promise<Int>(error: Error.dummy).cancellize().recover(only: Foo.self) { _ in
-            return Promise.value(1)
+            Promise.value(1)
         }.done { _ in
             XCTFail()
             x.fulfill()

Tests/Core/CatchableTests.swift

@@ -334,11 +334,12 @@ extension CatchableTests {
     func testCatchOnly_Type_Ignored() {
         let x = expectation(description: #file + #function)
 
-        enum Foo: Swift.Error {}
+        enum Foo: Swift.Error {
+            case a
+        }
 
         Promise<Int>(error: Error.dummy).catch(only: Foo.self) { _ in
             XCTFail()
-            x.fulfill()
         }.catch { _ in
             x.fulfill()
         }
@@ -507,10 +508,12 @@ extension CatchableTests {
     func testRecoverOnly_Type_PatternMatch() {
         let x = expectation(description: #file + #function)
 
-        enum Foo: Swift.Error {}
+        enum Foo: Swift.Error {
+            case a
+        }
 
         Promise<Int>(error: Error.dummy).recover(only: Foo.self) { _ in
-            return Promise.value(1)
+            Promise.value(1)
         }.done { _ in
             XCTFail()
             x.fulfill()

Tests/PMKCoreLocation/CLGeocoderTests.swift

@@ -20,7 +20,7 @@ class CLGeocoderTests: XCTestCase {
         MockGeocoder().reverseGeocode(location: CLLocation()).done { x in
             XCTAssertEqual(x, [dummyPlacemark])
             ex.fulfill()
-        }
+        }.cauterize()
         waitForExpectations(timeout: 1)
     }
 
@@ -37,7 +37,7 @@ class CLGeocoderTests: XCTestCase {
         MockGeocoder().geocode([:]).done { x in
             XCTAssertEqual(x, [dummyPlacemark])
             ex.fulfill()
-        }
+        }.cauterize()
         waitForExpectations(timeout: 1)
     }
 
@@ -54,7 +54,7 @@ class CLGeocoderTests: XCTestCase {
         MockGeocoder().geocode("").done { x in
             XCTAssertEqual(x, [dummyPlacemark])
             ex.fulfill()
-        }
+        }.cauterize()
         waitForExpectations(timeout: 1)
     }
 
@@ -74,7 +74,7 @@ class CLGeocoderTests: XCTestCase {
         MockGeocoder().geocodePostalAddress(CNPostalAddress()).done { x in
             XCTAssertEqual(x, [dummyPlacemark])
             ex.fulfill()
-        }
+        }.cauterize()
         waitForExpectations(timeout: 1)
     }
 
@@ -93,7 +93,7 @@ class CLGeocoderTests: XCTestCase {
         MockGeocoder().geocodePostalAddress(CNPostalAddress(), preferredLocale: nil).done { x in
             XCTAssertEqual(x, [dummyPlacemark])
             ex.fulfill()
-        }
+        }.cauterize()
         waitForExpectations(timeout: 1)
     }
 
@@ -112,7 +112,7 @@ class CLGeocoderTests: XCTestCase {
         MockGeocoder().reverseGeocode(location: CLLocation(), preferredLocale: nil).done { x in
             XCTAssertEqual(x, [dummyPlacemark])
             ex.fulfill()
-        }
+        }.cauterize()
         waitForExpectations(timeout: 1)
     }
 #endif

Tests/PMKCoreLocation/CLLocationManagerTests.swift

@@ -14,7 +14,7 @@ class Test_CLLocationManager_Swift: XCTestCase {
                 CLLocationManager.requestLocation().done { x in
                     XCTAssertEqual(x, dummy)
                     ex.fulfill()
-                }
+                }.cauterize()
 
                 waitForExpectations(timeout: 1)
             }
@@ -31,7 +31,7 @@ class Test_CLLocationManager_Swift: XCTestCase {
                 CLLocationManager.requestLocation(satisfying: block).done({ locations in
                     locations.forEach { XCTAssert(block($0) == true, "Block should be successful for returned values") }
                     ex.fulfill()
-                })
+                }).cauterize()
                 waitForExpectations(timeout: 1)
             }
         }

Tests/PMKHomeKit/HMAccessoryBrowserTests.swift

@@ -23,7 +23,7 @@ class HMAccessoryBrowserTests: XCTestCase {
             .done { accessories in
                 XCTAssertEqual(accessories.count, 1)
                 ex.fulfill()
-            }
+            }.cauterize()
 
             waitForExpectations(timeout: 1, handler: nil)
         }

Tests/PMKMapKit/TestMapKit.swift

@@ -1,3 +1,5 @@
+#if !os(watchOS)
+
 import PromiseKit
 import PMKMapKit
 import MapKit
@@ -61,3 +63,5 @@ class Test_MKSnapshotter_Swift: XCTestCase {
         waitForExpectations(timeout: 1, handler: nil)
     }
 }
+
+#endif