Skip to content

Commit 81fdad9

Browse files
committed
[ci] can has macos-11
1 parent f7a8f2a commit 81fdad9

2 files changed

Lines changed: 18 additions & 6 deletions

File tree

.github/workflows/ci.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,11 @@ jobs:
2020
strategy:
2121
matrix:
2222
swift:
23-
- 5.3
24-
- 5.4-focal # Swift 5.4 requires llvm-cov v11
23+
- swift:5.3
24+
- swift:5.4
25+
- swiftlang/swift:nightly-5.5
2526
container:
26-
image: swift:${{ matrix.swift }}
27+
image: ${{ matrix.swift }}
2728
steps:
2829
- uses: actions/checkout@v2
2930
- run: swift test --enable-code-coverage --parallel --enable-test-discovery
@@ -44,7 +45,7 @@ jobs:
4445
file: ./info.lcov
4546

4647
apple:
47-
runs-on: macos-latest
48+
runs-on: ${{ matrix.swift == '5.3' && 'macos-10.15' || 'macos-11' }}
4849
strategy:
4950
matrix:
5051
platform:
@@ -55,6 +56,7 @@ jobs:
5556
swift:
5657
- 5.3
5758
- 5.4
59+
- 5.5
5860
steps:
5961
- uses: actions/checkout@v2
6062
- run: |
@@ -68,5 +70,4 @@ jobs:
6870
platform: ${{ matrix.platform }}
6971
code-coverage: true
7072
warnings-as-errors: true
71-
continue-on-error: ${{ matrix.swift == '5.4' }}
7273
- uses: codecov/codecov-action@v1

Sources/PMKCloudKit/CKContainer+Promise.swift

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,26 @@ public extension CKContainer {
2222
}
2323

2424
/// Requests the specified permission from the user asynchronously.
25+
#if swift(<5.5)
2526
func requestApplicationPermission(_ applicationPermissions: CKContainer_Application_Permissions) -> Promise<CKContainer_Application_PermissionStatus> {
2627
return Promise { requestApplicationPermission(applicationPermissions, completionHandler: $0.resolve) }
2728
}
29+
#else
30+
func requestApplicationPermission(_ applicationPermissions: CKContainer.ApplicationPermissions) -> Promise<CKContainer.ApplicationPermissionStatus> {
31+
return Promise { requestApplicationPermission(applicationPermissions, completionHandler: $0.resolve) }
32+
}
33+
#endif
2834

2935
/// Checks the status of the specified permission asynchronously.
36+
#if swift(<5.5)
3037
func status(forApplicationPermission applicationPermissions: CKContainer_Application_Permissions) -> Promise<CKContainer_Application_PermissionStatus> {
3138
return Promise { status(forApplicationPermission: applicationPermissions, completionHandler: $0.resolve) }
3239
}
33-
40+
#else
41+
func status(forApplicationPermission applicationPermissions: CKContainer.ApplicationPermissions) -> Promise<CKContainer.ApplicationPermissionStatus> {
42+
return Promise { status(forApplicationPermission: applicationPermissions, completionHandler: $0.resolve) }
43+
}
44+
#endif
3445
/// Retrieves information about a single user based on the ID of the corresponding user record.
3546
@available(macOS 10.12, iOS 10, tvOS 10, *)
3647
func discoverUserIdentity(withUserRecordID recordID: CKRecord.ID) -> Promise<CKUserIdentity> {

0 commit comments

Comments
 (0)