Target to swift 4.2

aisk · Oct 13, 2018 · 5b0befd · 5b0befd
1 parent 67f9f12
commit 5b0befd
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/MySensors.xcodeproj/project.pbxproj b/MySensors.xcodeproj/project.pbxproj
@@ -93,6 +93,7 @@
 				TargetAttributes = {
 					479D566E1D97A76D00713B6E = {
 						CreatedOnToolsVersion = 8.0;
+						LastSwiftMigration = 1000;
 						ProvisioningStyle = Automatic;
 					};
 				};
@@ -250,7 +251,8 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = me.aisk.MySensors;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -263,7 +265,8 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = me.aisk.MySensors;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};

diff --git a/MySensors/AppDelegate.swift b/MySensors/AppDelegate.swift
@@ -21,10 +21,10 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
             let alert = NSAlert()
             alert.messageText = "initailize SMC failed!"
             alert.runModal()
-            NSApplication.shared().terminate(self)
+            NSApplication.shared.terminate(self)
         }
 
-        statusItem = NSStatusBar.system().statusItem(withLength: NSSquareStatusItemLength)
+        statusItem = NSStatusBar.system.statusItem(withLength: NSStatusItem.squareLength)
         let icon = NSImage(named: "ic_memory")
         icon?.isTemplate = true
         statusItem.image = icon
@@ -36,8 +36,8 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
         let _ = SMCKit.close()
     }
 
-    func onQuitMenuItemClicked(_ sender: NSMenuItem) {
-        NSApplication.shared().terminate(self)
+    @objc func onQuitMenuItemClicked(_ sender: NSMenuItem) {
+        NSApplication.shared.terminate(self)
     }
 
     func menuWillOpen(_ menu: NSMenu) {