Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add compatibility shim for flatMap rename
In Swift 4.1, the version of `flatMap` with the shape `[T] -> (T -> U?) -> [U]` has been renamed to `compactMap`. By adding this compatibility shim for Swift versions < 4.1, we can use the new spelling without losing any backwards compatibility on older Swift versions. We're also not exporting this, so it has no affect on consuming code. However, apps that build Valet as a part of their app with Swift 4.1+ will no longer see warnings about `flatMap` being deprecated. This replaces the old inline ifdef that covered this same check.
- Loading branch information
Showing
3 changed files
with
37 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| // | ||
| // SwiftCompatibility.swift | ||
| // Valet | ||
| // | ||
| // Created by Gordon Fontenot on 7/26/18. | ||
| // Copyright © 2017 Square, Inc. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| // | ||
|
|
||
| #if !swift(>=4.1) | ||
|
|
||
| extension Sequence { | ||
| func compactMap<T>(_ transform: (Element) throws -> T?) rethrows -> [T] { | ||
| return try flatMap(transform) | ||
| } | ||
| } | ||
|
|
||
| #endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters