Skip to content

Commit 0d9a90c

Browse files
author
Bennett Yuan
committed
Upgrade to Swift 5
1 parent b6ef6bf commit 0d9a90c

2 files changed

Lines changed: 10 additions & 9 deletions

File tree

MissionControl.xcodeproj/project.pbxproj

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -400,11 +400,11 @@
400400
};
401401
8B63137A1CE5F9A10029DC98 = {
402402
CreatedOnToolsVersion = 7.3.1;
403-
LastSwiftMigration = 0800;
403+
LastSwiftMigration = 1020;
404404
};
405405
8B6313841CE5F9A10029DC98 = {
406406
CreatedOnToolsVersion = 7.3.1;
407-
LastSwiftMigration = 0800;
407+
LastSwiftMigration = 1020;
408408
};
409409
};
410410
};
@@ -413,6 +413,7 @@
413413
developmentRegion = English;
414414
hasScannedForEncodings = 0;
415415
knownRegions = (
416+
English,
416417
en,
417418
);
418419
mainGroup = 8B6313711CE5F9A10029DC98;
@@ -875,7 +876,7 @@
875876
PRODUCT_NAME = MissionControl;
876877
SKIP_INSTALL = YES;
877878
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
878-
SWIFT_VERSION = 3.0;
879+
SWIFT_VERSION = 5.0;
879880
};
880881
name = Debug;
881882
};
@@ -896,7 +897,7 @@
896897
PRODUCT_NAME = MissionControl;
897898
SKIP_INSTALL = YES;
898899
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
899-
SWIFT_VERSION = 3.0;
900+
SWIFT_VERSION = 5.0;
900901
};
901902
name = Release;
902903
};
@@ -907,7 +908,7 @@
907908
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
908909
PRODUCT_BUNDLE_IDENTIFIER = com.appculture.MissionControlTests;
909910
PRODUCT_NAME = "$(TARGET_NAME)";
910-
SWIFT_VERSION = 3.0;
911+
SWIFT_VERSION = 5.0;
911912
};
912913
name = Debug;
913914
};
@@ -919,7 +920,7 @@
919920
PRODUCT_BUNDLE_IDENTIFIER = com.appculture.MissionControlTests;
920921
PRODUCT_NAME = "$(TARGET_NAME)";
921922
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
922-
SWIFT_VERSION = 3.0;
923+
SWIFT_VERSION = 5.0;
923924
};
924925
name = Release;
925926
};

Tests/MissionControlTests.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ class MissionControlTests: XCTestCase, MissionControlDelegate {
241241
func confirmRemoteConfigStateAfterNotification(_ notification: String) {
242242
confirmDidRefreshConfigDelegateCallback()
243243

244-
let _ = expectation(forNotification: notification, object: nil) { (notification) -> Bool in
244+
let _ = expectation(forNotification: NSNotification.Name(rawValue: notification), object: nil) { (notification) -> Bool in
245245
self.confirmRemoteConfigState()
246246
return true
247247
}
@@ -378,7 +378,7 @@ class MissionControlTests: XCTestCase, MissionControlDelegate {
378378
MissionControl.launch(remoteConfigURL: URL.RemoteTestConfig)
379379

380380
let notification = MissionControl.Notification.DidRefreshConfig
381-
let _ = expectation(forNotification: notification, object: nil) { (notification) -> Bool in
381+
let _ = expectation(forNotification: NSNotification.Name(rawValue: notification), object: nil) { (notification) -> Bool in
382382
ACMissionControl.shared.resetRemote()
383383
self.confirmCachedConfigState()
384384
return true
@@ -446,7 +446,7 @@ class MissionControlTests: XCTestCase, MissionControlDelegate {
446446
confirmDidFailRefreshingConfigDelegateCallback()
447447

448448
let notification = MissionControl.Notification.DidFailRefreshingConfig
449-
let _ = expectation(forNotification: notification, object: nil) { (notification) -> Bool in
449+
let _ = expectation(forNotification: NSNotification.Name(rawValue: notification), object: nil) { (notification) -> Bool in
450450
guard let errorInfo = notification.userInfo?["Error"] as? String else { return false }
451451
XCTAssertEqual("\(errorInfo)", "\(error)", message)
452452
self.confirmInitialState()

0 commit comments

Comments
 (0)