Merge branch 'adapt-xcode-7.3'

wangshengjia · Mar 24, 2016 · 3df65e3 · 3df65e3
2 parents 8d4baa2 + 65df236
commit 3df65e3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/VWInstantRun/Info.plist b/VWInstantRun/Info.plist
@@ -37,6 +37,7 @@
 		<string>7FDF5C7A-131F-4ABB-9EDC-8C5F8F0B8A90</string>
 		<string>0420B86A-AA43-4792-9ED0-6FE0F2B16A13</string>
 		<string>7265231C-39B4-402C-89E1-16167C4CC990</string>
+		<string>ACA8656B-FEA8-4B6D-8E4A-93F4C95C362C</string>
 	</array>
 	<key>LSMinimumSystemVersion</key>
 	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>

diff --git a/VWInstantRun/VWInstantRun.swift b/VWInstantRun/VWInstantRun.swift
@@ -21,7 +21,7 @@ class VWInstantRun: NSObject {
         self.bundle = bundle
 
         super.init()
-        center.addObserver(self, selector: Selector("createMenuItems"), name: NSApplicationDidFinishLaunchingNotification, object: nil)
+        center.addObserver(self, selector: #selector(VWInstantRun.createMenuItems), name: NSApplicationDidFinishLaunchingNotification, object: nil)
     }
 
     deinit {
@@ -37,7 +37,7 @@ class VWInstantRun: NSObject {
 
         let item = NSApp.mainMenu?.itemWithTitle("Product")
         if item != nil {
-            let actionMenuItem = NSMenuItem(title:"Instant Run", action:"instantRun", keyEquivalent:"")
+            let actionMenuItem = NSMenuItem(title:"Instant Run", action:#selector(VWInstantRun.instantRun), keyEquivalent:"")
             actionMenuItem.keyEquivalentModifierMask = Int(NSEventModifierFlags.ShiftKeyMask.rawValue | NSEventModifierFlags.CommandKeyMask.rawValue | NSEventModifierFlags.AlternateKeyMask.rawValue)
             actionMenuItem.keyEquivalent = "R"
             actionMenuItem.target = self

diff --git a/VWInstantRun/VWXcodeHelpers.swift b/VWInstantRun/VWXcodeHelpers.swift
@@ -30,7 +30,7 @@ struct VWXcodeHelpers {
         textStorage.beginEditing()
         textStorage.appendAttributedString(NSAttributedString(string: logText, attributes: attibutes))
         textStorage.endEditing()
-        consoleTextView.performSelector("_scrollToBottom")
+        consoleTextView.performSelector(Selector("_scrollToBottom"))
     }
 
     static func isObjCFile() -> Bool {
@@ -95,7 +95,7 @@ extension VWXcodeHelpers {
     private static func showDebugAreaIfNeeded(inWindow window: NSWindow? = NSApp.mainWindow) {
         if let editor = xcodeEditorArea(),
             let showDebuggerArea = editor.valueForKey("showDebuggerArea") as? Bool where showDebuggerArea == false {
-                editor.performSelector("toggleDebuggerVisibility:")
+                editor.performSelector(Selector("toggleDebuggerVisibility:"))
         }
     }