Merge pull request #1240 from mxcl/ci/macos-11

[ci] can has macos-11

Author: mxcl

Diff for: .github/workflows/ci.yml

@@ -20,10 +20,11 @@ jobs:
     strategy:
       matrix:
         swift:
-        - 5.3
-        - 5.4-focal  # Swift 5.4 requires llvm-cov v11
+        - swift:5.3
+        - swift:5.4
+        - swiftlang/swift:nightly-5.5
     container:
-      image: swift:${{ matrix.swift }}
+      image: ${{ matrix.swift }}
     steps:
     - uses: actions/checkout@v2
     - run: swift test --enable-code-coverage --parallel --enable-test-discovery
@@ -44,7 +45,7 @@ jobs:
         file: ./info.lcov
 
   apple:
-    runs-on: macos-latest
+    runs-on: ${{ matrix.swift == '5.3' && 'macos-10.15' || 'macos-11' }}
     strategy:
       matrix:
         platform:
@@ -55,6 +56,7 @@ jobs:
         swift:
           - 5.3
           - 5.4
+          - 5.5
     steps:
     - uses: actions/checkout@v2
     - run: |
@@ -68,5 +70,4 @@ jobs:
         platform: ${{ matrix.platform }}
         code-coverage: true
         warnings-as-errors: true
-      continue-on-error: ${{ matrix.swift == '5.4' }}
     - uses: codecov/codecov-action@v1

Diff for: Sources/PMKCloudKit/CKContainer+Promise.swift

@@ -22,15 +22,26 @@ public extension CKContainer {
     }
 
     /// Requests the specified permission from the user asynchronously.
+#if swift(<5.5)
     func requestApplicationPermission(_ applicationPermissions: CKContainer_Application_Permissions) -> Promise<CKContainer_Application_PermissionStatus> {
         return Promise { requestApplicationPermission(applicationPermissions, completionHandler: $0.resolve) }
     }
+#else
+    func requestApplicationPermission(_ applicationPermissions: CKContainer.ApplicationPermissions) -> Promise<CKContainer.ApplicationPermissionStatus> {
+        return Promise { requestApplicationPermission(applicationPermissions, completionHandler: $0.resolve) }
+    }
+#endif
 
     /// Checks the status of the specified permission asynchronously.
+#if swift(<5.5)
     func status(forApplicationPermission applicationPermissions: CKContainer_Application_Permissions) -> Promise<CKContainer_Application_PermissionStatus> {
         return Promise { status(forApplicationPermission: applicationPermissions, completionHandler: $0.resolve) }
     }
-
+#else
+    func status(forApplicationPermission applicationPermissions: CKContainer.ApplicationPermissions) -> Promise<CKContainer.ApplicationPermissionStatus> {
+        return Promise { status(forApplicationPermission: applicationPermissions, completionHandler: $0.resolve) }
+    }
+#endif
     /// 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> {

Diff for: Tests/Core/ThenableTests.swift

@@ -84,8 +84,11 @@ class ThenableTests: XCTestCase {
         enum E: Error { case dummy }
 
         let ex = expectation(description: "")
-        Promise(error: E.dummy).compactMap {
-            Int($0)
+
+        let p = Promise<Int>(error: E.dummy)
+
+        p.compactMap { (x: Int) -> Int? in
+            Int(x)
         }.catch {
             if case E.dummy = $0 {} else {
                 XCTFail()

Diff for: Tests/PMKFoundation/TestNSURLSession.swift

@@ -1,4 +1,4 @@
-#if !os(Linux)
+#if !os(Linux) && !os(watchOS)
 
 import OHHTTPStubsSwift
 import PMKFoundation