Upgrade to Swift 4.2 #2058
Upgrade to Swift 4.2 #2058
Conversation
| @@ -365,42 +365,18 @@ extension UIApplicationState: Encodable { | |||
|
|
|||
| extension AVAudioSession { | |||
| var audioType: String { | |||
| if isOutputBluetooth() { | |||
| if currentRoute.outputs.contains(where: { [.bluetoothA2DP, .bluetoothHFP, .bluetoothLE].contains($0.portType) }) { | |||
There was a problem hiding this comment.
This could just be a simple switch statement inside a for loop, but it looks like the original code was prioritizing Bluetooth types over headphone types over speaker types.
| return "speaker" | ||
| } | ||
| // if currentRoute.outputs.contains(where: { [.builtInMic, .headsetMic, .lineIn].contains($0.portType) }) { |
There was a problem hiding this comment.
I added bluetoothHFP to the Bluetooth cases above and carAudio and usbAudio to the headphone cases, but I wasn’t sure what to do about these microphone-related types, so they continue to be classified as “unknown”.
There was a problem hiding this comment.
Falling back to unknown sounds reasonable. Let's drop this commented code.
| try audioSession.setCategory(.ambient, mode: audioSession.mode) | ||
| } else { | ||
| audioSession.perform(Selector("setCategory:error:" as String), | ||
| with: AVAudioSession.Category.ambient.rawValue) |
There was a problem hiding this comment.
This is necessary because Swift 4.2 obsoleted setCategory(_:) in favor of setCategory(_:mode:), which isn’t supported on iOS 9. The same workaround was used in AudioKit/AudioKit#1554.
| @@ -240,7 +240,7 @@ public class MapboxNavigationService: NSObject, NavigationService, DefaultInterf | |||
| locationSource: NavigationLocationManager? = nil, | |||
| eventsManagerType: NavigationEventsManager.Type? = nil, | |||
| simulating simulationMode: SimulationMode = .onPoorGPS, | |||
| routerType: Router.Type? = DefaultRouter.self) | |||
| routerType: Router.Type? = nil) | |||
There was a problem hiding this comment.
There’s already a fallback further down. This default value was responsible for a warning in client code, because DefaultRouter is internal.
This SWIFT_VERSION override in the podspecs is custom Ruby code that is lost in conversion to JSON when uploading to CocoaPods trunk. So it only affects projects that use the navigation SDK as a development pod, namely the CocoaPods integration test fixture in this repository.
Ran all the Xcode project’s targets through the Swift 4.2 migrator, simplifying some types. Refreshed the CocoaPods integration test. Removed build setting overrides in the SDK’s podspecs that only affected development pods in the CocoaPods integration test.
Fixes #2057.
/cc @mapbox/navigation-ios @friedbunny