From 28f64bb631faf220cecfed899a54ff02ce9941ab Mon Sep 17 00:00:00 2001 From: Matthias Neeracher Date: Sat, 4 Apr 2015 23:43:47 +0200 Subject: [PATCH] Fix deprecated calls --- AVRsack/ASFileTree.swift | 1 + AVRsack/ASProjDoc.swift | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/AVRsack/ASFileTree.swift b/AVRsack/ASFileTree.swift index c124ddb..a7b54a2 100644 --- a/AVRsack/ASFileTree.swift +++ b/AVRsack/ASFileTree.swift @@ -85,6 +85,7 @@ private let kNameKey = "Name" return ASFileItem(prop, withRootURL:rootURL) default: assertionFailure("Undefined item type in file hierarchy") + abort() } } func paths(rootPath: String) -> [String] { diff --git a/AVRsack/ASProjDoc.swift b/AVRsack/ASProjDoc.swift index efb28a6..a526c26 100644 --- a/AVRsack/ASProjDoc.swift +++ b/AVRsack/ASProjDoc.swift @@ -155,7 +155,7 @@ class ASProjDoc: NSDocument, NSOutlineViewDelegate, NSMenuDelegate, NSOpenSavePa kProgrammerKey: programmer, kPortKey: port ] - return NSPropertyListSerialization.dataFromPropertyList(data, format: .XMLFormat_v1_0, errorDescription: nil) + return NSPropertyListSerialization.dataWithPropertyList(data, format:.XMLFormat_v1_0, options:0, error:nil) } func updateProjectURL() { @@ -198,7 +198,8 @@ class ASProjDoc: NSDocument, NSOutlineViewDelegate, NSMenuDelegate, NSOpenSavePa return false } updateProjectURL() - let projectData : NSDictionary = NSPropertyListSerialization.propertyListFromData(data, mutabilityOption: .Immutable, format: nil, errorDescription: nil) as! NSDictionary + let projectData = + NSPropertyListSerialization.propertyListWithData(data, options:0, format:nil, error: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 {