Update syntax to Swift 5

bcylin · bcylin · commit 9cb80c81180d · 2020-01-26T18:14:18.000Z
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,5 @@
 language: objective-c
-osx_image: xcode9.2
+osx_image: xcode10.3
 cache:
   bundler: true
   directories:
diff --git a/iCookTV.xcodeproj/project.pbxproj b/iCookTV.xcodeproj/project.pbxproj
@@ -773,7 +773,7 @@
 				OTHER_SWIFT_FLAGS = "-D DEBUG";
 				SDKROOT = appletvos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 3;
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 			};
@@ -817,7 +817,7 @@
 				OTHER_SWIFT_FLAGS = "-D TRACKING";
 				SDKROOT = appletvos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 3;
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 				VALIDATE_PRODUCT = YES;
@@ -836,7 +836,6 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.thepolydice.icook;
 				PRODUCT_NAME = iCookTV;
-				SWIFT_VERSION = 3.0;
 			};
 			name = Debug;
 		};
@@ -853,7 +852,6 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.thepolydice.icook;
 				PRODUCT_NAME = iCookTV;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 3.0;
 			};
 			name = Release;
 		};
@@ -868,7 +866,6 @@
 				PRODUCT_BUNDLE_IDENTIFIER = io.github.bcylin.iCookTVTests;
 				PRODUCT_MODULE_NAME = iCookTVTests;
 				PRODUCT_NAME = iCookTV;
-				SWIFT_VERSION = 3.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/iCookTV.app/iCookTV";
 			};
 			name = Debug;
@@ -885,7 +882,6 @@
 				PRODUCT_MODULE_NAME = iCookTVTests;
 				PRODUCT_NAME = iCookTV;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 3.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/iCookTV.app/iCookTV";
 			};
 			name = Release;
diff --git a/iCookTV/AppDelegate.swift b/iCookTV/AppDelegate.swift
@@ -32,11 +32,11 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
   var window: UIWindow?
   let tabBarController = UITabBarController()
-  private var backgroundTask = UIBackgroundTaskInvalid
+  private var backgroundTask = UIBackgroundTaskIdentifier.invalid
 
   // MARK: - UIApplicationDelegate
 
-  func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
+  func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
     GroundControl.sync()
     Tracker.setUpAnalytics()
 
@@ -67,7 +67,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
   private func endBackgroundTask(inApplication application: UIApplication) {
     application.endBackgroundTask(backgroundTask)
-    backgroundTask = UIBackgroundTaskInvalid
+    backgroundTask = UIBackgroundTaskIdentifier.invalid
   }
 
 }
diff --git a/iCookTV/Controllers/LaunchViewController.swift b/iCookTV/Controllers/LaunchViewController.swift
@@ -37,7 +37,7 @@ class LaunchViewController: UIViewController, DataFetching {
   }()
 
   private lazy var activityIndicator: UIActivityIndicatorView = {
-    let _indicator = UIActivityIndicatorView(activityIndicatorStyle: .whiteLarge)
+    let _indicator = UIActivityIndicatorView(style: .whiteLarge)
     _indicator.color = UIColor.Palette.GreyishBrown
     _indicator.hidesWhenStopped = true
     return _indicator
diff --git a/iCookTV/Controllers/VideoPlayerController.swift b/iCookTV/Controllers/VideoPlayerController.swift
@@ -35,7 +35,7 @@ class VideoPlayerController: AVPlayerViewController, Trackable {
 
   /// An activity indicator displayed before the player item is ready.
   private lazy var loadingIndicator: UIActivityIndicatorView = {
-    let _indicator = UIActivityIndicatorView(activityIndicatorStyle: .whiteLarge)
+    let _indicator = UIActivityIndicatorView(style: .whiteLarge)
     _indicator.hidesWhenStopped = true
     return _indicator
   }()
diff --git a/iCookTV/Controllers/VideosViewController.swift b/iCookTV/Controllers/VideosViewController.swift
@@ -160,7 +160,7 @@ class VideosViewController: UIViewController,
     ]
   }
 
-  func updateBackground(with image: UIImage?) {
+  @objc func updateBackground(with image: UIImage?) {
     animateBackgroundTransition(to: image)
   }
 
diff --git a/iCookTV/Extensions/Video+PlayerItem.swift b/iCookTV/Extensions/Video+PlayerItem.swift
@@ -49,17 +49,17 @@ extension Video {
 
   private var titleMetaData: AVMetadataItem {
     let _title = AVMutableMetadataItem()
-    _title.key = AVMetadataCommonKeyTitle as (NSCopying & NSObjectProtocol)?
-    _title.keySpace = AVMetadataKeySpaceCommon
+    _title.key = AVMetadataKey.commonKeyTitle as (NSCopying & NSObjectProtocol)?
+    _title.keySpace = .common
     _title.locale = Locale.current
     _title.value = title as (NSCopying & NSObjectProtocol)?
     return _title
   }
 
   private var descriptionMetaData: AVMetadataItem {
     let _description = AVMutableMetadataItem()
-    _description.key = AVMetadataCommonKeyDescription as (NSCopying & NSObjectProtocol)?
-    _description.keySpace = AVMetadataKeySpaceCommon
+    _description.key = AVMetadataKey.commonKeyDescription as (NSCopying & NSObjectProtocol)?
+    _description.keySpace = .common
     _description.locale = Locale.current
     _description.value = (description ?? "")
       .components(separatedBy: CharacterSet.newlines)
@@ -106,10 +106,10 @@ private extension UIImage {
 
   var metadataItem: AVMetadataItem {
     let _item = AVMutableMetadataItem()
-    _item.key = AVMetadataCommonKeyArtwork as (NSCopying & NSObjectProtocol)?
-    _item.keySpace = AVMetadataKeySpaceCommon
+    _item.key = AVMetadataKey.commonKeyArtwork as (NSCopying & NSObjectProtocol)?
+    _item.keySpace = .common
     _item.locale = Locale.current
-    _item.value = UIImageJPEGRepresentation(self, UIImage.JPEGLeastCompressionQuality) as (NSCopying & NSObjectProtocol)?
+    _item.value = jpegData(compressionQuality: UIImage.JPEGLeastCompressionQuality) as (NSCopying & NSObjectProtocol)?
     return _item
   }
 
diff --git a/iCookTV/Helpers/HistoryManager.swift b/iCookTV/Helpers/HistoryManager.swift
@@ -66,7 +66,7 @@ struct HistoryManager {
       Debug.print(path)
 
       let decoder = JSONDecoder()
-      var records: [Video] = history.flatMap { try? decoder.decode(Video.self, from: $0) }
+      var records: [Video] = history.compactMap { try? decoder.decode(Video.self, from: $0) }
 
       // Keep the latest video at top.
       records = records.filter { $0.id != video.id }
diff --git a/iCookTV/Models/DataSource.swift b/iCookTV/Models/DataSource.swift
@@ -38,6 +38,14 @@ class DataSource<Collection: DataCollection>: NSObject, SourceType {
 
   private(set) var dataCollection: Collection
 
+  var numberOfItems: Int {
+    return dataCollection.count
+  }
+
+  subscript(index: Int) -> Collection.DataType {
+    return dataCollection[index]
+  }
+
   // MARK: - UICollectionViewDataSource
 
   func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
diff --git a/iCookTV/Models/SourceType.swift b/iCookTV/Models/SourceType.swift
@@ -35,19 +35,3 @@ protocol SourceType: UICollectionViewDataSource {
 
   subscript(index: Int) -> Collection.DataType { get }
 }
-
-
-////////////////////////////////////////////////////////////////////////////////
-
-
-extension SourceType {
-
-  var numberOfItems: Int {
-    return dataCollection.count
-  }
-
-  subscript(index: Int) -> Collection.DataType {
-    return dataCollection[index]
-  }
-
-}
diff --git a/iCookTV/Models/VideosDataSource.swift b/iCookTV/Models/VideosDataSource.swift
@@ -55,8 +55,8 @@ class VideosDataSource: DataSource<VideosCollection> {
   }
 
   func collectionView(_ collectionView: UICollectionView, viewForSupplementaryElementOfKind kind: String, atIndexPath indexPath: IndexPath) -> UICollectionReusableView {
-    if kind == UICollectionElementKindSectionHeader {
-      let headerView = collectionView.dequeueReusableSupplementaryView(ofKind: UICollectionElementKindSectionHeader, for: indexPath) as SectionHeaderView
+    if kind == UICollectionView.elementKindSectionHeader {
+      let headerView = collectionView.dequeueReusableSupplementaryView(ofKind: UICollectionView.elementKindSectionHeader, for: indexPath) as SectionHeaderView
       headerView.accessoryLabel.text = title
       return headerView
     }
diff --git a/iCookTV/Protocols/LoadingIndicatorPresentable.swift b/iCookTV/Protocols/LoadingIndicatorPresentable.swift
@@ -57,7 +57,7 @@ extension LoadingIndicatorPresentable where Self: UIViewController {
   }
 
   static func defaultLoadingIndicator() -> UIActivityIndicatorView {
-    let indicator = UIActivityIndicatorView(activityIndicatorStyle: .whiteLarge)
+    let indicator = UIActivityIndicatorView(style: .whiteLarge)
     indicator.color = UIColor.Palette.GreyishBrown
     indicator.hidesWhenStopped = true
     return indicator
diff --git a/iCookTV/Protocols/OverlayViewPresentable.swift b/iCookTV/Protocols/OverlayViewPresentable.swift
@@ -47,7 +47,7 @@ extension OverlayViewPresentable where Self: UIViewController {
   func setOverlayViewHidden(_ hidden: Bool, animated: Bool) {
     if !hidden {
       layoutOverlayViewIfNeeded()
-      overlayView.superview?.bringSubview(toFront: overlayView)
+      overlayView.superview?.bringSubviewToFront(overlayView)
     }
 
     let transition = {
diff --git a/iCookTV/Protocols/VideosGridLayout.swift b/iCookTV/Protocols/VideosGridLayout.swift
@@ -43,7 +43,7 @@ extension VideosGridLayout where Self: UIViewController {
   static func defaultCollectionView(dataSource: UICollectionViewDataSource, delegate: UICollectionViewDelegate) -> UICollectionView {
     let collectionView = UICollectionView(frame: CGRect.zero, collectionViewLayout: Metrics.gridFlowLayout)
     collectionView.register(cell: VideoCell.self)
-    collectionView.register(supplementaryView: SectionHeaderView.self, ofKind: UICollectionElementKindSectionHeader)
+    collectionView.register(supplementaryView: SectionHeaderView.self, ofKind: UICollectionView.elementKindSectionHeader)
     collectionView.remembersLastFocusedIndexPath = true
     collectionView.dataSource = dataSource
     collectionView.delegate = delegate
diff --git a/iCookTV/Views/MenuButton.swift b/iCookTV/Views/MenuButton.swift
@@ -42,7 +42,7 @@ class MenuButton: UIButton {
 
   private func setUpAppearance() {
     contentEdgeInsets = UIEdgeInsets(top: 15, left: 40, bottom: 15, right: 40)
-    setTitleColor(UIColor.Palette.Button.TitleColor, for: UIControlState())
+    setTitleColor(UIColor.Palette.Button.TitleColor, for: UIControl.State())
     setTitleColor(UIColor.Palette.FocusedButton.TitleColor, for: .focused)
     setImage(UIImage.resizableImage(filledWith: UIColor.Palette.Button.BackgroundColor), for: .normal)
     setImage(UIImage.resizableImage(filledWith: UIColor.Palette.FocusedButton.BackgroundColor), for: .focused)

Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,7 @@ class VideosViewController: UIViewController,`
`160`	`160`	`]`
`161`	`161`	`}`
`162`	`162`
`163`		`- func updateBackground(with image: UIImage?) {`
	`163`	`+ @objc func updateBackground(with image: UIImage?) {`
`164`	`164`	`animateBackgroundTransition(to: image)`
`165`	`165`	`}`
`166`	`166`