From d295b80eaba0efb4463af6df6e6829d314babbb7 Mon Sep 17 00:00:00 2001 From: Charles Magahern Date: Mon, 4 Sep 2017 18:31:34 -0700 Subject: [PATCH] Last remaining fixes for swift 3 --- XIONControlPanel.xcodeproj/project.pbxproj | 4 +++- .../Controllers/VisualizationViewController.swift | 2 +- XIONControlPanel/Controllers/WemoServer.swift | 6 +++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/XIONControlPanel.xcodeproj/project.pbxproj b/XIONControlPanel.xcodeproj/project.pbxproj index f5e5097..1488682 100644 --- a/XIONControlPanel.xcodeproj/project.pbxproj +++ b/XIONControlPanel.xcodeproj/project.pbxproj @@ -247,7 +247,7 @@ TargetAttributes = { 0C3CAEA31C3350C800B856AD = { CreatedOnToolsVersion = 7.2; - DevelopmentTeam = 64S2YWUDC5; + DevelopmentTeam = FZ6BMA5HA9; LastSwiftMigration = 0810; }; }; @@ -421,6 +421,7 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + DEVELOPMENT_TEAM = FZ6BMA5HA9; INFOPLIST_FILE = "$(SRCROOT)/XIONControlPanel/SupportingFiles/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LIBRARY_SEARCH_PATHS = ( @@ -443,6 +444,7 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + DEVELOPMENT_TEAM = FZ6BMA5HA9; INFOPLIST_FILE = "$(SRCROOT)/XIONControlPanel/SupportingFiles/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LIBRARY_SEARCH_PATHS = ( diff --git a/XIONControlPanel/Controllers/VisualizationViewController.swift b/XIONControlPanel/Controllers/VisualizationViewController.swift index b94a489..457595f 100644 --- a/XIONControlPanel/Controllers/VisualizationViewController.swift +++ b/XIONControlPanel/Controllers/VisualizationViewController.swift @@ -34,7 +34,7 @@ class VisualizationViewController: UIViewController override func loadView() { - let opts = [SCNView.Option.preferredRenderingAPI.rawValue : SCNRenderingAPI.openGLES2] + let opts = [SCNView.Option.preferredRenderingAPI.rawValue : SCNRenderingAPI.openGLES2.rawValue] let view = SCNView(frame: UIScreen.main.bounds, options: opts) view.backgroundColor = UIColor.black view.scene = _scene diff --git a/XIONControlPanel/Controllers/WemoServer.swift b/XIONControlPanel/Controllers/WemoServer.swift index 1d3b319..9c74fb6 100644 --- a/XIONControlPanel/Controllers/WemoServer.swift +++ b/XIONControlPanel/Controllers/WemoServer.swift @@ -156,14 +156,14 @@ internal class FetchDevicesOperation : WemoOperation { let semaphore = Semaphore(value: 0) let url = self.baseURL.appendingPathComponent("api/environment") - let task = self.session.dataTask(with: url, completionHandler: { (data: Data?, response: URLResponse?, error: NSError?) -> Void in + let task = self.session.dataTask(with: url, completionHandler: { (data: Data?, response: URLResponse?, error: Error?) -> Void in if (data != nil) { self.devices = self._parseDevices(data!) } else { - self.error = NSError.xionError(.connectionError, underlying: error) + self.error = error } semaphore.signal() - } as! (Data?, URLResponse?, Error?) -> Void) + }) task.resume() semaphore.wait() }