Modernize

ACEView

@@ -1 +1 @@
-Subproject commit 36ad10e4a47110430f1d377571b4fd74cee05c21
+Subproject commit 6928d3ce726e118924752cb8a636732b257e87cd

AVRsack.xcodeproj/project.pbxproj

@@ -539,7 +539,7 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
-				SDKROOT = macosx;
+				SDKROOT = macosx10.13;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 			};
 			name = Debug;
@@ -577,7 +577,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				MTL_ENABLE_DEBUG_INFO = NO;
-				SDKROOT = macosx;
+				SDKROOT = macosx10.13;
 			};
 			name = Release;
 		};

AVRsack/ASApplication.swift

@@ -29,17 +29,17 @@ class ASApplication: NSObject, NSApplicationDelegate, NSMenuDelegate {
         let workSpace       = NSWorkspace.shared()
         let userDefaults    = UserDefaults.standard
         let appDefaultsURL  = Bundle.main.url(forResource: "Defaults", withExtension: "plist")!
-        var appDefaults     = NSDictionary(contentsOfURL: appDefaultsURL) as! [String: AnyObject]
+        var appDefaults     = NSDictionary(contentsOf: appDefaultsURL) as! [String: Any]
         //
         // Add dynamic app defaults
         //
         if let arduinoPath = workSpace.urlForApplication(withBundleIdentifier: "cc.arduino.Arduino")?.path {
             appDefaults["Arduino"]      = arduinoPath
         }
-        var sketchbooks             = [NSString]()
+        var sketchbooks             = [String]()
         for doc in fileManager.urls(for: .documentDirectory, in: .userDomainMask) {
-            sketchbooks.append(doc.URLByAppendingPathComponent("Arduino").path!)
-            sketchbooks.append(doc.URLByAppendingPathComponent("AVRSack").path!)
+            sketchbooks.append(doc.appendingPathComponent("Arduino").path)
+            sketchbooks.append(doc.appendingPathComponent("AVRSack").path)
         }
         appDefaults["Sketchbooks"]  = sketchbooks
         if fileManager.fileExists(atPath: "/usr/local/CrossPack-AVR") {
@@ -75,16 +75,18 @@ class ASApplication: NSObject, NSApplicationDelegate, NSMenuDelegate {
             sketches = [String]()
             for sketchBook in UserDefaults.standard.object(forKey:"Sketchbooks") as! [String] {
                 if FileManager.default.fileExists(atPath: sketchBook) {
-                    ASSketchBook.addSketches(menu: menu, target: self, action: Selector(("openSketch:")), path: sketchBook, sketches: &sketches)
+                    ASSketchBook.addSketches(menu: menu, target: self, action: #selector(ASApplication.openSketch(_:)), path: sketchBook, sketches: &sketches)
                 }
             }
         case "Examples":
             menu.removeAllItems()
             examples = [String]()
             if let arduinoURL = NSWorkspace.shared().urlForApplication(withBundleIdentifier: "cc.arduino.Arduino") {
-                let examplePath = arduinoURL.URLByAppendingPathComponent("Contents/Resources/Java/examples", isDirectory:true).path!
-                ASSketchBook.addSketches(menu, target: self, action: "openExample:", path: examplePath, sketches: &examples)
+                let examplePath = arduinoURL.appendingPathComponent("Contents/Resources/Java/examples", isDirectory:true).path
+                ASSketchBook.addSketches(menu: menu, target: self, action: #selector(ASApplication.openExample(_:)), path: examplePath, sketches: &examples)
             }
+            ASLibraries.instance().addContribLibraryExamplesToMenu(menu: menu, sketches: &examples)
+            ASLibraries.instance().addStandardLibraryExamplesToMenu(menu: menu, sketches: &examples)
         case "Import Standard Library":
             menu.removeAllItems()
             ASLibraries.instance().addStandardLibrariesToMenu(menu: menu)
@@ -97,18 +99,18 @@ class ASApplication: NSObject, NSApplicationDelegate, NSMenuDelegate {
                 menu.removeItem(at: 2)
             }
             for port in ASSerial.ports() {
-                menu.addItem(withTitle: port, action:Selector(("serialConnectMenu:")), keyEquivalent:"")
+                menu.addItem(withTitle: port, action:#selector(ASApplication.serialConnectMenu(_:)), keyEquivalent:"")
             }
         default:
             break
         }
     }
 
-    @IBAction func serialConnectMenu(port: NSMenuItem) {
+    @IBAction func serialConnectMenu(_ port: NSMenuItem) {
         ASSerialWin.showWindowWithPort(port: port.title)
     }
 
-    func openTemplate(template: NSURL, fromReadOnly: Bool) {
+    func openTemplate(template: URL, fromReadOnly: Bool) {
         let editable : String
         if fromReadOnly {
             editable = "editable "
@@ -116,31 +118,31 @@ class ASApplication: NSObject, NSApplicationDelegate, NSMenuDelegate {
             editable = ""
         }
         ASApplication.newProjectLocation(documentWindow: nil,
-            message: "Save \(editable)copy of project \(template.lastPathComponent!)")
+            message: "Save \(editable)copy of project \(template.lastPathComponent)")
         { (saveTo) -> Void in
-            let oldName     = template.lastPathComponent!
-            let newName     = saveTo.lastPathComponent!
+            let oldName     = template.lastPathComponent
+            let newName     = saveTo.lastPathComponent
             let fileManager = FileManager.default
             do {
-                try fileManager.copyItemAtURL(template, toURL: saveTo)
-                let contents = fileManager.enumeratorAtURL(saveTo,
+                try fileManager.copyItem(at: template, to: saveTo)
+                let contents = fileManager.enumerator(at: saveTo,
                     includingPropertiesForKeys: [URLResourceKey.nameKey, URLResourceKey.pathKey],
-                    options: .SkipsHiddenFiles, errorHandler: nil)
-                while let item = contents?.nextObject() as? NSURL {
-                    let itemBase   = item.URLByDeletingPathExtension?.lastPathComponent!
+                    options: .skipsHiddenFiles, errorHandler: nil)
+                while let item = contents?.nextObject() as? URL {
+                    let itemBase   = item.deletingPathExtension().lastPathComponent
                     if itemBase == oldName {
-                        let newItem = item.URLByDeletingLastPathComponent!.URLByAppendingPathComponent(
-                            newName).URLByAppendingPathExtension(item.pathExtension!)
-                        try fileManager.moveItemAtURL(item, toURL: newItem)
+                        let newItem = item.deletingLastPathComponent().appendingPathComponent(
+                            newName).appendingPathExtension(item.pathExtension)
+                        try fileManager.moveItem(at: item, to: newItem)
                     }
                 }
             } catch (_) {
             }
-            let sketch = ASSketchBook.findSketch(path: saveTo.path!)
+            let sketch = ASSketchBook.findSketch(path: saveTo.path)
             switch sketch {
             case .Sketch(_, let path):
                 let doc = NSDocumentController.shared()
-                doc.openDocumentWithContentsOfURL(NSURL(fileURLWithPath: path), display: true) { (doc, alreadyOpen, error) -> Void in
+                doc.openDocument(withContentsOf: URL(fileURLWithPath: path), display: true) { (doc, alreadyOpen, error) -> Void in
                 }
             default:
                 break
@@ -148,14 +150,14 @@ class ASApplication: NSObject, NSApplicationDelegate, NSMenuDelegate {
         }
     }
     
-    @IBAction func openSketch(item: NSMenuItem) {
-        let url = NSURL(fileURLWithPath: sketches[item.tag])
+    @IBAction func openSketch(_ item: NSMenuItem) {
+        let url = URL(fileURLWithPath: sketches[item.tag])
         let doc = NSDocumentController.shared()
-        doc.openDocumentWithContentsOfURL(url, display: true) { (doc, alreadyOpen, error) -> Void in
+        doc.openDocument(withContentsOf: url, display: true) { (doc, alreadyOpen, error) -> Void in
         }
     }
     
-    @IBAction func openExample(item: NSMenuItem) {
+    @IBAction func openExample(_ item: NSMenuItem) {
         let url = NSURL(fileURLWithPath: examples[item.tag])
         openTemplate(template: url.deletingLastPathComponent!, fromReadOnly:true)
     }
@@ -164,23 +166,23 @@ class ASApplication: NSObject, NSApplicationDelegate, NSMenuDelegate {
         ASApplication.newProjectLocation(documentWindow: nil,
             message: "Create Project")
         { (saveTo) -> Void in
-            let fileManager = FileManager.defaultManager()
+            let fileManager = FileManager.default
             do {
-                try fileManager.createDirectoryAtURL(saveTo, withIntermediateDirectories:false, attributes:nil)
-                let proj            = saveTo.appendingPathComponent(saveTo.lastPathComponent!+".avrsackproj")
+                try fileManager.createDirectory(at: saveTo, withIntermediateDirectories:false, attributes:nil)
+                let proj            = saveTo.appendingPathComponent(saveTo.lastPathComponent+".avrsackproj")
                 let docController   = NSDocumentController.shared()
                 if let doc = try docController.openUntitledDocumentAndDisplay(true) as? ASProjDoc {
                     doc.fileURL = proj
                     doc.updateProjectURL()
-                    doc.createFileAtURL(url: saveTo.URLByAppendingPathComponent(saveTo.lastPathComponent!+".ino"))
-                    try doc.writeToURL(proj, ofType: "Project", forSaveOperation: .SaveAsOperation, originalContentsURL: nil)
+                    doc.createFileAtURL(url: saveTo.appendingPathComponent(saveTo.lastPathComponent+".ino"))
+                    try doc.write(to: proj, ofType: "Project", for: .saveAsOperation, originalContentsURL: nil)
                 }
             } catch _ {
             }
         }
     }
     
-    class func newProjectLocation(documentWindow: NSWindow?, message: String, completion: (NSURL) -> ()) {
+    class func newProjectLocation(documentWindow: NSWindow?, message: String, completion: @escaping (URL) -> ()) {
         let savePanel                       = NSSavePanel()
         savePanel.allowedFileTypes          = [kUTTypeFolder as String]
         savePanel.message                   = message
@@ -199,19 +201,19 @@ class ASApplication: NSObject, NSApplicationDelegate, NSMenuDelegate {
         }
     }
 
-    @IBAction func goToHelpPage(sender: AnyObject) {
-        let helpString: String
+    @IBAction func goToHelpPage(_ sender: AnyObject) {
+        let helpString: CFString
         switch sender.tag {
         case 0:
-            helpString = "license.html"
+            helpString = "license.html" as CFString
         default:
             abort()
         }
-        let locBookName = Bundle.main.object(forInfoDictionaryKey: "CFBundleHelpBookName") as! String
+        let locBookName = Bundle.main.object(forInfoDictionaryKey: "CFBundleHelpBookName") as! CFString
         AHGotoPage(locBookName, helpString, nil)
     }
 
-    @IBAction func goToHelpURL(sender: AnyObject) {
+    @IBAction func goToHelpURL(_ sender: AnyObject) {
         let helpString: String
         switch sender.tag {
         case 0:
@@ -219,7 +221,7 @@ class ASApplication: NSObject, NSApplicationDelegate, NSMenuDelegate {
         default:
             abort()
         }
-        NSWorkspace.sharedWorkspace().openURL(NSURL(string: helpString)!)
+        NSWorkspace.shared().open(URL(string: helpString)!)
     }
 }
 

AVRsack/ASBuilder.swift

@@ -9,16 +9,16 @@
 import Foundation
 
 class ASBuilder {
-    var dir         = NSURL()
-    var task        : Task?
+    var dir         = URL(fileURLWithPath: "/")
+    var task        : Process?
     var continuation: (()->())?
     var termination : AnyObject?
     
     init() {
-        termination = NotificationCenter.default.addObserver(forName: Task.didTerminateNotification,
+        termination = NotificationCenter.default.addObserver(forName: Process.didTerminateNotification,
                                                                    object: nil, queue: nil, using:
         { (notification: Notification) in
-            if notification.object as? Task == self.task {
+            if notification.object as? Process == self.task {
                 if self.task!.terminationStatus == 0 {
                     if let cont = self.continuation {
                         self.continuation = nil
@@ -34,8 +34,8 @@ class ASBuilder {
         NotificationCenter.default.removeObserver(termination!)
     }
     
-    func setProjectURL(url: NSURL) {
-        dir       = url.URLByDeletingLastPathComponent!.URLByStandardizingPath!
+    func setProjectURL(url: URL) {
+        dir       = url.deletingLastPathComponent().standardizedFileURL
     }
 
     func stop() {
@@ -45,15 +45,15 @@ class ASBuilder {
     
     func cleanProject() {
         do {
-            try FileManager.default.removeItem(at: dir.appendingPathComponent("build")!)
+            try FileManager.default.removeItem(at: dir.appendingPathComponent("build"))
         } catch _ {
         }
     }
     
     func buildProject(board: String, files: ASFileTree) {
         let toolChain               = (NSApplication.shared().delegate as! ASApplication).preferences.toolchainPath
-        task = Task()
-        task!.currentDirectoryPath  = dir.path!
+        task = Process()
+        task!.currentDirectoryPath  = dir.path
         task!.launchPath            = Bundle.main.path(forResource: "BuildProject", ofType: "")!
         
         let fileManager = FileManager.default
@@ -81,7 +81,7 @@ class ASBuilder {
             return
         }
         args.append("toolchain="+toolChain)
-        args.append("project="+dir.lastPathComponent!)
+        args.append("project="+dir.lastPathComponent)
         args.append("board="+board)
         args.append("mcu="+boardProp["build.mcu"]!)
         args.append("f_cpu="+boardProp["build.f_cpu"]!)
@@ -111,8 +111,8 @@ class ASBuilder {
         let interactive             = mode == .Interactive
         let portPath                = ASSerial.fileName(forPort: port)
         let toolChain               = (NSApplication.shared().delegate as! ASApplication).preferences.toolchainPath
-        task = Task()
-        task!.currentDirectoryPath  = dir.path!
+        task = Process()
+        task!.currentDirectoryPath  = dir.path
         task!.launchPath            = toolChain+"/bin/avrdude"
         
         let fileManager = FileManager.default
@@ -127,8 +127,8 @@ class ASBuilder {
         } else {
             ASSerialWin.portNeededForUpload(port: port)
             let logURL              = dir.appendingPathComponent("build/upload.log")
-            fileManager.createFileAtPath(logURL.path, contents: NSData(), attributes: nil)
-            logOut                  = FileHandle(forWritingAtPath: logURL.path!)!
+            fileManager.createFile(atPath: logURL.path, contents: Data(), attributes: nil)
+            logOut                  = FileHandle(forWritingAtPath: logURL.path)!
             task!.standardOutput    = logOut
             task!.standardError     = logOut
         }
@@ -147,16 +147,16 @@ class ASBuilder {
         var args            = Array<String>(repeating: "-v", count: verbosity)
         args               += [
             "-C", toolChain+"/etc/avrdude.conf",
-            "-p", boardProp["build.mcu"]!, "-c", proto!, "-P", portPath]
+            "-p", boardProp["build.mcu"]!, "-c", proto!, "-P", portPath!]
         switch mode {
         case .Upload:
             if hasBootloader {
                 args      += ["-D"]
             }
-            args          += ["-U", "flash:w:build/"+board+"/"+dir.lastPathComponent!+".hex:i"]
+            args          += ["-U", "flash:w:build/"+board+"/"+dir.lastPathComponent+".hex:i"]
             continuation   = {
-                dispatch_after(dispatch_time(DISPATCH_TIME_NOW, Int64(2*NSEC_PER_SEC)), dispatch_get_main_queue(), {
-                    ASSerialWin.portAvailableAfterUpload(port)
+                DispatchQueue.main.asyncAfter(deadline: .now() + 2.0, execute: {
+                    ASSerialWin.portAvailableAfterUpload(port: port)
                 })
             }
         case .BurnBootloader:
@@ -182,8 +182,8 @@ class ASBuilder {
                 needPhase2  = true
             }
             if needPhase2 {
-                let task2 = Task()
-                task2.currentDirectoryPath = dir.path!
+                let task2 = Process()
+                task2.currentDirectoryPath = dir.path
                 task2.launchPath           = toolChain+"/bin/avrdude"
                 task2.arguments            = loaderArgs
                 task2.standardOutput       = logOut
@@ -193,8 +193,8 @@ class ASBuilder {
                     logOut.write(cmdLine.data(using: String.Encoding.utf8, allowLossyConversion: true)!)
                     task2.launch()
                     self.continuation = {
-                        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, Int64(2*NSEC_PER_SEC)), dispatch_get_main_queue(), {
-                            ASSerialWin.portAvailableAfterUpload(port)
+                        DispatchQueue.main.asyncAfter(deadline: .now() + 2.0, execute: {
+                            ASSerialWin.portAvailableAfterUpload(port: port)
                         })
                     }
                 }
@@ -220,7 +220,7 @@ class ASBuilder {
                 sleep(1)
                 for retry in 0 ..< 40 {
                     usleep(250000)
-                    if (fileManager.fileExistsAtPath(portPath)) {
+                    if (fileManager.fileExists(atPath: portPath!)) {
                         if verbosity > 0 {
                             logOut.write("Found port \(port) after \(retry) attempts.\n".data(using: String.Encoding.utf8, allowLossyConversion: true)!)
                         }
@@ -242,22 +242,22 @@ class ASBuilder {
     
     func disassembleProject(board: String) {
         let toolChain               = (NSApplication.shared().delegate as! ASApplication).preferences.toolchainPath
-        task = Task()
-        task!.currentDirectoryPath  = dir.path!
+        task = Process()
+        task!.currentDirectoryPath  = dir.path
         task!.launchPath            = toolChain+"/bin/avr-objdump"
         
         let fileManager         = FileManager.default
         let logURL              = dir.appendingPathComponent("build/disasm.log")
-        fileManager.createFileAtPath(logURL.path!, contents: NSData(), attributes: nil)
-        let logOut              = FileHandle(forWritingAtPath: logURL.path!)!
+        fileManager.createFile(atPath: logURL.path, contents: Data(), attributes: nil)
+        let logOut              = FileHandle(forWritingAtPath: logURL.path)!
         task!.standardOutput    = logOut
         task!.standardError     = logOut
         
         let showSource  = UserDefaults.standard.bool(forKey: "ShowSourceInDisassembly")
         var args        = showSource ? ["-S"] : []
-        args           += ["-d", "build/"+board+"/"+dir.lastPathComponent!+".elf"]
+        args           += ["-d", "build/"+board+"/"+dir.lastPathComponent+".elf"]
         let cmdLine     = task!.launchPath!+" "+(args as NSArray).componentsJoined(by: " ")+"\n"
-        logOut.writeData(cmdLine.dataUsingEncoding(String.Encoding.utf8, allowLossyConversion: true)!)
+        logOut.write(cmdLine.data(using: String.Encoding.utf8, allowLossyConversion: true)!)
         task!.arguments         =   args;
         task!.launch()
     }

AVRsack/ASFileTree.swift

@@ -69,7 +69,7 @@ class ASFileNode : Equatable {
         closure(self)
     }
 
-    func propertyList(rootPath: String) -> Dictionary<String, AnyObject> {
+    func propertyList(rootPath: String) -> Dictionary<String, Any> {
         return [:]
     }
 
@@ -127,7 +127,7 @@ class ASFileGroup : ASFileNode {
 
     private let kChildrenKey = "Children"
     private let kExpandedKey = "Expanded"
-    private var kNodeType : String { return kNodeTypeGroup }
+    fileprivate var kNodeType : String { return kNodeTypeGroup }
 
     override init(name: String = "") {
         self.children   = []
@@ -155,11 +155,11 @@ class ASFileGroup : ASFileNode {
         }
     }
 
-    func childrenPropertyList(rootPath: String) -> [AnyObject] {
+    func childrenPropertyList(rootPath: String) -> [Any] {
         return children.map() { (node) in node.propertyList(rootPath: rootPath) }
     }
 
-    override func propertyList(rootPath: String) -> Dictionary<String, AnyObject> {
+    override func propertyList(rootPath: String) -> Dictionary<String, Any> {
         return [kTypeKey: kNodeType, kNameKey: name, kExpandedKey: expanded,
                 kChildrenKey: childrenPropertyList(rootPath: rootPath)]
     }
@@ -174,7 +174,7 @@ class ASFileGroup : ASFileNode {
 }
 
 class ASProject : ASFileGroup {
-    override private var kNodeType : String { return kNodeTypeProject }
+    override fileprivate var kNodeType : String { return kNodeTypeProject }
     
     override init(name: String = "") {
         super.init(name: name)
@@ -211,7 +211,13 @@ class ASFileItem : ASFileNode {
         } else {
             url = URL(fileURLWithPath: path as String, relativeTo: rootURL).standardizedFileURL
         }
-        if try! !url.checkResourceIsReachable() {
+        var fileExists = false
+        do {
+            fileExists = try url.checkResourceIsReachable()
+        } catch {
+            fileExists = false
+        }
+        if !fileExists {
             //
             // When projects get moved, .ino files get renamed but that fact is not 
             // yet reflected in the project file.
@@ -219,7 +225,7 @@ class ASFileItem : ASFileNode {
             let urlDir  = url.deletingLastPathComponent()
             let newName = rootURL.appendingPathExtension(url.pathExtension).lastPathComponent
             let altURL  = urlDir.appendingPathComponent(newName)
-            if try! altURL.checkResourceIsReachable() {
+            if let altExists = try? altURL.checkResourceIsReachable(), altExists {
                 url = altURL
             }
         }
@@ -253,7 +259,7 @@ class ASFileItem : ASFileNode {
         return resComp.joined(separator: "/")
     }
 
-    override func propertyList(rootPath: String) -> Dictionary<String, AnyObject> {
+    override func propertyList(rootPath: String) -> Dictionary<String, Any> {
         return [kTypeKey: kNodeTypeFile, kKindKey: type.rawValue,
                 kPathKey: relativePath(relativeTo: rootPath)]
     }
@@ -263,17 +269,21 @@ class ASFileItem : ASFileNode {
     }
 
     override func exists() -> Bool {
-        return try! url.checkResourceIsReachable()
+        do {
+            return try url.checkResourceIsReachable()
+        } catch {
+            return false
+        }
     }
 
     override func modDate() -> Date? {
-        let values = try? url.resourceValues(forKeys: [URLResourceKey.contentModificationDateKey])
+        let values = try? url.resourceValues(forKeys: [.contentModificationDateKey])
 
         return values?.contentModificationDate
     }
 
     override func revision() -> String? {
-        let task            = Task()
+        let task            = Process()
         task.launchPath     = Bundle.main.path(forResource: "FileRevision", ofType: "")!
         let outputPipe      = Pipe()
         task.standardOutput = outputPipe
@@ -309,7 +319,7 @@ class ASFileTree : NSObject, NSOutlineViewDataSource {
     func apply(closure: (ASFileNode) -> ()) {
         root.apply(closure: closure)
     }
-    func propertyList() -> AnyObject {
+    func propertyList() -> Any {
         return root.propertyList(rootPath: projectPath())
     }
     func readPropertyList(prop: Dictionary<String, AnyObject>) {
@@ -320,14 +330,14 @@ class ASFileTree : NSObject, NSOutlineViewDataSource {
     }
     
     // MARK: Outline Data Source
-    func outlineView(_ outlineView: NSOutlineView, numberOfChildrenOfItem item: AnyObject?) -> Int {
+    func outlineView(_ outlineView: NSOutlineView, numberOfChildrenOfItem item: Any?) -> Int {
         if item == nil {
             return 4
         } else {
             return (item as! ASFileGroup).children.count
         }
     }
-    func outlineView(_ outlineView: NSOutlineView, child index: Int, ofItem item: AnyObject?) -> AnyObject {
+    func outlineView(_ outlineView: NSOutlineView, child index: Int, ofItem item: Any?) -> Any {
         if item == nil {
             switch index {
             case 1:
@@ -344,15 +354,15 @@ class ASFileTree : NSObject, NSOutlineViewDataSource {
             return group.children[index]
         }
     }
-    func outlineView(_ outlineView: NSOutlineView, isItemExpandable item: AnyObject) -> Bool {
+    func outlineView(_ outlineView: NSOutlineView, isItemExpandable item: Any) -> Bool {
         return item is ASFileGroup
     }
-    func outlineView(_ outlineView: NSOutlineView, objectValueFor tableColumn: NSTableColumn?, byItem item: AnyObject?) -> AnyObject? {
+    func outlineView(_ outlineView: NSOutlineView, objectValueFor tableColumn: NSTableColumn?, byItem item: Any?) -> Any? {
         return (item as! ASFileNode).nodeName()
     }
 
     let kLocalReorderPasteboardType = "ASFilePasteboardType"
-    func outlineView(_ outlineView: NSOutlineView, writeItems items: [AnyObject], to pasteboard: NSPasteboard) -> Bool {
+    private func outlineView(_ outlineView: NSOutlineView, writeItems items: [AnyObject], to pasteboard: NSPasteboard) -> Bool {
         dragged = items as! [ASFileNode]
         pasteboard.declareTypes([kLocalReorderPasteboardType], owner: self)
         pasteboard.setData(Data(), forType: kLocalReorderPasteboardType)
@@ -368,7 +378,7 @@ class ASFileTree : NSObject, NSOutlineViewDataSource {
             return itemIsDescendentOfDrag(outlineView: outlineView, item: outlineView.parent(forItem: item) as! ASFileNode)
         }
     }
-    func outlineView(_ outlineView: NSOutlineView, validateDrop info: NSDraggingInfo, proposedItem item: AnyObject?, proposedChildIndex index: Int) -> NSDragOperation {
+    func outlineView(_ outlineView: NSOutlineView, validateDrop info: NSDraggingInfo, proposedItem item: Any?, proposedChildIndex index: Int) -> NSDragOperation {
         if info.draggingPasteboard().availableType(from: [kLocalReorderPasteboardType]) == nil {
             return [] // Only allow reordering drags
         }
@@ -390,7 +400,7 @@ class ASFileTree : NSObject, NSOutlineViewDataSource {
         }
         return NSDragOperation.generic
     }
-    func outlineView(_ outlineView: NSOutlineView, acceptDrop info: NSDraggingInfo, item: AnyObject?, childIndex insertAtIndex: Int) -> Bool {
+    func outlineView(_ outlineView: NSOutlineView, acceptDrop info: NSDraggingInfo, item: Any?, childIndex insertAtIndex: Int) -> Bool {
         var insertAtIndex = insertAtIndex
         let parent : ASFileGroup = (item as? ASFileGroup) ?? root
         if insertAtIndex == NSOutlineViewDropOnItemIndex {

AVRsack/ASHardware.swift

@@ -13,7 +13,7 @@ typealias ASProperties      = [String: ASPropertyEntry]
 
 extension NSMenu {
     func addSortedChoices(choices:[ASPropertyEntry], target: AnyObject, selector: Selector) {
-        for choice in choices.sorted(by: { $0["name"] < $1["name"] })  {
+        for choice in choices.sorted(by: { $0["name"]! < $1["name"]! })  {
             let item        = self.addItem(withTitle: choice["name"]!, action: selector, keyEquivalent: "")
             item.target    = target
         }
@@ -189,6 +189,31 @@ class ASLibraries : NSObject {
             menuItem.tag       = index
         }
     }
+    func addStandardLibraryExamplesToMenu(menu: NSMenu, sketches: inout [String]) {
+        addLibraryExamplesToMenu(library: standardLib, menu: menu, sketches: &sketches)
+    }
+    func addContribLibraryExamplesToMenu(menu: NSMenu, sketches: inout [String]) {
+        addLibraryExamplesToMenu(library: contribLib, menu: menu, sketches: &sketches)
+    }
+    func addLibraryExamplesToMenu(library: [String], menu: NSMenu, sketches: inout [String]) {
+        let fileManager = FileManager.default
+        let application = NSApplication.shared().delegate as! ASApplication
+        var hasSeparator = false
+        for (_,lib) in library.enumerated() {
+            let examplePath = (lib as NSString).appendingPathComponent("examples")
+            if fileManager.fileExists(atPath: examplePath) {
+                if !hasSeparator {
+                    menu.addItem(NSMenuItem.separator())
+                    hasSeparator = true
+                }
+                let menuItem                = menu.addItem(withTitle: (lib as NSString).lastPathComponent, action: nil, keyEquivalent: "")
+                let submenu                 = NSMenu()
+                submenu.autoenablesItems    = false
+                ASSketchBook.addSketches(menu: submenu, target: application, action: #selector(ASApplication.openExample(_:)), path: examplePath, sketches: &sketches)
+                menu.setSubmenu(submenu, for: menuItem)
+            }
+        }
+    }
     @IBAction func importStandardLibrary(_ menuItem: AnyObject) {
         if let tag = (menuItem as? NSMenuItem)?.tag {
             NSApplication.shared().sendAction(#selector(ASProjDoc.importLibrary(_:)), to: nil, from: standardLib[tag])

AVRsack/ASPreferences.swift

@@ -86,8 +86,8 @@ class ASPreferences: NSWindowController, NSOpenSavePanelDelegate {
         })
     }
     
-    func panel(_ sender: AnyObject, shouldEnable url: URL) -> Bool {
-        let gccPath = url.URLByAppendingPathComponent("bin/avr-gcc")
-        return FileManager.defaultManager().fileExistsAtPath(gccPath.path!)
+    func panel(_ sender: Any, shouldEnable url: URL) -> Bool {
+        let gccPath = url.appendingPathComponent("bin/avr-gcc")
+        return FileManager.default.fileExists(atPath: gccPath.path)
     }
 }

AVRsack/ASProjDoc.swift

@@ -48,11 +48,11 @@ class ASProjDoc: NSDocument, NSOutlineViewDelegate, NSMenuDelegate, NSOpenSavePa
     dynamic var port            : String = ""
     var recentBoards            = [String]()
     var recentProgrammers       = [String]()
-    var logModified             = NSDate.distantPast 
+    var logModified             = Date.distantPast
     var logSize                 = 0
     var updateLogTimer          : Timer?
     var printingDone            : () -> () = {}
-    var printModDate            : NSDate?
+    var printModDate            : Date?
     var printRevision           : String?
     var printShowPanel          = false
     var jumpingToIssue          = false
@@ -130,7 +130,7 @@ class ASProjDoc: NSDocument, NSOutlineViewDelegate, NSMenuDelegate, NSOpenSavePa
         outline.setDraggingSourceOperationMask(NSDragOperation.every, forLocal: true)
         outline.setDraggingSourceOperationMask([], forLocal: false)
 
-        outline.setDataSource(files)
+        outline.dataSource = files
         files.apply() { node in
             if let group = node as? ASFileGroup {
                 if group.expanded {
@@ -160,13 +160,13 @@ class ASProjDoc: NSDocument, NSOutlineViewDelegate, NSMenuDelegate, NSOpenSavePa
     func saveCurEditor() {
         if let file = (mainEditor as? ASFileItem) {
             do {
-                try editor.string().writeToURL(file.url, atomically: true, encoding: String.Encoding.utf8)
+                try editor.string().write(to: file.url, atomically: true, encoding: String.Encoding.utf8)
             } catch _ {
             }
         }
     }
-    
-    override func dataOfType(typeName: String) throws -> NSData {
+
+    override func data(ofType typeName: String) throws -> Data {
         let data = [kVersionKey: kCurVersion,
             kThemeKey: ACEThemeNames.name(for: currentTheme),
             kFontSizeKey: fontSize,
@@ -176,8 +176,8 @@ class ASProjDoc: NSDocument, NSOutlineViewDelegate, NSMenuDelegate, NSOpenSavePa
             kPortKey: port,
             kRecentBoardsKey: recentBoards,
             kRecentProgrammersKey: recentProgrammers
-        ]
-        return try PropertyListSerialization.dataWithPropertyList(data, format:.XMLFormat_v1_0, options:0)
+        ] as [String : Any]
+        return try PropertyListSerialization.data(fromPropertyList: data, format:.xml, options:0)
     }
 
     func updateProjectURL() {
@@ -185,44 +185,44 @@ class ASProjDoc: NSDocument, NSOutlineViewDelegate, NSMenuDelegate, NSOpenSavePa
         builder.setProjectURL(url: fileURL!)
     }
 
-    func importProject(url: NSURL) throws {
-        let existingProject = url.appendingPathComponent(url.lastPathComponent!+".avrsackproj")
-        if existingProject.checkResourceIsReachableAndReturnError(nil) {
+    func importProject(url: URL) throws {
+        let existingProject = url.appendingPathComponent(url.lastPathComponent+".avrsackproj")
+        if let hasProject = try? existingProject.checkResourceIsReachable(), hasProject {
             fileURL = existingProject
-            try readFromURL(url: existingProject, ofType:"Project")
+            try read(from: existingProject, ofType:"Project")
             return
         }
         let filesInProject =
-            (try FileManagerefaultManager().contentsOfDirectoryAtURL(url, includingPropertiesForKeys: nil,
-                options: .SkipsHiddenFiles)) 
+            (try FileManager.default.contentsOfDirectory(at: url, includingPropertiesForKeys: nil,
+                options: .skipsHiddenFiles)) 
         updateProjectURL()
         for file in filesInProject {
-            files.addFileURL(file)
+            files.addFileURL(url: file)
         }
     }
     
-    override func readFromURL(url: NSURL, ofType typeName: String) throws {
+    override func read(from url: URL, ofType typeName: String) throws {
         if typeName == "Arduino Source File" {
-            let projectURL = url.URLByDeletingPathExtension!.URLByAppendingPathExtension("avrsackproj")
-            try importProject(url: url.deletingLastPathComponent!)
+            let projectURL = url.deletingPathExtension().appendingPathExtension("avrsackproj")
+            try importProject(url: url.deletingLastPathComponent())
             fileURL = projectURL
-            try writeToURL(projectURL, ofType: "Project", forSaveOperation: .SaveAsOperation, originalContentsURL: nil)
+            try write(to: projectURL, ofType: "Project", for: .saveAsOperation, originalContentsURL: nil)
          } else {
             fileURL = url
-            try super.readFromURL(url, ofType: typeName)
+            try super.read(from: url, ofType: typeName)
         }
     }
-    override func readFromData(data: NSData, ofType typeName: String) throws {
+    override func read(from data: Data, ofType typeName: String) throws {
         if typeName != ("Project" as String) {
             throw NSError(domain: "AVRSack", code: 0, userInfo: nil)
         }
         updateProjectURL()
         let projectData =
-            (try PropertyListSerialization.propertyListWithData(data, options:[], format:nil)) as! NSDictionary
+            (try PropertyListSerialization.propertyList(from: data, options:[], format:nil)) as! NSDictionary
         let projectVersion = projectData[kVersionKey] as! Double
         assert(projectVersion <= floor(kCurVersion+1.0), "Project version too new for this app")
         if let themeName = projectData[kThemeKey] as? String {
-            if let themeId = ACEView.themeIdByName(themeName) {
+            if let themeId = ACEView.themeIdByName(themeName: themeName) {
                 currentTheme = themeId
             }
         }
@@ -238,34 +238,27 @@ class ASProjDoc: NSDocument, NSOutlineViewDelegate, NSMenuDelegate, NSOpenSavePa
         updateChangeCount(.changeCleared)
     }
 
-    override func duplicate(_ sender: AnyObject?) {
+    override func duplicate(_ sender: Any?) {
         let app = NSApplication.shared().delegate as! ASApplication
-        app.openTemplate(fileURL!.URLByDeletingLastPathComponent!, fromReadOnly:false)
+        app.openTemplate(template: fileURL!.deletingLastPathComponent(), fromReadOnly:false)
     }
 
     func updateLog(_: AnyObject?) {
         if let logNode = mainEditor as? ASLogNode {
-            let url = fileURL?.URLByDeletingLastPathComponent?.URLByAppendingPathComponent(logNode.path)
-            if url == nil {
-                return
-            }
-            var modified : AnyObject?
-            var size     : AnyObject?
-            do {
-                try url!.getResourceValue(&modified, forKey:NSURLAttributeModificationDateKey)
-                try url!.getResourceValue(&size, forKey:NSURLFileSizeKey)
-            } catch (_) {
-                return
-            }
-
-            if (modified as! NSDate).compare(logModified) == .orderedDescending || (size as! Int) != logSize {
-                var enc : UInt  = 0
-                let newText     = try? NSString(contentsOfURL:url!, usedEncoding:&enc)
-                editor.setString((newText as? String) ?? "")
-                editor.gotoLine(1000000000, column: 0, animated: true)
-                logModified         = modified as! NSDate
-                logSize             = size as! Int
-                currentIssueLine    = -1
+            guard let fileURL = fileURL else { return }
+            let url = fileURL.deletingLastPathComponent().appendingPathComponent(logNode.path)
+            if let values = try? url.resourceValues(forKeys: [.attributeModificationDateKey, .fileSizeKey]) {
+                if values.attributeModificationDate!.compare(logModified) == .orderedDescending
+                 || values.fileSize! != logSize
+                {
+                    var enc : String.Encoding  = .utf8
+                    let newText     = try? String(contentsOf: url, usedEncoding:&enc)
+                    editor.setString(newText ?? "")
+                    editor.gotoLine(1000000000, column: 0, animated: true)
+                    logModified         = values.attributeModificationDate!
+                    logSize             = values.fileSize!
+                    currentIssueLine    = -1
+                }
             }
         }
     }
@@ -274,9 +267,9 @@ class ASProjDoc: NSDocument, NSOutlineViewDelegate, NSMenuDelegate, NSOpenSavePa
             saveCurEditor()
         }
         if let file = (selection as? ASFileItem) {
-            var enc : UInt = 0
-            let contents = try? NSString(contentsOfURL:file.url, usedEncoding:&enc)
-            editor.setString(contents as? String ?? "")
+            var enc : String.Encoding  = .utf8
+            let contents = try? String(contentsOf:file.url, usedEncoding:&enc)
+            editor.setString(contents ?? "")
             editor.setMode(file.type.aceMode)
             editor.alphaValue = 1.0
             mainEditor = selection
@@ -293,13 +286,13 @@ class ASProjDoc: NSDocument, NSOutlineViewDelegate, NSMenuDelegate, NSOpenSavePa
         }
     }
     func selectNodeInOutline(selection: ASFileNode) {
-        let selectedIndexes = NSIndexSet(index: outline.row(forItem: selection))
+        let selectedIndexes = IndexSet(integer: outline.row(forItem: selection))
         outline.selectRowIndexes(selectedIndexes, byExtendingSelection: false)
     }
     func selectedFiles() -> [ASFileItem] {
         var selection = [ASFileItem]()
-        outline.selectedRowIndexes.enumerateIndexesUsingBlock() { (index, stop) in
-            if let file = self.outline.itemAtRow(index) as? ASFileItem {
+        for index in outline.selectedRowIndexes {
+            if let file = self.outline.item(atRow: index) as? ASFileItem {
                 selection.append(file)
             }
         }
@@ -308,22 +301,20 @@ class ASProjDoc: NSDocument, NSOutlineViewDelegate, NSMenuDelegate, NSOpenSavePa
 
     // MARK: Printing
 
-    override func print(withSettings printSettings: [String : AnyObject], showPrintPanel: Bool, delegate: AnyObject?, didPrint didPrintSelector: Selector?, contextInfo: UnsafeMutablePointer<Void>) {
+    override func print(withSettings printSettings: [String : Any], showPrintPanel: Bool, delegate: Any?, didPrint didPrintSelector: Selector?, contextInfo: UnsafeMutableRawPointer?) {
         printingDone =
             { () -> () in
                 InvokeCallback(delegate, didPrintSelector, contextInfo);
             }
+        printModDate = nil
         if let logNode = mainEditor as? ASLogNode {
-            printModDate = nil
-            if let url = fileURL?.URLByDeletingLastPathComponent?.URLByAppendingPathComponent(logNode.path) {
-                do {
-                    var modified : AnyObject?
-                    try url.getResourceValue(&modified, forKey:NSURLAttributeModificationDateKey)
-                    printModDate = modified as? NSDate
-                } catch (_) {
-                }
+            if let url = fileURL?.deletingLastPathComponent().appendingPathComponent(logNode.path),
+               let values = try? url.resourceValues(forKeys: [.attributeModificationDateKey])
+            {
+                printModDate = values.attributeModificationDate
             }
-        } else {
+        }
+        if printModDate == nil {
             printModDate    = mainEditor?.modDate()
         }
         printRevision   = mainEditor?.revision()
@@ -404,7 +395,7 @@ class ASProjDoc: NSDocument, NSOutlineViewDelegate, NSMenuDelegate, NSOpenSavePa
         let pageNoAttr = [
             NSFontAttributeName: pageNoFont,
             NSForegroundColorAttributeName: NSColor.white,
-            NSStrokeWidthAttributeName: -5.0]
+            NSStrokeWidthAttributeName: -5.0] as [String : Any]
         let pageNoStr  = "\(pageNo)"
         let pageNoSize = pageNoStr.size(withAttributes: pageNoAttr)
         let pageNoAt   = NSPoint(
@@ -454,10 +445,10 @@ class ASProjDoc: NSDocument, NSOutlineViewDelegate, NSMenuDelegate, NSOpenSavePa
         {
             let dateFormatter = DateFormatter()
             dateFormatter.dateFormat = "yyyy-MM-dd HH:mm"
-            let modDateStr = dateFormatter.stringFromDate(modDate)
-            let modDateSize = modDateStr.sizeWithAttributes(footAttr)
+            let modDateStr = dateFormatter.string(from: modDate)
+            let modDateSize = modDateStr.size(withAttributes: footAttr)
             footAt.x = rect.origin.x+rect.size.width-modDateSize.width-kXOffset
-            modDateStr.drawAtPoint(footAt, withAttributes:footAttr)
+            modDateStr.draw(at: footAt, withAttributes:footAttr)
         }
     }
 
@@ -487,20 +478,20 @@ class ASProjDoc: NSDocument, NSOutlineViewDelegate, NSMenuDelegate, NSOpenSavePa
         group.expanded  = false
         updateChangeCount(.changeDone)
     }
-    func outlineView(_ outlineView: NSOutlineView, willDisplayCell cell: AnyObject, for tableColumn: NSTableColumn?, item: AnyObject) {
-        if let textCell = cell as? NSTextFieldCell {
-            textCell.textColor = NSColor.blackColor
+    func outlineView(_ outlineView: NSOutlineView, willDisplayCell cell: Any, for tableColumn: NSTableColumn?, item: Any) {
+        if let textCell = cell as? NSTextFieldCell, let item = item as? ASFileNode {
+            textCell.textColor = NSColor.black
             if item === files.root || item === files.buildLog || item === files.uploadLog || item === files.disassembly {
                 textCell.font = NSFont.boldSystemFont(ofSize: 13.0)
             } else {
                 textCell.font = NSFont.systemFont(ofSize: 13.0)
-                if !(item as! ASFileNode).exists() {
-                    textCell.textColor = NSColor.redColor
+                if !item.exists() {
+                    textCell.textColor = NSColor.red
                 }
             }
         }
     }
-    func outlineView(_ outlineView: NSOutlineView, shouldTrackCell cell: NSCell, for tableColumn: NSTableColumn?, item: AnyObject) -> Bool {
+    func outlineView(_ outlineView: NSOutlineView, shouldTrackCell cell: NSCell, for tableColumn: NSTableColumn?, item: Any) -> Bool {
         return outlineView.isRowSelected(outlineView.row(forItem: item))
     }
 
@@ -510,7 +501,7 @@ class ASProjDoc: NSDocument, NSOutlineViewDelegate, NSMenuDelegate, NSOpenSavePa
         var name       : String
         var ref        : String
         if selection.count == 1 {
-            name    = "file “\(selection[0].url.lastPathComponent!)”"
+            name    = "file “\(selection[0].url.lastPathComponent)”"
             ref     = "reference to it"
         } else {
             name    = "\(selection.count) selected files"
@@ -527,7 +518,7 @@ class ASProjDoc: NSDocument, NSOutlineViewDelegate, NSMenuDelegate, NSOpenSavePa
         alert.beginSheetModal(for: outline.window!) { (response) in
             if response != NSAlertThirdButtonReturn {
                 if response == NSAlertFirstButtonReturn {
-                    NSWorkspace.sharedWorkspace().recycleURLs(selection.map {$0.url}, completionHandler:nil)
+                    NSWorkspace.shared().recycle(selection.map {$0.url}, completionHandler:nil)
                 }
                 self.files.apply { (node) in
                     if let group = node as? ASFileGroup {
@@ -568,19 +559,20 @@ class ASProjDoc: NSDocument, NSOutlineViewDelegate, NSMenuDelegate, NSOpenSavePa
 
     }
 
-    func panel(_ panel:AnyObject, shouldEnable url:URL) -> Bool {
-        var shouldEnable = true
-        var resourceID   : AnyObject?
-        guard ((try? url.getResourceValue(&resourceID, forKey:NSURLFileResourceIdentifierKey)) != nil) else {
-            return true;
+    func panel(_ panel:Any, shouldEnable url:URL) -> Bool {
+        guard let values = try? url.resourceValues(forKeys: [.fileResourceIdentifierKey]),
+              let resourceID = values.fileResourceIdentifier
+        else {
+            return true
         }
+        var shouldEnable = true
         files.apply {(node) in
-            if let file = node as? ASFileItem {
-                var thisID : AnyObject?
-                if (try? file.url.getResourceValue(&thisID, forKey:URLResourceKey.fileResourceIdentifierKey)) != nil {
-                    if thisID != nil && resourceID!.isEqual(thisID!) {
-                        shouldEnable = false
-                    }
+            if let file = node as? ASFileItem,
+               let values = try? file.url.resourceValues(forKeys: [.fileResourceIdentifierKey]),
+               let thisID = values.fileResourceIdentifier
+            {
+                if resourceID.isEqual(thisID) {
+                    shouldEnable = false
                 }
             }
         }
@@ -591,7 +583,7 @@ class ASProjDoc: NSDocument, NSOutlineViewDelegate, NSMenuDelegate, NSOpenSavePa
         return selectedFiles().count > 0
     }
 
-    func createFileAtURL(url:NSURL) {
+    func createFileAtURL(url: URL) {
         let type        = ASFileType.guessForURL(url: url)
         var firstPfx    = ""
         var prefix      = ""
@@ -623,13 +615,13 @@ class ASProjDoc: NSDocument, NSOutlineViewDelegate, NSMenuDelegate, NSOpenSavePa
             let dateFmt = DateFormatter()
             dateFmt.dateFormat = "yyyy-MM-dd"
             header = firstPfx + "\n" +
-                prefix + " Project: " + fileURL!.URLByDeletingLastPathComponent!.lastPathComponent! + "\n" +
-                prefix + " File:    " + url.lastPathComponent! + "\n" +
-                prefix + " Created: " + dateFmt.stringFromDate(NSDate()) + "\n" +
+                prefix + " Project: " + fileURL!.deletingLastPathComponent().lastPathComponent + "\n" +
+                prefix + " File:    " + url.lastPathComponent + "\n" +
+                prefix + " Created: " + dateFmt.string(from: Date()) + "\n" +
                 lastPfx + "\n\n"
         }
         do {
-            try header.writeToURL(url, atomically: true, encoding: String.Encoding.utf8)
+            try header.write(to: url, atomically: true, encoding: String.Encoding.utf8)
         } catch _ {
         }
         files.addFileURL(url: url)
@@ -675,14 +667,14 @@ class ASProjDoc: NSDocument, NSOutlineViewDelegate, NSMenuDelegate, NSOpenSavePa
 
     // MARK: Editor configuration
     
-    @IBAction func changeTheme(item: NSMenuItem) {
+    @IBAction func changeTheme(_ item: NSMenuItem) {
         currentTheme = ACETheme(rawValue: UInt(item.tag)) ?? .xcode
         editor.setTheme(currentTheme)
         UserDefaults.standard.set(
             ACEThemeNames.humanName(for: currentTheme), forKey: kThemeKey)
         updateChangeCount(.changeDone)
     }
-    @IBAction func changeKeyboardHandler(item: NSMenuItem) {
+    @IBAction func changeKeyboardHandler(_ item: NSMenuItem) {
         keyboardHandler = ACEKeyboardHandler(rawValue: UInt(item.tag))!
         UserDefaults.standard.set(
             ACEKeyboardHandlerNames.humanName(for: keyboardHandler), forKey: kBindingsKey)
@@ -691,18 +683,18 @@ class ASProjDoc: NSDocument, NSOutlineViewDelegate, NSMenuDelegate, NSOpenSavePa
     
     override func validateUserInterfaceItem(_ anItem: NSValidatedUserInterfaceItem) -> Bool {
         if let menuItem = anItem as? NSMenuItem {
-            if menuItem.action == "changeTheme:" {
+            if menuItem.action == #selector(ASProjDoc.changeTheme(_:)) {
                 menuItem.state = (UInt(menuItem.tag) == currentTheme.rawValue ? NSOnState : NSOffState)
                 return true
-            } else if menuItem.action == "changeKeyboardHandler:" {
+            } else if menuItem.action == #selector(ASProjDoc.changeKeyboardHandler(_:)) {
                 menuItem.state = (menuItem.tag == Int(keyboardHandler.rawValue) ? NSOnState : NSOffState)
                 return true
-            } else if menuItem.action == "serialConnect:" {
+            } else if menuItem.action == #selector(ASProjDoc.serialConnect(_:)) {
                 menuItem.title = port
 
                 return true
-            } else if menuItem.action == "importStandardLibrary:" ||
-                menuItem.action == "importContribLibrary:"
+            } else if menuItem.action == #selector(ASLibraries.importStandardLibrary(_:)) ||
+                menuItem.action == #selector(ASLibraries.importContribLibrary(_:))
             {
                 return mainEditor is ASFileItem
             }
@@ -724,54 +716,54 @@ class ASProjDoc: NSDocument, NSOutlineViewDelegate, NSMenuDelegate, NSOpenSavePa
     }
 
     // MARK: Issues
-    @IBAction func jumpToIssue(sender: AnyObject) {
+    @IBAction func jumpToIssue(_ sender: AnyObject) {
         let direction : Int = (sender as! NSMenuItem).tag
         if editors.views(in: .bottom).count == 0 {
             editors.addView(auxEdit, in: .bottom)
 
-            let url = fileURL?.URLByDeletingLastPathComponent?.URLByAppendingPathComponent(files.buildLog.path)
+            let url = fileURL?.deletingLastPathComponent().appendingPathComponent(files.buildLog.path)
             if url == nil {
                 return
             }
-            var enc : UInt = 0
-            let contents = try? NSString(contentsOfURL:url!, usedEncoding:&enc)
-            auxEdit.setString(contents as? String ?? "")
+            var enc : String.Encoding = .utf8
+            let contents = try? String(contentsOf:url!, usedEncoding:&enc)
+            auxEdit.setString(contents ?? "")
             editor.setMode(.text)
             editor.alphaValue = 1.0
         }
-        let buildLog = auxEdit.string().componentsSeparatedByString("\n")
+        let buildLog = auxEdit.string().components(separatedBy: "\n")
         let issueRe  = try! NSRegularExpression(pattern: "(\\S+?):(\\d+):.*", options: [])
 
         currentIssueLine += direction
         while currentIssueLine > -1 && currentIssueLine < buildLog.count {
             let line    = buildLog[currentIssueLine]
             let range   = NSMakeRange(0, line.utf16.count)
-            if let match = issueRe.firstMatchInString(line, options:.Anchored, range:range) {
-                let file        = match.rangeAtIndex(1)
-                let lineTxt     = match.rangeAtIndex(2)
+            if let match = issueRe.firstMatch(in: line, options:.anchored, range:range) {
+                let file        = match.rangeAt(1)
+                let lineTxt     = match.rangeAt(2)
                 let nsline      = line as NSString
-                let lineNo      = Int(nsline.substringWithRange(lineTxt))!
-                let fileName    = nsline.substringWithRange(file) as NSString
-                let fileURL : NSURL
+                let lineNo      = Int(nsline.substring(with: lineTxt))!
+                let fileName    = nsline.substring(with: file) as NSString
+                let fileURL : URL
 
                 if fileName.hasPrefix("../../") {
-                    fileURL = files.dir.URLByAppendingPathComponent(fileName.substringFromIndex(6))
+                    fileURL = files.dir.appendingPathComponent(fileName.substring(from: 6))
                 } else {
-                    fileURL = NSURL(fileURLWithPath:fileName as String).URLByStandardizingPath!
+                    fileURL = URL(fileURLWithPath:fileName as String).standardizedFileURL
                 }
 
                 jumpingToIssue = true
-                var resourceID : AnyObject?
-                if (try? fileURL.getResourceValue(&resourceID, forKey:URLResourceKey.fileResourceIdentifierKey)) != nil && resourceID != nil {
+                if let values = try? fileURL.resourceValues(forKeys: [.fileResourceIdentifierKey]),
+                   let resourceID = values.fileResourceIdentifier
+                {
                     files.apply {(node) in
-                        if let file = node as? ASFileItem {
-                            var thisID : AnyObject?
-                            if (try? file.url.getResourceValue(&thisID, forKey:URLResourceKey.fileResourceIdentifierKey)) != nil {
-                                if thisID != nil && resourceID!.isEqual(thisID!) {
-                                    self.selectNodeInOutline(selection: node)
-                                    self.editor.gotoLine(lineNo, column:0, animated:true)
-                                }
-                            }
+                        if let file = node as? ASFileItem,
+                           let values = try? file.url.resourceValues(forKeys: [.fileResourceIdentifierKey]),
+                           let thisID = values.fileResourceIdentifier,
+                           resourceID.isEqual(thisID)
+                        {
+                            self.selectNodeInOutline(selection: node)
+                            self.editor.gotoLine(lineNo, column:0, animated:true)
                         }
                     }
                 }
@@ -809,11 +801,11 @@ class ASProjDoc: NSDocument, NSOutlineViewDelegate, NSMenuDelegate, NSOpenSavePa
         switch menu.title {
         case "Boards":
             ASHardware.instance().buildBoardsMenu(menu: menu, recentBoards: recentBoards,
-                target: self, selector: "selectBoard:")
+                                                  target: self, selector: #selector(ASProjDoc.selectBoard(_:)))
             boardTool.setTitle(selectedBoard)
         case "Programmers":
             ASHardware.instance().buildProgrammersMenu(menu: menu, recentProgrammers: recentProgrammers,
-                target: self, selector: "selectProgrammer:")
+                target: self, selector: #selector(ASProjDoc.selectProgrammer(_:)))
             progTool.setTitle(selectedProgrammer)
         default:
             break
@@ -846,7 +838,7 @@ class ASProjDoc: NSDocument, NSOutlineViewDelegate, NSMenuDelegate, NSOpenSavePa
         }
     }
     
-    @IBAction func selectBoard(item: AnyObject) {
+    @IBAction func selectBoard(_ item: AnyObject) {
         selectedBoard = (item as! NSMenuItem).title
     }
 
@@ -877,11 +869,11 @@ class ASProjDoc: NSDocument, NSOutlineViewDelegate, NSMenuDelegate, NSOpenSavePa
         }
     }
     
-    @IBAction func selectProgrammer(item: AnyObject) {
+    @IBAction func selectProgrammer(_ item: AnyObject) {
         selectedProgrammer = (item as! NSMenuItem).title
     }
     
-    @IBAction func selectPort(item: AnyObject) {
+    @IBAction func selectPort(_ item: AnyObject) {
         port    = (item as! NSPopUpButton).titleOfSelectedItem!
         portTool.setTitle(port)
     }
@@ -917,26 +909,26 @@ class ASProjDoc: NSDocument, NSOutlineViewDelegate, NSMenuDelegate, NSOpenSavePa
         return NSSet(objects: "hasValidPort", "hasUploadProtocol", "programmer")
     }
     
-    @IBAction func uploadProject(sender: AnyObject) {
+    @IBAction func uploadProject(_ sender: AnyObject) {
         builder.continuation = {
             self.selectNodeInOutline(selection: self.files.uploadLog)
-            dispatch_async(dispatch_get_main_queue(), {
+            DispatchQueue.main.async(execute: {
                 self.builder.uploadProject(board: self.board, programmer:self.programmer, port:self.port)
             })
         }
         buildProject(sender)
     }
 
-    @IBAction func uploadTerminal(sender: AnyObject) {
+    @IBAction func uploadTerminal(_: AnyObject) {
         builder.uploadProject(board: board, programmer:programmer, port:port, mode:.Interactive)
     }
 
-    @IBAction func burnBootloader(sender: AnyObject) {
+    @IBAction func burnBootloader(_: AnyObject) {
         self.selectNodeInOutline(selection: self.files.uploadLog)
         builder.uploadProject(board: board, programmer:programmer, port:port, mode:.BurnBootloader)
     }
 
-    @IBAction func disassembleProject(sender: AnyObject) {
+    @IBAction func disassembleProject(_ sender: AnyObject) {
         builder.continuation = {
             self.selectNodeInOutline(selection: self.files.disassembly)
             self.builder.disassembleProject(board: self.board)
@@ -944,7 +936,7 @@ class ASProjDoc: NSDocument, NSOutlineViewDelegate, NSMenuDelegate, NSOpenSavePa
         buildProject(sender)
     }
     
-    @IBAction func serialConnect(sender: AnyObject) {
+    @IBAction func serialConnect(_: AnyObject) {
         ASSerialWin.showWindowWithPort(port: port)
     }
 }

AVRsack/ASSerial.mm

@@ -37,14 +37,14 @@ NSString * kASSerialPortsChanged = @"PortsChanged";
     watchSlashDev =
         dispatch_source_create(DISPATCH_SOURCE_TYPE_VNODE, fd, DISPATCH_VNODE_WRITE, dispatch_get_main_queue());
     dispatch_source_set_event_handler(watchSlashDev, ^{
-        [[NotificationCenter defaultCenter] postNotificationName:kASSerialPortsChanged object: nil];
+        [[NSNotificationCenter defaultCenter] postNotificationName:kASSerialPortsChanged object: nil];
     });
     dispatch_resume(watchSlashDev);
 }
 
 + (NSArray<NSString *> *)ports {
     NSMutableArray * cuPorts = [NSMutableArray array];
-    for (NSString * port in [[FileManager defaultManager] contentsOfDirectoryAtPath:@"/dev" error: nil]) {
+    for (NSString * port in [[NSFileManager defaultManager] contentsOfDirectoryAtPath:@"/dev" error: nil]) {
         if ([[port substringToIndex:2] isEqualToString:@"cu"])
             [cuPorts addObject:[port substringFromIndex:3]];
     }

AVRsack/ASSerialWin.swift

@@ -15,6 +15,7 @@ class ASSerialWin: NSWindowController {
     @IBOutlet weak var inputLine : NSTextField!
     @IBOutlet weak var logView   : ACEView!
     
+    var portDefaults        = [String: Any]()
     var baudRate        : Int = 9600 {
         didSet(oldRate) {
             if portHandle != nil {
@@ -41,9 +42,8 @@ class ASSerialWin: NSWindowController {
     dynamic var portHandle  : FileHandle?
     var currentTheme        : ACETheme = .xcode
     var fontSize            : UInt = 12
-    var portDefaults        = [String: AnyObject]()
     var shouldReconnect     = false
-    dynamic var task        : Task?
+    dynamic var task        : Process?
 
     class func showWindowWithPort(port: String) {
         if let existing = serialInstances[port] {
@@ -54,7 +54,7 @@ class ASSerialWin: NSWindowController {
             newInstance.showWindow(self)
         }
     }
-    class func showWindowWithPort(port: String, task: Task, speed: Int) {
+    class func showWindowWithPort(port: String, task: Process, speed: Int) {
         if let existing = serialInstances[port] {
             existing.showWindowWithTask(task: task, speed:speed)
         } else {
@@ -116,10 +116,10 @@ class ASSerialWin: NSWindowController {
                 }
             }
         })
-        termination = NotificationCenter.default.addObserver(forName: Task.didTerminateNotification,
+        termination = NotificationCenter.default.addObserver(forName: Process.didTerminateNotification,
                                                                    object: nil, queue: nil, using:
             { (notification: Notification) in
-                if notification.object as? Task == self.task {
+                if notification.object as? Process == self.task {
                     self.task        = nil
                     self.portHandle  = nil
                 }
@@ -161,15 +161,17 @@ class ASSerialWin: NSWindowController {
             serialData  = ""
             logView.setString(serialData)
             readHandle.readabilityHandler = {(handle) in
-                let newData         = handle.availableDataIgnoringExceptions()
-                let newString       = NSString(data: newData, encoding: String.Encoding.ascii) as! String
-                self.serialData    += newString
-                DispatchQueue.main.async(execute: { () -> Void in
-                    self.logView.setString(self.serialData)
-                    if self.scrollToBottom {
-                        self.logView.gotoLine(1000000000, column: 0, animated: true)
-                    }
-                })
+                if let newData = handle.availableDataIgnoringExceptions(),
+                   let newString = String(data: newData, encoding: String.Encoding.ascii)
+                {
+                    self.serialData    += newString
+                    DispatchQueue.main.async(execute: {
+                        self.logView.setString(self.serialData)
+                        if self.scrollToBottom {
+                            self.logView.gotoLine(1000000000, column: 0, animated: true)
+                        }
+                    })
+                }
             }
         }
     }
@@ -180,7 +182,7 @@ class ASSerialWin: NSWindowController {
         portHandle?.write(data)
     }
     
-    func showWindowWithTask(task: Task, speed:Int) {
+    func showWindowWithTask(task: Process, speed:Int) {
         if portHandle != nil {
             connect(self)
         }
@@ -233,7 +235,7 @@ class ASSerialWin: NSWindowController {
 
     // MARK: Editor configuration
     
-    @IBAction func changeTheme(item: NSMenuItem) {
+    @IBAction func changeTheme(_ item: NSMenuItem) {
         let userDefaults = UserDefaults.standard
         currentTheme = ACETheme(rawValue: UInt(item.tag)) ?? .xcode
         logView.setTheme(currentTheme)
@@ -242,7 +244,7 @@ class ASSerialWin: NSWindowController {
         portDefaults["Theme"] = themeName
         updatePortDefaults()
     }
-    @IBAction func changeKeyboardHandler(item: NSMenuItem) {
+    @IBAction func changeKeyboardHandler(_ item: NSMenuItem) {
         keyboardHandler = ACEKeyboardHandler(rawValue: UInt(item.tag))!
         UserDefaults.standard.set(
             ACEKeyboardHandlerNames.humanName(for: keyboardHandler), forKey: "Bindings")
@@ -251,10 +253,10 @@ class ASSerialWin: NSWindowController {
 
     func validateUserInterfaceItem(anItem: NSValidatedUserInterfaceItem) -> Bool {
         if let menuItem = anItem as? NSMenuItem {
-            if menuItem.action == Selector(("changeTheme:")) {
+            if menuItem.action == #selector(ASSerialWin.changeTheme(_:)) {
                 menuItem.state = (UInt(menuItem.tag) == currentTheme.rawValue ? NSOnState : NSOffState)
                 return true
-            } else if menuItem.action == Selector(("changeKeyboardHandler:")) {
+            } else if menuItem.action == #selector(ASSerialWin.changeKeyboardHandler(_:)) {
                 menuItem.state = (menuItem.tag == Int(keyboardHandler.rawValue) ? NSOnState : NSOffState)
                 return true
             }

AVRsack/BuildProject

@@ -78,9 +78,9 @@ def parseInoFiles
                 # Find protypes:
                 prototypes = contents.dup
                 # - Strip comments, quoted strings, and preprocessor directives
-                prototypes.gsub!(%r{'(?:[^']|\\')+'|"(?:[^"]|\\")*"|//.*?$|/\*.*?\*/|^\s*?#.*?$}m, ' ')
+                prototypes.gsub!(%r{'(?:\\'|[^'])+'|"(?:\\"|[^"])*"|//.*?$|/\*.*?\*/|^\s*?#.*?$}m, ' ')
                 # Collapse braces
-                while prototypes.sub!(/(\{)(?:[^{}]+|\{[^{}]*\})/m, '\1') do
+                while prototypes.sub!(/(\{)([^{}]+|\{[^{}]*\})/m, '\1') do
                 end
                 existingProto = {}
                 prototypes.scan(/[\w\[\]\*]+\s+[&\[\]\*\w\s]+\([&,\[\]\*\w\s]*\)(?=\s*;)/) {|p|
@@ -92,7 +92,7 @@ def parseInoFiles
                     proto << p+";\n" unless existingProto[p]
                 }
                 contents.each_line do |line|
-                    if line =~ /^\s*#include\s+[<"](.*)[">]\s*(#.*)?$/
+                    if line =~ %r{^\s*#include\s+[<"](.*)[">]\s*(#.*|/\*.*?\*/\s*|//.*)?$}
                         addLibrary($1)
                     end
                 end

README.md

@@ -0,0 +1,20 @@
+# AVRsack
+
+`AVRsack` is an integrated development environment for the Atmel AVR series of microcontrollers. 
+It is designed to be an alternative for the Arduino 1.0.x application, offering:
+
+* A more powerful text editor with a variety of styles.</li>
+* A more powerful build system with incremental rebuilds.</li>
+* A more powerful upload system with finer grained control over logging.</li>
+* Full build/upload logs without arbitrary size restrictions.</li>
+* Support for handling multiple simultaneous serial ports.</li>
+* Support for assembly programming and disassembly of object code.</li>
+* Support for alternate AVR toolchains, such as [Crosspack-AVR](https://www.obdev.at/products/crosspack/index.html)
+
+`AVRsack` was written and designed by Matthias Neeracher <microtherion@gmail.com>
+
+For editing text, `AVRsack` relies on Michael Robinson's [ACEView](https://github.com/faceleg/ACEView), 
+a Cocoa wrapper for the [Ace](http://ace.c9.io) code editor.
+
+![Basic screenshot]
+(https://github.com/microtherion/AVRsack/raw/master/Screenshots/AVRsack.png)