updated to xcode 7

mbcrump · mbcrump · commit 3debc82b82e5 · 2015-09-17T15:26:52.000-05:00
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 ###Task App for Swift that Persist Data with Core Data (iOS) 
 ================
 
-#####Updated for Xcode 6.4 with Swift 1.2
+#####Updated for Xcode 7 with Swift 2.0
 
 by: [Michael Crump](http://twitter.com/mbcrump)
 
diff --git a/TaskApplication.xcodeproj/project.pbxproj b/TaskApplication.xcodeproj/project.pbxproj
@@ -168,7 +168,9 @@
 		86FF5BA51A6D65FB00A017A1 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0610;
+				LastSwiftMigration = 0700;
+				LastSwiftUpdateCheck = 0700;
+				LastUpgradeCheck = 0700;
 				ORGANIZATIONNAME = "Michael Crump";
 				TargetAttributes = {
 					86FF5BAC1A6D65FB00A017A1 = {
@@ -292,6 +294,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_OPTIMIZATION_LEVEL = 0;
@@ -306,7 +309,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.1;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -342,7 +345,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.1;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				VALIDATE_PRODUCT = YES;
@@ -358,6 +361,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				INFOPLIST_FILE = TaskApplication/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "net.michaelcrump.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
 			};
@@ -372,6 +376,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				INFOPLIST_FILE = TaskApplication/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "net.michaelcrump.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
 			};
@@ -391,6 +396,7 @@
 				);
 				INFOPLIST_FILE = TaskApplicationTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "net.michaelcrump.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TaskApplication.app/TaskApplication";
 			};
@@ -406,6 +412,7 @@
 				);
 				INFOPLIST_FILE = TaskApplicationTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "net.michaelcrump.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TaskApplication.app/TaskApplication";
 			};
diff --git a/TaskApplication.xcodeproj/project.xcworkspace/xcshareddata/TaskApplication.xcscmblueprint b/TaskApplication.xcodeproj/project.xcworkspace/xcshareddata/TaskApplication.xcscmblueprint
@@ -0,0 +1,30 @@
+{
+  "DVTSourceControlWorkspaceBlueprintPrimaryRemoteRepositoryKey" : "58DEA5F9F78AED03F30276194337F64857474C9E",
+  "DVTSourceControlWorkspaceBlueprintWorkingCopyRepositoryLocationsKey" : {
+
+  },
+  "DVTSourceControlWorkspaceBlueprintWorkingCopyStatesKey" : {
+    "9D491CFCEBD738578C711AFF792F576E6DC8ACC0" : 0,
+    "58DEA5F9F78AED03F30276194337F64857474C9E" : 0
+  },
+  "DVTSourceControlWorkspaceBlueprintIdentifierKey" : "10EB1394-C6B0-462E-85C0-367571C298C7",
+  "DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : {
+    "9D491CFCEBD738578C711AFF792F576E6DC8ACC0" : "TaskApplication",
+    "58DEA5F9F78AED03F30276194337F64857474C9E" : "TaskAppThatPersistData"
+  },
+  "DVTSourceControlWorkspaceBlueprintNameKey" : "TaskApplication",
+  "DVTSourceControlWorkspaceBlueprintVersion" : 204,
+  "DVTSourceControlWorkspaceBlueprintRelativePathToProjectKey" : "TaskApplication.xcodeproj",
+  "DVTSourceControlWorkspaceBlueprintRemoteRepositoriesKey" : [
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/mbcrump\/TasksForSwiftWithPersistingData",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "58DEA5F9F78AED03F30276194337F64857474C9E"
+    },
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/mbcrump\/TasksForSwift.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "9D491CFCEBD738578C711AFF792F576E6DC8ACC0"
+    }
+  ]
+}
diff --git a/TaskApplication.xcodeproj/project.xcworkspace/xcuserdata/crump.xcuserdatad/UserInterfaceState.xcuserstate b/TaskApplication.xcodeproj/project.xcworkspace/xcuserdata/crump.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/TaskApplication.xcodeproj/xcuserdata/crump.xcuserdatad/xcschemes/TaskApplication.xcscheme b/TaskApplication.xcodeproj/xcuserdata/crump.xcuserdatad/xcschemes/TaskApplication.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0610"
+   LastUpgradeVersion = "0700"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -37,10 +37,10 @@
       </BuildActionEntries>
    </BuildAction>
    <TestAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug">
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -62,17 +62,21 @@
             ReferencedContainer = "container:TaskApplication.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
    </TestAction>
    <LaunchAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Debug"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
-      <BuildableProductRunnable>
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "86FF5BAC1A6D65FB00A017A1"
@@ -85,12 +89,13 @@
       </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
+      buildConfiguration = "Release"
       shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Release"
       debugDocumentVersioning = "YES">
-      <BuildableProductRunnable>
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "86FF5BAC1A6D65FB00A017A1"
diff --git a/TaskApplication/AppDelegate.swift b/TaskApplication/AppDelegate.swift
@@ -49,7 +49,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     lazy var applicationDocumentsDirectory: NSURL = {
         // The directory the application uses to store the Core Data store file. This code uses a directory named "net.michaelcrump.CoreDataSample" in the application's documents Application Support directory.
         let urls = NSFileManager.defaultManager().URLsForDirectory(.DocumentDirectory, inDomains: .UserDomainMask)
-        return urls[urls.count-1] as! NSURL
+        return urls[urls.count-1] 
         }()
     
     lazy var managedObjectModel: NSManagedObjectModel = {
@@ -58,50 +58,52 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         return NSManagedObjectModel(contentsOfURL: modelURL)!
         }()
     
-    lazy var persistentStoreCoordinator: NSPersistentStoreCoordinator? = {
-        // The persistent store coordinator for the application. This implementation creates and return a coordinator, having added the store for the application to it. This property is optional since there are legitimate error conditions that could cause the creation of the store to fail.
+    lazy var persistentStoreCoordinator: NSPersistentStoreCoordinator = {
+        // The persistent store coordinator for the application. This implementation creates and returns a coordinator, having added the store for the application to it. This property is optional since there are legitimate error conditions that could cause the creation of the store to fail.
         // Create the coordinator and store
-        var coordinator: NSPersistentStoreCoordinator? = NSPersistentStoreCoordinator(managedObjectModel: self.managedObjectModel)
-        let url = self.applicationDocumentsDirectory.URLByAppendingPathComponent("CoreDataSample.sqlite")
-        var error: NSError? = nil
+        let coordinator = NSPersistentStoreCoordinator(managedObjectModel: self.managedObjectModel)
+        let url = self.applicationDocumentsDirectory.URLByAppendingPathComponent("SingleViewCoreData.sqlite")
         var failureReason = "There was an error creating or loading the application's saved data."
-        if coordinator!.addPersistentStoreWithType(NSSQLiteStoreType, configuration: nil, URL: url, options: nil, error: &error) == nil {
-            coordinator = nil
+        do {
+            try coordinator.addPersistentStoreWithType(NSSQLiteStoreType, configuration: nil, URL: url, options: nil)
+        } catch {
             // Report any error we got.
-            let dict = NSMutableDictionary()
+            var dict = [String: AnyObject]()
             dict[NSLocalizedDescriptionKey] = "Failed to initialize the application's saved data"
             dict[NSLocalizedFailureReasonErrorKey] = failureReason
-            dict[NSUnderlyingErrorKey] = error
-            error = NSError(domain: "YOUR_ERROR_DOMAIN", code: 9999, userInfo: dict as [NSObject : AnyObject])
+            
+            dict[NSUnderlyingErrorKey] = error as NSError
+            let wrappedError = NSError(domain: "YOUR_ERROR_DOMAIN", code: 9999, userInfo: dict)
             // Replace this with code to handle the error appropriately.
             // abort() causes the application to generate a crash log and terminate. You should not use this function in a shipping application, although it may be useful during development.
-            NSLog("Unresolved error \(error), \(error!.userInfo)")
+            NSLog("Unresolved error \(wrappedError), \(wrappedError.userInfo)")
             abort()
         }
         
         return coordinator
         }()
     
-    lazy var managedObjectContext: NSManagedObjectContext? = {
+    lazy var managedObjectContext: NSManagedObjectContext = {
         // Returns the managed object context for the application (which is already bound to the persistent store coordinator for the application.) This property is optional since there are legitimate error conditions that could cause the creation of the context to fail.
         let coordinator = self.persistentStoreCoordinator
-        if coordinator == nil {
-            return nil
-        }
-        var managedObjectContext = NSManagedObjectContext()
+        var managedObjectContext = NSManagedObjectContext(concurrencyType: .MainQueueConcurrencyType)
         managedObjectContext.persistentStoreCoordinator = coordinator
         return managedObjectContext
         }()
     
     // MARK: - Core Data Saving support
     
+    // MARK: - Core Data Saving support
+    
     func saveContext () {
-        if let moc = self.managedObjectContext {
-            var error: NSError? = nil
-            if moc.hasChanges && !moc.save(&error) {
+        if managedObjectContext.hasChanges {
+            do {
+                try managedObjectContext.save()
+            } catch {
                 // Replace this implementation with code to handle the error appropriately.
                 // abort() causes the application to generate a crash log and terminate. You should not use this function in a shipping application, although it may be useful during development.
-                NSLog("Unresolved error \(error), \(error!.userInfo)")
+                let nserror = error as NSError
+                NSLog("Unresolved error \(nserror), \(nserror.userInfo)")
                 abort()
             }
         }
diff --git a/TaskApplication/Info.plist b/TaskApplication/Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
-	<string>net.michaelcrump.$(PRODUCT_NAME:rfc1034identifier)</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
diff --git a/TaskApplication/PersistenceHelper.swift b/TaskApplication/PersistenceHelper.swift
@@ -15,39 +15,47 @@ class PersistenceHelper: NSObject {
     var context: NSManagedObjectContext;
     
     override init(){
-        context = appDel.managedObjectContext!
+        context = appDel.managedObjectContext
     }
     
     func save(entity: String, parameters: Dictionary<String,String> )->Bool{
         
-        var newEntity = NSEntityDescription.insertNewObjectForEntityForName(entity, inManagedObjectContext: context) as! NSManagedObject
+        let newEntity = NSEntityDescription.insertNewObjectForEntityForName(entity, inManagedObjectContext: context) 
         for (key, value) in parameters{
             newEntity.setValue(value, forKey: key)
         }
         
-        return context.save(nil)
+        do {
+            try context.save()
+            return true
+        } catch _ {
+            return false
+        }
     }
     
     func list(entity: String ) ->NSArray{
         
-        var request = NSFetchRequest(entityName: entity)
+        let request = NSFetchRequest(entityName: entity)
         request.returnsObjectsAsFaults = false;
-        var results: NSArray = context.executeFetchRequest(request, error: nil)!
+        let results: NSArray = try! context.executeFetchRequest(request)
         return results
     }
     
     func remove(entity:String, key:String, value:String)->Bool{
         
-        var request = NSFetchRequest(entityName: entity)
+        let request = NSFetchRequest(entityName: entity)
         request.returnsObjectsAsFaults = false
         request.predicate = NSPredicate(format: "\(key) = %@", value)
-        var results: NSArray = context.executeFetchRequest(request, error: nil)!
+        let results: NSArray = try! context.executeFetchRequest(request)
         
         if(results.count>0){
             
-            var res = results[0] as! NSManagedObject
+            let res = results[0] as! NSManagedObject
             context.deleteObject(res)
-            context.save(nil)
+            do {
+                try context.save()
+            } catch _ {
+            }
             return true
         }
         
diff --git a/TaskApplication/SecondViewController.swift b/TaskApplication/SecondViewController.swift
@@ -30,8 +30,8 @@ class SecondViewController: UIViewController, UITextFieldDelegate {
             //Task Title is blank, do not add a record
         } else {
             //add record
-            var name: String = txtTask.text
-            var description: String = txtDesc.text
+            let name: String = txtTask.text!
+            let description: String = txtDesc.text!
             taskMgr.addTask(name, desc: description)
             
             //dismiss keyboard and reset fields
@@ -42,7 +42,7 @@ class SecondViewController: UIViewController, UITextFieldDelegate {
             
         }
     }
-    override func touchesBegan(touches: Set<NSObject>, withEvent event: UIEvent) {
+    override func touchesBegan(touches: Set<UITouch>, withEvent event: UIEvent?) {
         self.view.endEditing(true)
     }
     
diff --git a/TaskApplication/TaskManager.swift b/TaskApplication/TaskManager.swift
@@ -22,7 +22,7 @@ class TaskManager: NSObject {
     
     override init(){
         
-        var tempTasks:NSArray = persistenceHelper.list("Task")
+        let tempTasks:NSArray = persistenceHelper.list("Task")
         for res:AnyObject in tempTasks{
             tasks.append(Task(name:res.valueForKey("name")as! String,description:res.valueForKey("desc") as! String))
         }
@@ -42,7 +42,7 @@ class TaskManager: NSObject {
     
     func removeTask(index:Int){
         
-        var value:String = tasks[index].name
+        let value:String = tasks[index].name
         
         if(persistenceHelper.remove("Task", key: "name", value: value)){
             tasks.removeAtIndex(index)
diff --git a/TaskApplicationTests/Info.plist b/TaskApplicationTests/Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
-	<string>net.michaelcrump.$(PRODUCT_NAME:rfc1034identifier)</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>

Original file line number	Diff line number	Diff line change
`@@ -30,8 +30,8 @@ class SecondViewController: UIViewController, UITextFieldDelegate {`
`30`	`30`	`//Task Title is blank, do not add a record`
`31`	`31`	`} else {`
`32`	`32`	`//add record`
`33`		`- var name: String = txtTask.text`
`34`		`- var description: String = txtDesc.text`
	`33`	`+ let name: String = txtTask.text!`
	`34`	`+ let description: String = txtDesc.text!`
`35`	`35`	`taskMgr.addTask(name, desc: description)`
`36`	`36`
`37`	`37`	`//dismiss keyboard and reset fields`
`@@ -42,7 +42,7 @@ class SecondViewController: UIViewController, UITextFieldDelegate {`
`42`	`42`
`43`	`43`	`}`
`44`	`44`	`}`
`45`		`- override func touchesBegan(touches: Set<NSObject>, withEvent event: UIEvent) {`
	`45`	`+ override func touchesBegan(touches: Set<UITouch>, withEvent event: UIEvent?) {`
`46`	`46`	`self.view.endEditing(true)`
`47`	`47`	`}`
`48`	`48`