Skip to content

Commit d3fff9e

Browse files
author
Wendy Liga
committed
migrate to swift 5
1 parent df14cd3 commit d3fff9e

File tree

3 files changed

+10
-9
lines changed

3 files changed

+10
-9
lines changed

BuildTimeAnalyzer.xcodeproj/project.pbxproj

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -257,11 +257,11 @@
257257
TargetAttributes = {
258258
2AF8213F1D21D6B900D65186 = {
259259
CreatedOnToolsVersion = 7.3.1;
260-
LastSwiftMigration = 0900;
260+
LastSwiftMigration = 1020;
261261
};
262262
2AF8214E1D21D6B900D65186 = {
263263
CreatedOnToolsVersion = 7.3.1;
264-
LastSwiftMigration = 0900;
264+
LastSwiftMigration = 1020;
265265
TestTargetID = 2AF8213F1D21D6B900D65186;
266266
};
267267
};
@@ -271,6 +271,7 @@
271271
developmentRegion = English;
272272
hasScannedForEncodings = 0;
273273
knownRegions = (
274+
English,
274275
en,
275276
Base,
276277
);
@@ -462,7 +463,7 @@
462463
PRODUCT_BUNDLE_IDENTIFIER = uk.co.canemedia.BuildTimeAnalyzer;
463464
PRODUCT_NAME = "$(TARGET_NAME)";
464465
SWIFT_OBJC_BRIDGING_HEADER = "BuildTimeAnalyzerTests-Bridging-Header.h";
465-
SWIFT_VERSION = 4.0;
466+
SWIFT_VERSION = 5.0;
466467
};
467468
name = Debug;
468469
};
@@ -476,7 +477,7 @@
476477
PRODUCT_BUNDLE_IDENTIFIER = uk.co.canemedia.BuildTimeAnalyzer;
477478
PRODUCT_NAME = "$(TARGET_NAME)";
478479
SWIFT_OBJC_BRIDGING_HEADER = "BuildTimeAnalyzerTests-Bridging-Header.h";
479-
SWIFT_VERSION = 4.0;
480+
SWIFT_VERSION = 5.0;
480481
};
481482
name = Release;
482483
};
@@ -492,7 +493,7 @@
492493
PRODUCT_NAME = "$(TARGET_NAME)";
493494
SWIFT_OBJC_BRIDGING_HEADER = "BuildTimeAnalyzerTests-Bridging-Header.h";
494495
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
495-
SWIFT_VERSION = 4.0;
496+
SWIFT_VERSION = 5.0;
496497
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/BuildTimeAnalyzer.app/Contents/MacOS/BuildTimeAnalyzer";
497498
};
498499
name = Debug;
@@ -508,7 +509,7 @@
508509
PRODUCT_BUNDLE_IDENTIFIER = uk.co.canemedia.BuildTimeAnalyzerTests;
509510
PRODUCT_NAME = "$(TARGET_NAME)";
510511
SWIFT_OBJC_BRIDGING_HEADER = "BuildTimeAnalyzerTests-Bridging-Header.h";
511-
SWIFT_VERSION = 4.0;
512+
SWIFT_VERSION = 5.0;
512513
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/BuildTimeAnalyzer.app/Contents/MacOS/BuildTimeAnalyzer";
513514
};
514515
name = Release;

BuildTimeAnalyzer/ProjectSelection.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ extension ProjectSelection: NSTableViewDataSource {
5252
extension ProjectSelection: NSTableViewDelegate {
5353

5454
func tableView(_ tableView: NSTableView, viewFor tableColumn: NSTableColumn?, row: Int) -> NSView? {
55-
guard let tableColumn = tableColumn, let columnIndex = tableView.tableColumns.index(of: tableColumn) else { return nil }
55+
guard let tableColumn = tableColumn, let columnIndex = tableView.tableColumns.firstIndex(of: tableColumn) else { return nil }
5656

5757
let cellView = tableView.makeView(withIdentifier: NSUserInterfaceItemIdentifier(rawValue: "Cell\(columnIndex)"), owner: self) as? NSTableCellView
5858

BuildTimeAnalyzer/ViewController.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ class ViewController: NSViewController {
162162
projectSelection.listFolders()
163163
}
164164

165-
override func controlTextDidChange(_ obj: Notification) {
165+
func controlTextDidChange(_ obj: Notification) {
166166
if let field = obj.object as? NSSearchField, field == searchField {
167167
dataSource.filter = searchField.stringValue
168168
tableView.reloadData()
@@ -288,7 +288,7 @@ extension ViewController: NSTableViewDataSource {
288288

289289
extension ViewController: NSTableViewDelegate {
290290
func tableView(_ tableView: NSTableView, viewFor tableColumn: NSTableColumn?, row: Int) -> NSView? {
291-
guard let tableColumn = tableColumn, let columnIndex = tableView.tableColumns.index(of: tableColumn) else { return nil }
291+
guard let tableColumn = tableColumn, let columnIndex = tableView.tableColumns.firstIndex(of: tableColumn) else { return nil }
292292
guard let item = dataSource.measure(index: row) else { return nil }
293293

294294
let result = tableView.makeView(withIdentifier: NSUserInterfaceItemIdentifier(rawValue: "Cell\(columnIndex)"), owner: self) as? NSTableCellView

0 commit comments

Comments
 (0)