Updated to the latest Swift syntax

Author: Robert Gummesson

BuildTimeAnalyzer.xcodeproj/project.pbxproj

@@ -252,7 +252,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0730;
-				LastUpgradeCheck = 0900;
+				LastUpgradeCheck = 0930;
 				ORGANIZATIONNAME = "Cane Media Ltd";
 				TargetAttributes = {
 					2AF8213F1D21D6B900D65186 = {
@@ -362,12 +362,14 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -415,12 +417,14 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;

BuildTimeAnalyzer.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

BuildTimeAnalyzer.xcodeproj/xcshareddata/xcschemes/BuildTimeAnalyzer.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "0930"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
@@ -56,7 +55,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

BuildTimeAnalyzer/CompileMeasure.swift

@@ -43,7 +43,7 @@ import Foundation
             let filename = untrimmedFilename?.split(separator: ":").map(String.init).first else { return nil }
 
         let locationString = String(rawPath[filepath.endIndex...].dropFirst())
-        let locations = locationString.split(separator: ":").flatMap{ Int(String.init($0)) }
+        let locations = locationString.split(separator: ":").compactMap{ Int(String.init($0)) }
         guard locations.count == 2 else { return nil }
 
         self.time = time

BuildTimeAnalyzer/DerivedDataManager.swift

@@ -13,7 +13,7 @@ class DerivedDataManager {
         let folders = DerivedDataManager.listFolders(at: url)
         let fileManager = FileManager.default
 
-        return folders.flatMap{ (url) -> File? in
+        return folders.compactMap{ (url) -> File? in
             if url.lastPathComponent != "ModuleCache",
                 let properties = try? fileManager.attributesOfItem(atPath: url.path),
                 let modificationDate = properties[FileAttributeKey.modificationDate] as? Date {

BuildTimeAnalyzer/ProjectSelection.swift

@@ -14,17 +14,17 @@ class ProjectSelection: NSObject {
     @IBOutlet weak var tableView: NSTableView!
     weak var delegate: ProjectSelectionDelegate?
 
-    fileprivate var dataSource: [XcodeDatabase] = []
+    private var dataSource: [XcodeDatabase] = []
 
-    static fileprivate let dateFormatter: DateFormatter = {
+    static private let dateFormatter: DateFormatter = {
         let dateFormatter = DateFormatter()
         dateFormatter.timeStyle = .short
         dateFormatter.dateStyle = .medium
         return dateFormatter
     }()
 
     func listFolders() {
-        dataSource = DerivedDataManager.derivedData().flatMap{
+        dataSource = DerivedDataManager.derivedData().compactMap{
             XcodeDatabase(fromPath: $0.url.appendingPathComponent("Logs/Build/Cache.db").path)
         }.sorted(by: { $0.modificationDate > $1.modificationDate })
 

BuildTimeAnalyzer/ViewController.swift

@@ -22,7 +22,7 @@ class ViewController: NSViewController {
     @IBOutlet weak var tableView: NSTableView!
     @IBOutlet weak var tableViewContainerView: NSScrollView!
 
-    fileprivate let dataSource = ViewControllerDataSource()
+    private let dataSource = ViewControllerDataSource()
 
     private var currentKey: String?
     private var nextDatabase: XcodeDatabase?

BuildTimeAnalyzer/ViewControllerDataSource.swift

@@ -28,8 +28,8 @@ class ViewControllerDataSource {
         }
     }
 
-    fileprivate var originalData = [CompileMeasure]()
-    fileprivate var processedData = [CompileMeasure]()
+    private var originalData = [CompileMeasure]()
+    private var processedData = [CompileMeasure]()
 
     func resetSourceData(newSourceData: [CompileMeasure]) {
         originalData = newSourceData