Merge pull request insidegui#526 from insidegui/ah/swift-5

insidegui · web-flow · commit ec1adefce5cf · 2019-05-02T18:26:10.000+02:00
Swift 5
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,5 @@
 os: osx
-osx_image: xcode10
+osx_image: xcode10.2
 before_install:
   - brew update
   - brew outdated swiftlint || brew upgrade swiftlint
diff --git a/Cartfile b/Cartfile
@@ -2,7 +2,7 @@ github "SwiftyJSON/SwiftyJSON" ~> 4.0
 
 github "ReactiveX/RxSwift" ~> 4.0
 
-github "realm/realm-cocoa" ~> 3.7.3
+github "realm/realm-cocoa" ~> 3.14.0
 github "RxSwiftCommunity/RxRealm" ~> 0.7
 
 github "bustoutsolutions/siesta" ~> 1.0
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,9 +1,9 @@
-github "ReactiveX/RxSwift" "4.4.0"
-github "RxSwiftCommunity/RxRealm" "0.7.6"
+github "ReactiveX/RxSwift" "4.4.2"
+github "RxSwiftCommunity/RxRealm" "0.7.7"
 github "SwiftyJSON/SwiftyJSON" "4.2.0"
-github "apple/swift-protobuf" "1.2.0"
-github "bustoutsolutions/siesta" "1.4.2"
+github "apple/swift-protobuf" "1.4.0"
+github "bustoutsolutions/siesta" "1.4.3"
 github "insidegui/ChromeCastCore" "0.2.1"
 github "insidegui/CloudKitCodable" "0.1.4"
-github "realm/realm-cocoa" "v3.11.1"
-github "sparkle-project/Sparkle" "1.20.0"
+github "realm/realm-cocoa" "v3.14.0"
+github "sparkle-project/Sparkle" "1.21.3"
diff --git a/ConfCore/AppleAPIClient.swift b/ConfCore/AppleAPIClient.swift
@@ -191,12 +191,12 @@ extension AppleAPIClient {
     fileprivate func process<M>(_ resource: Resource, event: ResourceEvent, with completion: @escaping (Result<M, APIError>) -> Void) {
         switch event {
         case .error:
-            completion(.error(resource.error))
+            completion(.failure(resource.error))
         case .newData:
             if let results: M = resource.typedContent() {
                 completion(.success(results))
             } else {
-                completion(.error(.adapter))
+                completion(.failure(.adapter))
             }
         default: break
         }
diff --git a/ConfCore/ContentsResponse.swift b/ConfCore/ContentsResponse.swift
@@ -17,12 +17,12 @@ public struct ContentsResponse: Decodable {
     public let instances: [SessionInstance]
     public let sessions: [Session]
 
-    init (events: [Event],
-          rooms: [Room],
-          tracks: [Track],
-          resources: [RelatedResource],
-          instances: [SessionInstance],
-          sessions: [Session]) {
+    init(events: [Event],
+         rooms: [Room],
+         tracks: [Track],
+         resources: [RelatedResource],
+         instances: [SessionInstance],
+         sessions: [Session]) {
         self.events = events
         self.rooms = rooms
         self.resources = resources
@@ -45,7 +45,7 @@ public struct ContentsResponse: Decodable {
 
         // remove duplicated sessions
         instances.forEach { instance in
-            guard let index = sessions.index(where: { $0.identifier == instance.session?.identifier }) else { return }
+            guard let index = sessions.firstIndex(where: { $0.identifier == instance.session?.identifier }) else { return }
 
             sessions.remove(at: index)
         }
diff --git a/ConfCore/Download.swift b/ConfCore/Download.swift
@@ -9,7 +9,7 @@
 import Cocoa
 import RealmSwift
 
-@available(*, deprecated: 1.0.0, message: "Provided for legacy support only, do not use this!")
+@available(*, deprecated, message: "Provided for legacy support only, do not use this!")
 enum DownloadStatus: String {
     case none
     case downloading
@@ -18,7 +18,7 @@ enum DownloadStatus: String {
     case completed
 }
 
-@available(*, deprecated: 1.0.0, message: "Provided for legacy support only, do not use this!")
+@available(*, deprecated, message: "Provided for legacy support only, do not use this!")
 public class Download: Object {
 
     /// Unique identifier
diff --git a/ConfCore/Environment.swift b/ConfCore/Environment.swift
@@ -10,7 +10,7 @@ import Foundation
 import os.log
 
 public extension Notification.Name {
-    public static let WWDCEnvironmentDidChange = Notification.Name("WWDCEnvironmentDidChange")
+    static let WWDCEnvironmentDidChange = Notification.Name("WWDCEnvironmentDidChange")
 }
 
 public struct Environment: Equatable {
diff --git a/ConfCore/Result.swift b/ConfCore/Result.swift
diff --git a/ConfCore/Storage.swift b/ConfCore/Storage.swift
@@ -84,7 +84,7 @@ public final class Storage {
     }
 
     func store(contentResult: Result<ContentsResponse, APIError>, completion: @escaping (Error?) -> Void) {
-        if case let .error(error) = contentResult {
+        if case let .failure(error) = contentResult {
             os_log("Error downloading contents: %{public}@",
                    log: log,
                    type: .error,
@@ -251,7 +251,7 @@ public final class Storage {
     }
 
     internal func store(featuredSectionsResult: Result<[FeaturedSection], APIError>, completion: @escaping (Error?) -> Void) {
-        if case let .error(error) = featuredSectionsResult {
+        if case let .failure(error) = featuredSectionsResult {
             os_log("Error downloading featured sections: %{public}@",
                    log: log,
                    type: .error,
diff --git a/PlayerUI/Definitions/Speeds.swift b/PlayerUI/Definitions/Speeds.swift
@@ -39,7 +39,7 @@ public enum PUIPlaybackSpeed: Float {
     }
 
     public var previous: PUIPlaybackSpeed {
-        guard let index = PUIPlaybackSpeed.all.index(of: self) else {
+        guard let index = PUIPlaybackSpeed.all.firstIndex(of: self) else {
             fatalError("Tried to get next speed from nonsensical playback speed \(self). Probably missing in collection.")
         }
 
@@ -49,7 +49,7 @@ public enum PUIPlaybackSpeed: Float {
     }
 
     public var next: PUIPlaybackSpeed {
-        guard let index = PUIPlaybackSpeed.all.index(of: self) else {
+        guard let index = PUIPlaybackSpeed.all.firstIndex(of: self) else {
             fatalError("Tried to get next speed from nonsensical playback speed \(self). Probably missing in collection.")
         }
 
diff --git a/PlayerUI/Views/PUIBufferLayer.swift b/PlayerUI/Views/PUIBufferLayer.swift
@@ -11,14 +11,6 @@ import Cocoa
 struct PUIBufferSegment: Hashable {
     let start: Double
     let duration: Double
-
-    var hashValue: Int {
-        return "\(start)->\(duration)".hashValue
-    }
-
-    static func == (lhs: PUIBufferSegment, rhs: PUIBufferSegment) -> Bool {
-        return lhs.start == rhs.start && lhs.duration == rhs.duration
-    }
 }
 
 final class PUIBufferLayer: PUIBoringLayer {
diff --git a/PlayerUI/Views/PUIPlayerView.swift b/PlayerUI/Views/PUIPlayerView.swift
@@ -1079,7 +1079,7 @@ public final class PUIPlayerView: NSView {
         // reset all item's states
         sender.menu?.items.forEach({ $0.state = .on })
 
-        if option.extendedLanguageTag == player?.currentItem?.selectedMediaOption(in: subtitlesGroup)?.extendedLanguageTag {
+        if option.extendedLanguageTag == player?.currentItem?.currentMediaSelection.selectedMediaOption(in: subtitlesGroup)?.extendedLanguageTag {
             player?.currentItem?.select(nil, in: subtitlesGroup)
             sender.state = .off
             return
@@ -1566,7 +1566,7 @@ extension PUIPlayerView: PUIExternalPlaybackConsumer {
     }
 
     public func externalPlaybackProvider(_ provider: PUIExternalPlaybackProvider, deviceSelectionMenuDidChangeWith menu: NSMenu) {
-        guard let registrationIndex = externalPlaybackProviders.index(where: { type(of: $0.provider).name == type(of: provider).name }) else { return }
+        guard let registrationIndex = externalPlaybackProviders.firstIndex(where: { type(of: $0.provider).name == type(of: provider).name }) else { return }
 
         externalPlaybackProviders[registrationIndex].menu = menu
     }
diff --git a/PlayerUI/Views/PUIPlayerWindow.swift b/PlayerUI/Views/PUIPlayerWindow.swift
@@ -152,13 +152,13 @@ open class PUIPlayerWindow: NSWindow {
     public private(set) var titlebarCompanionViews = [NSView]()
 
     public func addTitlebarCompanion(view: NSView) {
-        guard titlebarCompanionViews.index(of: view) == nil else { return }
+        guard titlebarCompanionViews.firstIndex(of: view) == nil else { return }
 
         titlebarCompanionViews.append(view)
     }
 
     public func removeTitlebarCompanion(view: NSView) {
-        guard let index = titlebarCompanionViews.index(of: view) else { return }
+        guard let index = titlebarCompanionViews.firstIndex(of: view) else { return }
 
         titlebarCompanionViews.remove(at: index)
     }
diff --git a/WWDC.xcodeproj/project.pbxproj b/WWDC.xcodeproj/project.pbxproj
@@ -63,7 +63,6 @@
 		DD4DED691ED6604300624EAF /* Crashlytics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DD4DED671ED6604300624EAF /* Crashlytics.framework */; };
 		DD4DED6B1ED6605D00624EAF /* LoggingHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD4DED6A1ED6605D00624EAF /* LoggingHelper.swift */; };
 		DD5910701ECA0C3B003C32A4 /* CloudKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DD59106F1ECA0C3B003C32A4 /* CloudKit.framework */; };
-		DD5DEC1E1E4AA6B800426FA6 /* Result.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD5DEC1D1E4AA6B800426FA6 /* Result.swift */; };
 		DD5DEC201E4AA6F800426FA6 /* ConditionallyDecodableCollection.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD5DEC1F1E4AA6F800426FA6 /* ConditionallyDecodableCollection.swift */; };
 		DD5DEC291E4AA8C800426FA6 /* news.json in Resources */ = {isa = PBXBuildFile; fileRef = DD5DEC241E4AA8C800426FA6 /* news.json */; };
 		DD5DEC2A1E4AA8C800426FA6 /* sessions.json in Resources */ = {isa = PBXBuildFile; fileRef = DD5DEC251E4AA8C800426FA6 /* sessions.json */; };
@@ -403,7 +402,6 @@
 		DD4DED6A1ED6605D00624EAF /* LoggingHelper.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LoggingHelper.swift; sourceTree = "<group>"; };
 		DD59106E1ECA0C2F003C32A4 /* WWDC.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = WWDC.entitlements; sourceTree = "<group>"; };
 		DD59106F1ECA0C3B003C32A4 /* CloudKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CloudKit.framework; path = System/Library/Frameworks/CloudKit.framework; sourceTree = SDKROOT; };
-		DD5DEC1D1E4AA6B800426FA6 /* Result.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Result.swift; sourceTree = "<group>"; };
 		DD5DEC1F1E4AA6F800426FA6 /* ConditionallyDecodableCollection.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ConditionallyDecodableCollection.swift; sourceTree = "<group>"; };
 		DD5DEC241E4AA8C800426FA6 /* news.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = news.json; sourceTree = "<group>"; };
 		DD5DEC251E4AA8C800426FA6 /* sessions.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = sessions.json; sourceTree = "<group>"; };
@@ -982,7 +980,6 @@
 		DD65FD4A1E489FDA0054DD35 /* Models */ = {
 			isa = PBXGroup;
 			children = (
-				DD5DEC1D1E4AA6B800426FA6 /* Result.swift */,
 				DDAE7C611E5C7E6A00CEA205 /* Responses */,
 				DD65FD6E1E48BE2F0054DD35 /* Apple */,
 				DD65FD6F1E48BE400054DD35 /* ASCIIWWDC */,
@@ -1695,10 +1692,9 @@
 			};
 			buildConfigurationList = DD36A4A71E478C6900B2EA88 /* Build configuration list for PBXProject "WWDC" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
-				English,
 				en,
 				Base,
 			);
@@ -1981,7 +1977,6 @@
 				DDDF805420B8FCBC007284F8 /* Session+Children.swift in Sources */,
 				DD5DEC201E4AA6F800426FA6 /* ConditionallyDecodableCollection.swift in Sources */,
 				DD65FD6D1E48BE270054DD35 /* Bookmark.swift in Sources */,
-				DD5DEC1E1E4AA6B800426FA6 /* Result.swift in Sources */,
 				DDD1C9CB20B1EA2400902B1C /* FavoriteSyncObject.swift in Sources */,
 				DD65FD5B1E48A1080054DD35 /* Focus.swift in Sources */,
 				DDDF805B20B9035C007284F8 /* Bookmark+ConflictResolution.swift in Sources */,
@@ -2191,7 +2186,7 @@
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -2242,7 +2237,7 @@
 				SDKROOT = macosx;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};
@@ -2456,7 +2451,7 @@
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug_iCloud;
 		};
@@ -2620,7 +2615,7 @@
 				SDKROOT = macosx;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release_iCloud;
 		};
diff --git a/WWDC/AboutWindowController.swift b/WWDC/AboutWindowController.swift
@@ -145,7 +145,7 @@ final class AboutWindowController: NSWindowController {
 
 fileprivate extension Dictionary where Key == String, Value == Any {
 
-    fileprivate func stringOrEmpty(for key: String) -> String {
+    func stringOrEmpty(for key: String) -> String {
 
         return (self[key] as? String) ?? ""
     }
diff --git a/WWDC/AppCoordinator+SessionActions.swift b/WWDC/AppCoordinator+SessionActions.swift
@@ -91,6 +91,11 @@ extension AppCoordinator: SessionActionsViewControllerDelegate {
             }
         case .authorized:
             self.saveCalendarEvent(viewModel: viewModel, eventStore: eventStore)
+        @unknown default:
+            assertionFailure("An unexpected case was discovered on an non-frozen obj-c enum")
+            os_log("Cannot determine EKEventStore authorization status due to an unknown enum case. Doing nothing instead",
+                   log: self.log,
+                   type: .error)
         }
     }
 
@@ -154,7 +159,7 @@ extension AppCoordinator: SessionActionsViewControllerDelegate {
         guard let sender = sender else { return }
         guard let viewModel = selectedViewModelRegardlessOfTab else { return }
 
-        guard let webpageAsset = viewModel.session.asset(ofType: .hdVideo) else { return }
+        guard let webpageAsset = viewModel.session.asset(ofType: .webpage) else { return }
 
         guard let url = URL(string: webpageAsset.remoteURL) else { return }
 
diff --git a/WWDC/Arguments.swift b/WWDC/Arguments.swift
@@ -31,7 +31,7 @@ struct Arguments {
     }
 
     static var deloreanDate: String? {
-        guard let deloreanIndex = args.index(of: "--delorean") else { return nil }
+        guard let deloreanIndex = args.firstIndex(of: "--delorean") else { return nil }
         // An example value: 2017-06-07'T'12:00:00-06:00
         // - see: `DateProvider`
 
diff --git a/WWDC/DownloadManager.swift b/WWDC/DownloadManager.swift
@@ -208,6 +208,9 @@ final class DownloadManager: NSObject {
                         observer.onNext(.cancelled)
                     case .completed:
                         observer.onNext(.finished)
+                    @unknown default:
+                        assertionFailure("An unexpected case was discovered on an non-frozen obj-c enum")
+                        observer.onNext(.downloading(latestInfo))
                     }
                 } else if self.hasDownloadedVideo(remoteURL: asset.remoteURL) {
                     observer.onNext(.finished)
@@ -551,6 +554,7 @@ extension DownloadManager: URLSessionDownloadDelegate, URLSessionTaskDelegate {
 extension DownloadManager {
 
     struct Download: Equatable {
+        // Equatable can't be synthesized with a `weak` property for some reason
         static func == (lhs: DownloadManager.Download, rhs: DownloadManager.Download) -> Bool {
             return lhs.session == rhs.session && lhs.remoteURL == rhs.remoteURL && lhs.task == rhs.task
         }
diff --git a/WWDC/RemoteEnvironment.swift b/WWDC/RemoteEnvironment.swift
@@ -99,7 +99,7 @@ final class RemoteEnvironment {
         let notification = CKNotification(fromRemoteNotificationDictionary: userInfo)
 
         // check if the remote notification is for us, if not, tell the caller that we haven't handled it
-        guard notification.subscriptionID == environmentSubscriptionID else { return false }
+        guard notification?.subscriptionID == environmentSubscriptionID else { return false }
 
         // notification for environment change
         fetch()
diff --git a/WWDC/SearchFiltersViewController.swift b/WWDC/SearchFiltersViewController.swift
diff --git a/WWDC/SessionRow.swift b/WWDC/SessionRow.swift
diff --git a/WWDC/SessionsTableViewController+SupportingTypesAndExtensions.swift b/WWDC/SessionsTableViewController+SupportingTypesAndExtensions.swift
diff --git a/WWDC/SessionsTableViewController.swift b/WWDC/SessionsTableViewController.swift
diff --git a/WWDC/TabItemView.swift b/WWDC/TabItemView.swift
diff --git a/WWDC/VideoPlayerViewController.swift b/WWDC/VideoPlayerViewController.swift
diff --git a/WWDC/WWDCTabViewController.swift b/WWDC/WWDCTabViewController.swift

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ import Foundation`
`10`	`10`	`import os.log`
`11`	`11`
`12`	`12`	`public extension Notification.Name {`
`13`		`- public static let WWDCEnvironmentDidChange = Notification.Name("WWDCEnvironmentDidChange")`
	`13`	`+ static let WWDCEnvironmentDidChange = Notification.Name("WWDCEnvironmentDidChange")`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`public struct Environment: Equatable {`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public enum PUIPlaybackSpeed: Float {`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`public var previous: PUIPlaybackSpeed {`
`42`		`- guard let index = PUIPlaybackSpeed.all.index(of: self) else {`
	`42`	`+ guard let index = PUIPlaybackSpeed.all.firstIndex(of: self) else {`
`43`	`43`	`fatalError("Tried to get next speed from nonsensical playback speed \(self). Probably missing in collection.")`
`44`	`44`	`}`
`45`	`45`
`@@ -49,7 +49,7 @@ public enum PUIPlaybackSpeed: Float {`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`public var next: PUIPlaybackSpeed {`
`52`		`- guard let index = PUIPlaybackSpeed.all.index(of: self) else {`
	`52`	`+ guard let index = PUIPlaybackSpeed.all.firstIndex(of: self) else {`
`53`	`53`	`fatalError("Tried to get next speed from nonsensical playback speed \(self). Probably missing in collection.")`
`54`	`54`	`}`
`55`	`55`