Updates syntax to Swift 3 GM via Xcode migrator

Common/Collection View/GridCollectionViewCell.swift

@@ -45,15 +45,15 @@ class GridCollectionViewCell: UICollectionViewCell
         }
     }
     
-    private var vibrancyView = UIVisualEffectView(effect: UIVibrancyEffect(blurEffect: UIBlurEffect(style: .dark)))
+    fileprivate var vibrancyView = UIVisualEffectView(effect: UIVibrancyEffect(blurEffect: UIBlurEffect(style: .dark)))
     
-    private var imageViewWidthConstraint: NSLayoutConstraint!
+    fileprivate var imageViewWidthConstraint: NSLayoutConstraint!
-    private var imageViewHeightConstraint: NSLayoutConstraint!
+    fileprivate var imageViewHeightConstraint: NSLayoutConstraint!
     
-    private var textLabelBottomAnchorConstraint: NSLayoutConstraint!
+    fileprivate var textLabelBottomAnchorConstraint: NSLayoutConstraint!
     
-    private var textLabelVerticalSpacingConstraint: NSLayoutConstraint!
+    fileprivate var textLabelVerticalSpacingConstraint: NSLayoutConstraint!
-    private var textLabelFocusedVerticalSpacingConstraint: NSLayoutConstraint?
+    fileprivate var textLabelFocusedVerticalSpacingConstraint: NSLayoutConstraint?
     
     override init(frame: CGRect)
     {

Common/Components/LoadImageOperation.swift

@@ -32,7 +32,7 @@ public class LoadImageOperation: RSTOperation
         }
     }
     
-    private var image: UIImage?
+    fileprivate var image: UIImage?
     
     public init(URL: Foundation.URL)
     {
@@ -44,7 +44,7 @@ public class LoadImageOperation: RSTOperation
 
 public extension LoadImageOperation
 {
-    override func main()
+    override public func main()
     {
         guard !self.isCancelled else { return }
         
@@ -56,7 +56,7 @@ public extension LoadImageOperation
         
         let options: NSDictionary = [kCGImageSourceShouldCache as NSString: true]
         
-        if let imageSource = CGImageSourceCreateWithURL(self.URL, options), let quartzImage = CGImageSourceCreateImageAtIndex(imageSource, 0, options)
+        if let imageSource = CGImageSourceCreateWithURL(self.URL as CFURL, options), let quartzImage = CGImageSourceCreateImageAtIndex(imageSource, 0, options)
         {
             let loadedImage = UIImage(cgImage: quartzImage)
             

Common/Database/Model/Cheat.swift

@@ -36,8 +36,8 @@ class Cheat: NSManagedObject, CheatProtocol
     @NSManaged var modifiedDate: Date
     @NSManaged var enabled: Bool
     
-    @NSManaged private(set) var identifier: String
+    @NSManaged fileprivate(set) var identifier: String
-    @NSManaged private(set) var creationDate: Date
+    @NSManaged fileprivate(set) var creationDate: Date
     
     // Must be optional relationship to satisfy weird Core Data requirement
     // https://forums.developer.apple.com/thread/20535

Common/Database/Model/SaveState.swift

@@ -43,8 +43,8 @@ class SaveState: NSManagedObject, SaveStateProtocol
     @NSManaged var modifiedDate: Date
     @NSManaged var type: SaveStateType
     
-    @NSManaged private(set) var filename: String
+    @NSManaged fileprivate(set) var filename: String
-    @NSManaged private(set) var identifier: String
+    @NSManaged fileprivate(set) var identifier: String
     
     // Must be optional relationship to satisfy weird Core Data requirement
     // https://forums.developer.apple.com/thread/20535

Common/Importing/GamePickerController.swift

@@ -146,7 +146,7 @@ private var GamePickerControllerKey: UInt8 = 0
 
 extension UIViewController
 {
-    private(set) var gamePickerController: GamePickerController?
+    fileprivate(set) var gamePickerController: GamePickerController?
     {
         set
         {

Cores/DeltaCore

@@ -1 +1 @@
-Subproject commit e7c44d64678d2256af4429e8d2d39d5ffd54dc7f
+Subproject commit e02022d8d3d04624e10e5394319e7994265f2999

Delta/AppDelegate.swift

@@ -17,7 +17,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate
 {
     var window: UIWindow?
 
-    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool
     {
         Delta.register(SNES.core)
         Delta.register(GBA.core)

Delta/Emulation/GameViewController.swift

@@ -51,10 +51,10 @@ class GameViewController: DeltaCore.GameViewController
     
     //MARK: - Private Properties -
     private var pauseViewController: PauseViewController?
-    private var pausingGameController: GameController?
+    fileprivate var pausingGameController: GameController?
     
     // Prevents the same save state from being saved multiple times
-    private var pausedSaveState: PausedSaveState? {
+    fileprivate var pausedSaveState: PausedSaveState? {
         didSet
         {
             if let saveState = oldValue, self.pausedSaveState == nil
@@ -77,11 +77,11 @@ class GameViewController: DeltaCore.GameViewController
     private var updateSemaphores = Set<DispatchSemaphore>()
     private var sustainedInputs = [ObjectIdentifier: [Input]]()
     private var reactivateSustainedInputsQueue: OperationQueue
-    private var selectingSustainedButtons = false
+    fileprivate var selectingSustainedButtons = false
     
-    private var sustainButtonsContentView: UIView!
+    fileprivate var sustainButtonsContentView: UIView!
-    private var sustainButtonsBlurView: UIVisualEffectView!
+    fileprivate var sustainButtonsBlurView: UIVisualEffectView!
-    private var sustainButtonsBackgroundView: RSTBackgroundView!
+    fileprivate var sustainButtonsBackgroundView: RSTBackgroundView!
     
     required init()
     {
@@ -366,7 +366,7 @@ private extension GameViewController
 /// Save States
 extension GameViewController: SaveStatesViewControllerDelegate
 {
-    private func updateAutoSaveState()
+    fileprivate func updateAutoSaveState()
     {
         // Ensures game is non-nil and also a Game subclass
         guard let game = self.game as? Game else { return }
@@ -424,7 +424,7 @@ extension GameViewController: SaveStatesViewControllerDelegate
         }
     }
     
-    private func update(_ saveState: SaveState, with replacementSaveState: SaveStateProtocol? = nil)
+    fileprivate func update(_ saveState: SaveState, with replacementSaveState: SaveStateProtocol? = nil)
     {
         let isRunning = (self.emulatorCore?.state == .running)
         

Delta/Emulation/PreviewGameViewController.swift

@@ -27,7 +27,7 @@ class PreviewGameViewController: DeltaCore.GameViewController
         }
     }
     
-    private var emulatorCoreQueue = DispatchQueue(label: "com.rileytestut.Delta.PreviewGameViewController.emulatorCoreQueue", qos: .userInitiated)
+    fileprivate var emulatorCoreQueue = DispatchQueue(label: "com.rileytestut.Delta.PreviewGameViewController.emulatorCoreQueue", qos: .userInitiated)
     
     override var game: GameProtocol? {
         willSet {
@@ -101,7 +101,7 @@ extension PreviewGameViewController
         // Dispose of any resources that can be recreated.
     }
     
-    override func observeValue(forKeyPath keyPath: String?, of object: AnyObject?, change: [NSKeyValueChangeKey : AnyObject]?, context: UnsafeMutablePointer<Void>?)
+    override func observeValue(forKeyPath keyPath: String?, of object: AnyObject?, change: [NSKeyValueChangeKey : AnyObject]?, context: UnsafeMutableRawPointer?)
     {
         guard context == &kvoContext else { return super.observeValue(forKeyPath: keyPath, of: object, change: change, context: context) }
         

Delta/Extensions/UIViewControllerContextTransitioning+Conveniences.swift

@@ -12,11 +12,11 @@ extension UIViewControllerContextTransitioning
 {
     /// UIViewControllers
     var sourceViewController: UIViewController {
-        return self.viewController(forKey: UITransitionContextFromViewControllerKey)!
+        return self.viewController(forKey: .from)!
     }
     
     var destinationViewController: UIViewController {
-        return self.viewController(forKey: UITransitionContextToViewControllerKey)!
+        return self.viewController(forKey: .to)!
     }
     
     /// UIViews

Delta/Game Selection/GameCollectionViewController.swift

@@ -29,13 +29,13 @@ class GameCollectionViewController: UICollectionViewController
     
     weak var activeEmulatorCore: EmulatorCore?
     
-    private var activeSaveState: SaveStateProtocol?
+    fileprivate var activeSaveState: SaveStateProtocol?
     
-    private var dataSource: RSTFetchedResultsCollectionViewDataSource<Game>!
+    fileprivate var dataSource: RSTFetchedResultsCollectionViewDataSource<Game>!
-    private let prototypeCell = GridCollectionViewCell()
+    fileprivate let prototypeCell = GridCollectionViewCell()
     
-    private var _performing3DTouchTransition = false
+    fileprivate var _performing3DTouchTransition = false
-    private weak var _destination3DTouchTransitionViewController: UIViewController?
+    fileprivate weak var _destination3DTouchTransitionViewController: UIViewController?
 }
 
 //MARK: - UIViewController -

Delta/Game Selection/GamesViewController.swift

@@ -32,11 +32,11 @@ class GamesViewController: UIViewController
     
     weak var activeEmulatorCore: EmulatorCore?
     
-    private var pageViewController: UIPageViewController!
+    fileprivate var pageViewController: UIPageViewController!
-    private var backgroundView: RSTBackgroundView!
+    fileprivate var backgroundView: RSTBackgroundView!
-    private var pageControl: UIPageControl!
+    fileprivate var pageControl: UIPageControl!
     
-    private let fetchedResultsController: NSFetchedResultsController<NSFetchRequestResult>
+    fileprivate let fetchedResultsController: NSFetchedResultsController<NSFetchRequestResult>
     
     override init(nibName nibNameOrNil: String?, bundle nibBundleOrNil: Bundle?) {
         fatalError("initWithNibName: not implemented")
@@ -253,7 +253,7 @@ private extension GamesViewController
 /// Importing
 extension GamesViewController: GamePickerControllerDelegate
 {
-    @IBAction private func importFiles()
+    @IBAction fileprivate func importFiles()
     {
         let gamePickerController = GamePickerController()
         gamePickerController.delegate = self

Delta/Game Selection/Segues/GamesStoryboardSegue.swift

@@ -10,9 +10,9 @@ import UIKit
 
 class GamesStoryboardSegue: UIStoryboardSegue
 {
-    private let animator: UIViewPropertyAnimator
+    fileprivate let animator: UIViewPropertyAnimator
     
-    private var isPresenting: Bool = true
+    fileprivate var isPresenting: Bool = true
     
     override init(identifier: String?, source: UIViewController, destination: UIViewController)
     {

Delta/Game Selection/Segues/InitialGamesStoryboardSegue.swift

@@ -10,9 +10,9 @@ import UIKit
 
 class InitialGamesStoryboardSegue: UIStoryboardSegue
 {
-    private let animator: UIViewPropertyAnimator
+    fileprivate let animator: UIViewPropertyAnimator
     
-    private var isPresenting: Bool = true
+    fileprivate var isPresenting: Bool = true
     
     override init(identifier: String?, source: UIViewController, destination: UIViewController)
     {

Delta/Launch/LaunchViewController.swift

@@ -10,10 +10,10 @@ import UIKit
 
 class LaunchViewController: UIViewController
 {
-    @IBOutlet private var containerView: UIView!
+    @IBOutlet fileprivate var containerView: UIView!
-    private var gameViewController: GameViewController!
+    fileprivate var gameViewController: GameViewController!
     
-    private var presentedGameViewController: Bool = false
+    fileprivate var presentedGameViewController: Bool = false
     
     override var preferredStatusBarStyle: UIStatusBarStyle {
         return self.gameViewController?.preferredStatusBarStyle ?? .default

Delta/Pause Menu/Cheats/CheatTextView.swift

@@ -23,7 +23,7 @@ class CheatTextView: UITextView
         }
     }
     
-    @NSCopying private var attributedFormat: NSAttributedString?
+    @NSCopying fileprivate var attributedFormat: NSAttributedString?
     
     required init?(coder aDecoder: NSCoder)
     {

Delta/Pause Menu/Cheats/CheatsViewController.swift

@@ -29,9 +29,9 @@ class CheatsViewController: UITableViewController
     
     weak var delegate: CheatsViewControllerDelegate?
     
-    private var backgroundView: RSTBackgroundView!
+    fileprivate var backgroundView: RSTBackgroundView!
     
-    private var fetchedResultsController: NSFetchedResultsController<NSFetchRequestResult>!
+    fileprivate var fetchedResultsController: NSFetchedResultsController<NSFetchRequestResult>!
 }
 
 extension CheatsViewController

Delta/Pause Menu/Cheats/EditCheatViewController.swift

@@ -43,19 +43,19 @@ class EditCheatViewController: UITableViewController
     
     var isPreviewing = false
     
-    private var supportedCheatFormats: [CheatFormat]!
+    fileprivate var supportedCheatFormats: [CheatFormat]!
     
-    private var selectedCheatFormat: CheatFormat {
+    fileprivate var selectedCheatFormat: CheatFormat {
         let cheatFormat = self.supportedCheatFormats[self.typeSegmentedControl.selectedSegmentIndex]
         return cheatFormat
     }
     
-    private var mutableCheat: Cheat!
+    fileprivate var mutableCheat: Cheat!
-    private var managedObjectContext = DatabaseManager.shared.newBackgroundContext()
+    fileprivate var managedObjectContext = DatabaseManager.shared.newBackgroundContext()
     
-    @IBOutlet private var nameTextField: UITextField!
+    @IBOutlet fileprivate var nameTextField: UITextField!
-    @IBOutlet private var typeSegmentedControl: UISegmentedControl!
+    @IBOutlet fileprivate var typeSegmentedControl: UISegmentedControl!
-    @IBOutlet private var codeTextView: CheatTextView!
+    @IBOutlet fileprivate var codeTextView: CheatTextView!
     
     override var previewActionItems: [UIPreviewActionItem]
     {

Delta/Pause Menu/PauseItem.swift

@@ -16,7 +16,7 @@ struct PauseItem: Equatable
     
     var selected = false
     
-    init(image: UIImage, text: String, action: ((PauseItem) -> Void))
+    init(image: UIImage, text: String, action: @escaping ((PauseItem) -> Void))
     {
         self.image = image
         self.text = text

Delta/Pause Menu/PauseMenuViewController.swift

@@ -30,8 +30,8 @@ class PauseMenuViewController: UICollectionViewController
         get { return self.collectionView?.contentSize ?? CGSize.zero }
     }
     
-    private var prototypeCell = GridCollectionViewCell()
+    fileprivate var prototypeCell = GridCollectionViewCell()
-    private var previousIndexPath: IndexPath? = nil
+    fileprivate var previousIndexPath: IndexPath? = nil
 }
 
 extension PauseMenuViewController

Delta/Pause Menu/PauseViewController.swift

@@ -38,9 +38,9 @@ class PauseViewController: UIViewController, PauseInfoProviding
     /// Save States
     weak var saveStatesViewControllerDelegate: SaveStatesViewControllerDelegate?
     
-    private var saveStatesViewControllerMode = SaveStatesViewController.Mode.loading
+    fileprivate var saveStatesViewControllerMode = SaveStatesViewController.Mode.loading
     
-    private var pauseNavigationController: UINavigationController!
+    fileprivate var pauseNavigationController: UINavigationController!
     
     /// UIViewController
     override var preferredContentSize: CGSize {

Delta/Pause Menu/Save States/SaveStatesCollectionHeaderView.swift

@@ -36,7 +36,7 @@ class SaveStatesCollectionHeaderView: UICollectionReusableView
         self.textLabel.translatesAutoresizingMaskIntoConstraints = false
         self.textLabel.textColor = UIColor.white
         
-        var fontDescriptor = UIFontDescriptor.preferredFontDescriptor(withTextStyle: UIFontTextStyleTitle3)
+        var fontDescriptor = UIFontDescriptor.preferredFontDescriptor(withTextStyle: .title3)
         fontDescriptor = fontDescriptor.withSymbolicTraits([.traitBold])!
         
         self.textLabel.font = UIFont(descriptor: fontDescriptor, size: 0.0)

Delta/Pause Menu/Save States/SaveStatesViewController.swift

@@ -49,21 +49,21 @@ class SaveStatesViewController: UICollectionViewController
     
     var mode = Mode.loading
     
-    private var backgroundView: RSTBackgroundView!
+    fileprivate var backgroundView: RSTBackgroundView!
     
-    private var prototypeCell = GridCollectionViewCell()
+    fileprivate var prototypeCell = GridCollectionViewCell()
-    private var prototypeCellWidthConstraint: NSLayoutConstraint!
+    fileprivate var prototypeCellWidthConstraint: NSLayoutConstraint!
-    private var prototypeHeader = SaveStatesCollectionHeaderView()
+    fileprivate var prototypeHeader = SaveStatesCollectionHeaderView()
     
-    private var fetchedResultsController: NSFetchedResultsController<NSFetchRequestResult>!
+    fileprivate var fetchedResultsController: NSFetchedResultsController<NSFetchRequestResult>!
     
-    private let imageOperationQueue = RSTOperationQueue()
+    fileprivate let imageOperationQueue = RSTOperationQueue()
-    private let imageCache = NSCache<NSURL, UIImage>()
+    fileprivate let imageCache = NSCache<URL, UIImage>()
     
-    private var emulatorCoreSaveState: SaveStateProtocol?
+    fileprivate var emulatorCoreSaveState: SaveStateProtocol?
-    private var selectedSaveState: SaveState?
+    fileprivate var selectedSaveState: SaveState?
     
-    private let dateFormatter: DateFormatter
+    fileprivate let dateFormatter: DateFormatter
     
     required init?(coder aDecoder: NSCoder)
     {
@@ -219,7 +219,7 @@ private extension SaveStatesViewController
         cell.maximumImageSize = CGSize(width: self.prototypeCellWidthConstraint.constant, height: (self.prototypeCellWidthConstraint.constant / dimensions.width) * dimensions.height)
         
         cell.textLabel.textColor = UIColor.white
-        cell.textLabel.font = UIFont.preferredFont(forTextStyle: UIFontTextStyleSubheadline)
+        cell.textLabel.font = UIFont.preferredFont(forTextStyle: .subheadline)
         
         let name = saveState.name ?? self.dateFormatter.string(from: saveState.modifiedDate)
         cell.textLabel.text = name
@@ -530,7 +530,7 @@ private extension SaveStatesViewController
 //MARK: - 3D Touch -
 extension SaveStatesViewController: UIViewControllerPreviewingDelegate
 {
-    private func prepareEmulatorCoreSaveState()
+    fileprivate func prepareEmulatorCoreSaveState()
     {
         guard let emulatorCore = self.emulatorCore else { return }
         

Delta/Pause Menu/Segues/PauseStoryboardSegue.swift

@@ -10,8 +10,8 @@ import UIKit
 
 class PauseStoryboardSegue: UIStoryboardSegue
 {
-    private let animator: UIViewPropertyAnimator
+    fileprivate let animator: UIViewPropertyAnimator
-    private let presentationController: PausePresentationController
+    fileprivate let presentationController: PausePresentationController
     
     override init(identifier: String?, source: UIViewController, destination: UIViewController)
     {
@@ -65,8 +65,8 @@ extension PauseStoryboardSegue: UIViewControllerAnimatedTransitioning
     
     func animateTransition(using transitionContext: UIViewControllerContextTransitioning)
     {
-        let presentedView = transitionContext.view(forKey: UITransitionContextToViewKey)!
+        let presentedView = transitionContext.view(forKey: .to)!
-        let presentedViewController = transitionContext.viewController(forKey: UITransitionContextToViewControllerKey)!
+        let presentedViewController = transitionContext.viewController(forKey: .to)!
         
         presentedView.frame = transitionContext.finalFrame(for: presentedViewController)
         presentedView.frame.origin.y = transitionContext.containerView.bounds.height

Delta/Pause Menu/Segues/PauseTransitionCoordinator.swift

@@ -28,8 +28,8 @@ class PauseTransitionCoordinator: NSObject, UIViewControllerAnimatedTransitionin
     
     func animateTransition(using transitionContext: UIViewControllerContextTransitioning)
     {
-        let destinationViewController = transitionContext.viewController(forKey: UITransitionContextToViewControllerKey)!
+        let destinationViewController = transitionContext.viewController(forKey: .to)!
-        let sourceViewController = transitionContext.viewController(forKey: UITransitionContextFromViewControllerKey)!
+        let sourceViewController = transitionContext.viewController(forKey: .from)!
         
         destinationViewController.view.frame = transitionContext.finalFrame(for: destinationViewController)
         destinationViewController.view.frame.origin.y = self.presenting ? transitionContext.containerView.bounds.height : -destinationViewController.view.bounds.height

Delta/Settings/ControllersSettingsViewController.swift

@@ -39,9 +39,9 @@ class ControllersSettingsViewController: UITableViewController
         }
     }
     
-    private var connectedControllers = ExternalControllerManager.shared.connectedControllers.sorted(by: { $0.playerIndex ?? NSIntegerMax < $1.playerIndex ?? NSIntegerMax })
+    fileprivate var connectedControllers = ExternalControllerManager.shared.connectedControllers.sorted(by: { $0.playerIndex ?? NSIntegerMax < $1.playerIndex ?? NSIntegerMax })
     
-    private lazy var localDeviceController: LocalDeviceController = {
+    fileprivate lazy var localDeviceController: LocalDeviceController = {
         let device = LocalDeviceController()
         device.playerIndex = Settings.localControllerPlayerIndex