Merge pull request #156 from ParsePlatform/nlutsenko.swift2

nlutsenko · nlutsenko · commit 423d4648095e · 2015-09-16T20:11:09.000-07:00
Update ParseUIDemo-Swift to Swift 2.
diff --git a/.travis.yml b/.travis.yml
@@ -13,3 +13,4 @@ script:
   - set -o pipefail
   - xcodebuild -workspace ParseUI.xcworkspace -scheme 'ParseUI' -sdk iphonesimulator build | xcpretty -c
   - xcodebuild -workspace ParseUI.xcworkspace -scheme 'ParseUIDemo' -sdk iphonesimulator build | xcpretty -c
+  - xcodebuild -workspace ParseUI.xcworkspace -scheme 'ParseUIDemo-Swift' -sdk iphonesimulator build | xcpretty -c
diff --git a/ParseUI.xcodeproj/project.pbxproj b/ParseUI.xcodeproj/project.pbxproj
@@ -855,6 +855,7 @@
 			isa = PBXProject;
 			attributes = {
 				CLASSPREFIX = PF;
+				LastSwiftUpdateCheck = 0700;
 				LastUpgradeCheck = 0620;
 				ORGANIZATIONNAME = "Parse Inc.";
 				TargetAttributes = {
diff --git a/ParseUIDemo/Swift/AppDelegate.swift b/ParseUIDemo/Swift/AppDelegate.swift
@@ -47,7 +47,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         return true
     }
 
-    func application(application: UIApplication, openURL url: NSURL, sourceApplication: String?, annotation: AnyObject?) -> Bool {
+    func application(application: UIApplication, openURL url: NSURL, sourceApplication: String?, annotation: AnyObject) -> Bool {
         return FBSDKApplicationDelegate.sharedInstance().application(application, openURL: url, sourceApplication: sourceApplication, annotation: annotation)
     }
 
@@ -71,27 +71,27 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
         var objects: [PFObject] = Array()
 
-        let query = PFQuery(className: "Todo")
-        if let todos = query.findObjects() as? [PFObject] {
+        do {
+            let todos = try PFQuery(className: "Todo").findObjects()
             if todos.count == 0 {
-                for (index, title) in enumerate(todoTitles) {
+                for (index, title) in todoTitles.enumerate() {
                     let todo = PFObject(className: "Todo")
                     todo["title"] = title
                     todo["priority"] = index % 3
                     objects.append(todo)
                 }
             }
-        }
+        } catch {}
 
         let appNames = [ "Anypic", "Anywall", "f8" ]
-        let appsQuery = PFQuery(className: "App")
-        if let apps = appsQuery.findObjects() as? [PFObject] {
+        do {
+            let apps = try PFQuery(className: "App").findObjects()
             if apps.count == 0 {
-                for (index, appName) in enumerate(appNames) {
+                for (index, appName) in appNames.enumerate() {
                     let bundle = NSBundle.mainBundle()
-                    if let filePath = bundle.pathForResource(String(index), ofType: "png") {
-                        if let data = NSData(contentsOfFile: filePath) {
-                            let file = PFFile(name: filePath.lastPathComponent, data: data)
+                    if let fileURL = bundle.URLForResource(String(index), withExtension: "png") {
+                        if let data = NSData(contentsOfURL: fileURL) {
+                            let file = PFFile(name: fileURL.lastPathComponent, data: data)
                             let object = PFObject(className: "App")
                             object["icon"] = file
                             object["name"] = appName
@@ -100,10 +100,12 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
                     }
                 }
             }
-        }
+        } catch {}
 
         if objects.count != 0 {
-            PFObject.saveAll(objects)
+            do {
+                try PFObject.saveAll(objects)
+            } catch {}
         }
     }
 
diff --git a/ParseUIDemo/Swift/CustomViewControllers/QueryCollectionViewController/DeletionCollectionViewController.swift b/ParseUIDemo/Swift/CustomViewControllers/QueryCollectionViewController/DeletionCollectionViewController.swift
@@ -60,20 +60,22 @@ class DeletionCollectionViewController: PFQueryCollectionViewController, UIAlert
 
     @objc
     func addTodo() {
-        if NSClassFromString("UIAlertController") != nil  {
+        if #available(iOS 8.0, *) {
             let alertDialog = UIAlertController(title: "Add Todo", message: nil, preferredStyle: .Alert)
 
-            var titleTextField : UITextField! = nil
+            var titleTextField : UITextField? = nil
             alertDialog.addTextFieldWithConfigurationHandler() {
                 titleTextField = $0
             }
 
             alertDialog.addAction(UIAlertAction(title: "Cancel", style: .Cancel, handler: nil))
             alertDialog.addAction(UIAlertAction(title: "Save", style: .Default) { (action) -> Void in
-                let object = PFObject(className: self.parseClassName!, dictionary: [ "title": titleTextField.text ])
-                object.saveEventually().continueWithSuccessBlock({ (_) -> AnyObject! in
-                    return self.loadObjects()
-                })
+                if let title = titleTextField?.text {
+                    let object = PFObject(className: self.parseClassName!, dictionary: [ "title": title ])
+                    object.saveEventually().continueWithSuccessBlock { (_) -> AnyObject! in
+                        return self.loadObjects()
+                    }
+                }
                 })
 
             presentViewController(alertDialog, animated: true, completion: nil)
@@ -88,7 +90,7 @@ class DeletionCollectionViewController: PFQueryCollectionViewController, UIAlert
 
             alertView.alertViewStyle = .PlainTextInput
             alertView.textFieldAtIndex(0)?.placeholder = "Name"
-            
+
             alertView.show()
         }
     }
@@ -119,13 +121,15 @@ class DeletionCollectionViewController: PFQueryCollectionViewController, UIAlert
             return
         }
 
-        let object = PFObject(
-            className: self.parseClassName!,
-            dictionary: [ "title": alertView.textFieldAtIndex(0)!.text ]
-        )
-
-        object.saveEventually().continueWithSuccessBlock({ (_) -> AnyObject! in
-            return self.loadObjects()
-        })
+        if let title =  alertView.textFieldAtIndex(0)?.text {
+            let object = PFObject(
+                className: self.parseClassName!,
+                dictionary: [ "title": title ]
+            )
+            
+            object.saveEventually().continueWithSuccessBlock({ (_) -> AnyObject! in
+                return self.loadObjects()
+            })
+        }
     }
 }
diff --git a/ParseUIDemo/Swift/CustomViewControllers/QueryCollectionViewController/PaginatedCollectionViewController.swift b/ParseUIDemo/Swift/CustomViewControllers/QueryCollectionViewController/PaginatedCollectionViewController.swift
@@ -66,7 +66,7 @@ class PaginatedCollectionViewController: PFQueryCollectionViewController {
 
         if let title = object?["title"] as? String {
             let attributedTitle = NSMutableAttributedString(string: title)
-            if var priority = object?["priority"] as? Int {
+            if let priority = object?["priority"] as? Int {
                 let attributes = [NSFontAttributeName : UIFont.systemFontOfSize(13.0), NSForegroundColorAttributeName : UIColor.grayColor()]
                 let string = NSAttributedString(string: "\nPriority: \(priority)", attributes: attributes)
                 attributedTitle.appendAttributedString(string)
diff --git a/ParseUIDemo/Swift/CustomViewControllers/QueryCollectionViewController/SectionedCollectionViewController.swift b/ParseUIDemo/Swift/CustomViewControllers/QueryCollectionViewController/SectionedCollectionViewController.swift
@@ -34,7 +34,7 @@ class SimpleCollectionReusableView : UICollectionReusableView {
         addSubview(label)
     }
 
-    required init(coder decoder: NSCoder) {
+    required init?(coder decoder: NSCoder) {
         super.init(coder: decoder)
 
         label.textAlignment = .Center
@@ -97,7 +97,7 @@ class SectionedCollectionViewController: PFQueryCollectionViewController {
                 sections[priority] = array
             }
         }
-        sectionKeys = sections.keys.array.sorted(<)
+        sectionKeys = sections.keys.sort(<)
 
         collectionView?.reloadData()
     }
@@ -112,7 +112,7 @@ class SectionedCollectionViewController: PFQueryCollectionViewController {
 
 }
 
-extension SectionedCollectionViewController : UICollectionViewDataSource, UICollectionViewDelegateFlowLayout {
+extension SectionedCollectionViewController {
 
     override func numberOfSectionsInCollectionView(collectionView: UICollectionView) -> Int {
         return sections.count
diff --git a/ParseUIDemo/Swift/CustomViewControllers/QueryCollectionViewController/SimpleCollectionViewController.swift b/ParseUIDemo/Swift/CustomViewControllers/QueryCollectionViewController/SimpleCollectionViewController.swift
@@ -65,7 +65,7 @@ class SimpleCollectionViewController: PFQueryCollectionViewController {
 
         if let title = object?["title"] as? String {
             let attributedTitle = NSMutableAttributedString(string: title)
-            if var priority = object?["priority"] as? Int {
+            if let priority = object?["priority"] as? Int {
                 let attributes = [NSFontAttributeName : UIFont.systemFontOfSize(13.0), NSForegroundColorAttributeName : UIColor.grayColor()]
                 let string = NSAttributedString(string: "\nPriority: \(priority)", attributes: attributes)
                 attributedTitle.appendAttributedString(string)
diff --git a/ParseUIDemo/Swift/CustomViewControllers/QueryCollectionViewController/StoryboardCollectionViewController.swift b/ParseUIDemo/Swift/CustomViewControllers/QueryCollectionViewController/StoryboardCollectionViewController.swift
@@ -61,7 +61,7 @@ class StoryboardCollectionViewController: PFQueryCollectionViewController {
 
         if let title = object?["title"] as? String {
             let attributedTitle = NSMutableAttributedString(string: title)
-            if var priority = object?["priority"] as? Int {
+            if let priority = object?["priority"] as? Int {
                 let attributes = [NSFontAttributeName : UIFont.systemFontOfSize(13.0), NSForegroundColorAttributeName : UIColor.grayColor()]
                 let string = NSAttributedString(string: "\nPriority: \(priority)", attributes: attributes)
                 attributedTitle.appendAttributedString(string)
diff --git a/ParseUIDemo/Swift/CustomViewControllers/QueryTableViewController/DeletionTableViewController.swift b/ParseUIDemo/Swift/CustomViewControllers/QueryTableViewController/DeletionTableViewController.swift
@@ -59,7 +59,8 @@ class DeletionTableViewController: PFQueryTableViewController, UIAlertViewDelega
 
     @objc
     func addTodo() {
-        if NSClassFromString("UIAlertController") != nil  {
+        
+        if #available(iOS 8.0, *) {
             let alertDialog = UIAlertController(title: "Add Todo", message: nil, preferredStyle: .Alert)
 
             var titleTextField : UITextField! = nil
@@ -69,10 +70,12 @@ class DeletionTableViewController: PFQueryTableViewController, UIAlertViewDelega
 
             alertDialog.addAction(UIAlertAction(title: "Cancel", style: .Cancel, handler: nil))
             alertDialog.addAction(UIAlertAction(title: "Save", style: .Default) { (action) -> Void in
-                let object = PFObject(className: self.parseClassName!, dictionary: [ "title": titleTextField.text ])
-                object.saveInBackground().continueWithSuccessBlock({ (_) -> AnyObject! in
-                    return self.loadObjects()
-                })
+                if let title = titleTextField.text {
+                    let object = PFObject(className: self.parseClassName!, dictionary: [ "title": title ])
+                    object.saveInBackground().continueWithSuccessBlock({ (_) -> AnyObject! in
+                        return self.loadObjects()
+                    })
+                }
             })
 
             presentViewController(alertDialog, animated: true, completion: nil)
@@ -94,7 +97,7 @@ class DeletionTableViewController: PFQueryTableViewController, UIAlertViewDelega
 
     @objc
     func deleteSelectedItems() {
-        removeObjectsAtIndexPaths(tableView.indexPathsForSelectedRows())
+        removeObjectsAtIndexPaths(tableView.indexPathsForSelectedRows)
     }
 
     // MARK - UIAlertViewDelegate
@@ -105,13 +108,11 @@ class DeletionTableViewController: PFQueryTableViewController, UIAlertViewDelega
             return
         }
 
-        let object = PFObject(
-            className: self.parseClassName!,
-            dictionary: [ "title": alertView.textFieldAtIndex(0)!.text ]
-        )
-
-        object.saveEventually().continueWithSuccessBlock({ (_) -> AnyObject! in
-            return self.loadObjects()
-        })
+        if let title = alertView.textFieldAtIndex(0)?.text {
+            let object = PFObject(className: self.parseClassName!, dictionary: [ "title": title ])
+            object.saveEventually().continueWithSuccessBlock({ (_) -> AnyObject! in
+                return self.loadObjects()
+            })
+        }
     }
 }
diff --git a/ParseUIDemo/Swift/CustomViewControllers/QueryTableViewController/SectionedTableViewController.swift b/ParseUIDemo/Swift/CustomViewControllers/QueryTableViewController/SectionedTableViewController.swift
@@ -52,7 +52,7 @@ class SectionedTableViewController: PFQueryTableViewController {
                 sections[priority] = array
             }
         }
-        sectionKeys = sections.keys.array.sorted(<)
+        sectionKeys = sections.keys.sort(<)
 
         tableView.reloadData()
     }
@@ -66,7 +66,7 @@ class SectionedTableViewController: PFQueryTableViewController {
     }
 }
 
-extension SectionedTableViewController : UITableViewDataSource {
+extension SectionedTableViewController {
 
     override func numberOfSectionsInTableView(tableView: UITableView) -> Int {
         return sections.count
diff --git a/ParseUIDemo/Swift/UIDemoViewController.swift b/ParseUIDemo/Swift/UIDemoViewController.swift

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ class SimpleCollectionReusableView : UICollectionReusableView {`
`34`	`34`	`addSubview(label)`
`35`	`35`	`}`
`36`	`36`
`37`		`- required init(coder decoder: NSCoder) {`
	`37`	`+ required init?(coder decoder: NSCoder) {`
`38`	`38`	`super.init(coder: decoder)`
`39`	`39`
`40`	`40`	`label.textAlignment = .Center`
`@@ -97,7 +97,7 @@ class SectionedCollectionViewController: PFQueryCollectionViewController {`
`97`	`97`	`sections[priority] = array`
`98`	`98`	`}`
`99`	`99`	`}`
`100`		`- sectionKeys = sections.keys.array.sorted(<)`
	`100`	`+ sectionKeys = sections.keys.sort(<)`
`101`	`101`
`102`	`102`	`collectionView?.reloadData()`
`103`	`103`	`}`
`@@ -112,7 +112,7 @@ class SectionedCollectionViewController: PFQueryCollectionViewController {`
`112`	`112`
`113`	`113`	`}`
`114`	`114`
`115`		`-extension SectionedCollectionViewController : UICollectionViewDataSource, UICollectionViewDelegateFlowLayout {`
	`115`	`+extension SectionedCollectionViewController {`
`116`	`116`
`117`	`117`	`override func numberOfSectionsInCollectionView(collectionView: UICollectionView) -> Int {`
`118`	`118`	`return sections.count`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ class SectionedTableViewController: PFQueryTableViewController {`
`52`	`52`	`sections[priority] = array`
`53`	`53`	`}`
`54`	`54`	`}`
`55`		`- sectionKeys = sections.keys.array.sorted(<)`
	`55`	`+ sectionKeys = sections.keys.sort(<)`
`56`	`56`
`57`	`57`	`tableView.reloadData()`
`58`	`58`	`}`
`@@ -66,7 +66,7 @@ class SectionedTableViewController: PFQueryTableViewController {`
`66`	`66`	`}`
`67`	`67`	`}`
`68`	`68`
`69`		`-extension SectionedTableViewController : UITableViewDataSource {`
	`69`	`+extension SectionedTableViewController {`
`70`	`70`
`71`	`71`	`override func numberOfSectionsInTableView(tableView: UITableView) -> Int {`
`72`	`72`	`return sections.count`