From 0c1af09a8df466c4cafa87965a50ac06867d8f52 Mon Sep 17 00:00:00 2001 From: John Estropia Date: Thu, 10 Mar 2016 20:28:19 +0900 Subject: [PATCH 1/3] Make demo app compile again (sorry) (fixes #57) --- .gitignore | 1 + ...etchingAndQueryingDemoViewController.swift | 12 +++---- .../QueryingResultsViewController.swift | 8 ++--- .../ListObserverDemoViewController.swift | 8 ++--- .../CustomLoggerViewController.swift | 6 ++-- .../MigrationsDemoViewController.swift | 32 ++++++++++++------- .../TransactionsDemoViewController.swift | 4 +-- 7 files changed, 41 insertions(+), 30 deletions(-) diff --git a/.gitignore b/.gitignore index 49a0694..3750064 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ Carthage/Build CoreStore.xcworkspace/xcuserdata .DS_Store DerivedData +*.orig diff --git a/CoreStoreDemo/CoreStoreDemo/Fetching and Querying Demo/FetchingAndQueryingDemoViewController.swift b/CoreStoreDemo/CoreStoreDemo/Fetching and Querying Demo/FetchingAndQueryingDemoViewController.swift index 5073683..6358fa1 100644 --- a/CoreStoreDemo/CoreStoreDemo/Fetching and Querying Demo/FetchingAndQueryingDemoViewController.swift +++ b/CoreStoreDemo/CoreStoreDemo/Fetching and Querying Demo/FetchingAndQueryingDemoViewController.swift @@ -99,10 +99,10 @@ class FetchingAndQueryingDemoViewController: UIViewController, UITableViewDataSo func tableView(tableView: UITableView, numberOfRowsInSection section: Int) -> Int { switch self.segmentedControl?.selectedSegmentIndex { - case .Some(Section.Fetching.rawValue): + case Section.Fetching.rawValue?: return self.fetchingItems.count - case .Some(Section.Querying.rawValue): + case Section.Querying.rawValue?: return self.queryingItems.count default: @@ -116,10 +116,10 @@ class FetchingAndQueryingDemoViewController: UIViewController, UITableViewDataSo switch self.segmentedControl?.selectedSegmentIndex { - case .Some(Section.Fetching.rawValue): + case Section.Fetching.rawValue?: cell.textLabel?.text = self.fetchingItems[indexPath.row].title - case .Some(Section.Querying.rawValue): + case Section.Querying.rawValue?: cell.textLabel?.text = self.queryingItems[indexPath.row].title default: @@ -138,10 +138,10 @@ class FetchingAndQueryingDemoViewController: UIViewController, UITableViewDataSo switch self.segmentedControl?.selectedSegmentIndex { - case .Some(Section.Fetching.rawValue): + case Section.Fetching.rawValue?: self.performSegueWithIdentifier("FetchingResultsViewController", sender: indexPath) - case .Some(Section.Querying.rawValue): + case Section.Querying.rawValue?: self.performSegueWithIdentifier("QueryingResultsViewController", sender: indexPath) default: diff --git a/CoreStoreDemo/CoreStoreDemo/Fetching and Querying Demo/QueryingResultsViewController.swift b/CoreStoreDemo/CoreStoreDemo/Fetching and Querying Demo/QueryingResultsViewController.swift index c7eedeb..74047d6 100644 --- a/CoreStoreDemo/CoreStoreDemo/Fetching and Querying Demo/QueryingResultsViewController.swift +++ b/CoreStoreDemo/CoreStoreDemo/Fetching and Querying Demo/QueryingResultsViewController.swift @@ -16,19 +16,19 @@ class QueryingResultsViewController: UITableViewController { switch value { - case .Some(let array as [AnyObject]): + case (let array as [AnyObject])?: self.values = array.map { (item: AnyObject) -> (title: String, detail: String) in ( title: item.description, - detail: _stdlib_getDemangledTypeName(item) + detail: String(reflecting: item) ) } - case .Some(let item): + case let item?: self.values = [ ( title: item.description, - detail: _stdlib_getDemangledTypeName(item) + detail: String(reflecting: item) ) ] diff --git a/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ListObserverDemoViewController.swift b/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ListObserverDemoViewController.swift index 6eff5b7..62b4e72 100644 --- a/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ListObserverDemoViewController.swift +++ b/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ListObserverDemoViewController.swift @@ -88,7 +88,7 @@ class ListObserverDemoViewController: UITableViewController, ListSectionObserver UIBarButtonItem( barButtonSystemItem: .Trash, target: self, - action: "resetBarButtonItemTouched:" + action: #selector(self.resetBarButtonItemTouched(_:)) ) ] @@ -96,13 +96,13 @@ class ListObserverDemoViewController: UITableViewController, ListSectionObserver title: Static.filter.rawValue, style: .Plain, target: self, - action: "filterBarButtonItemTouched:" + action: #selector(self.filterBarButtonItemTouched(_:)) ) navigationItem.rightBarButtonItems = [ UIBarButtonItem( barButtonSystemItem: .Add, target: self, - action: "addBarButtonItemTouched:" + action: #selector(self.addBarButtonItemTouched(_:)) ), filterBarButton ] @@ -119,7 +119,7 @@ class ListObserverDemoViewController: UITableViewController, ListSectionObserver switch (segue.identifier, segue.destinationViewController, sender) { - case (.Some("ObjectObserverDemoViewController"), let destinationViewController as ObjectObserverDemoViewController, let palette as Palette): + case ("ObjectObserverDemoViewController"?, let destinationViewController as ObjectObserverDemoViewController, let palette as Palette): destinationViewController.palette = palette default: diff --git a/CoreStoreDemo/CoreStoreDemo/Loggers Demo/CustomLoggerViewController.swift b/CoreStoreDemo/CoreStoreDemo/Loggers Demo/CustomLoggerViewController.swift index 4acf7dd..922b8b6 100644 --- a/CoreStoreDemo/CoreStoreDemo/Loggers Demo/CustomLoggerViewController.swift +++ b/CoreStoreDemo/CoreStoreDemo/Loggers Demo/CustomLoggerViewController.swift @@ -102,20 +102,20 @@ class CustomLoggerViewController: UIViewController, CoreStoreLogger { switch self.segmentedControl?.selectedSegmentIndex { - case .Some(0): + case 0?: self.dataStack.beginAsynchronous { (transaction) -> Void in transaction.create(Into(Palette)) } - case .Some(1): + case 1?: do { try self.dataStack.addSQLiteStoreAndWait(fileName: "emptyStore.sqlite", configuration: "invalidStore") } catch _ { } - case .Some(2): + case 2?: self.dataStack.beginAsynchronous { (transaction) -> Void in transaction.commit() diff --git a/CoreStoreDemo/CoreStoreDemo/MIgrations Demo/MigrationsDemoViewController.swift b/CoreStoreDemo/CoreStoreDemo/MIgrations Demo/MigrationsDemoViewController.swift index 6db77c3..f5ace1e 100644 --- a/CoreStoreDemo/CoreStoreDemo/MIgrations Demo/MigrationsDemoViewController.swift +++ b/CoreStoreDemo/CoreStoreDemo/MIgrations Demo/MigrationsDemoViewController.swift @@ -162,36 +162,46 @@ class MigrationsDemoViewController: UIViewController { fileName: "MigrationDemo.sqlite", completion: { [weak self] (result) -> Void in - guard let strongSelf = self else { + guard let `self` = self else { return } guard case .Success = result else { - strongSelf.setEnabled(true) + self.setEnabled(true) return } - strongSelf.setDataStack(dataStack, model: model, scrollToSelection: true) + self.setDataStack(dataStack, model: model, scrollToSelection: true) - let count = dataStack.queryValue(From(model.entityType), Select(.Count("dna"))) + let count = dataStack.queryValue( + From(model.entityType), + Select(.Count("dna")) + ) if count > 0 { - strongSelf.setEnabled(true) + self.setEnabled(true) } else { - dataStack.beginAsynchronous { (transaction) -> Void in + for i: Int64 in 0 ..< 20 { - for i: Int64 in 1 ..< 10000 { + dataStack.beginAsynchronous { (transaction) -> Void in - let organism = transaction.create(Into(model.entityType)) as! OrganismProtocol - organism.dna = i - organism.mutate() + for j: Int64 in 0 ..< 500 { + + let organism = transaction.create(Into(model.entityType)) as! OrganismProtocol + organism.dna = (i * 500) + j + 1 + organism.mutate() + } + + transaction.commit() } + } + dataStack.beginAsynchronous { [weak self] (transaction) -> Void in - transaction.commit { result -> Void in + transaction.commit { _ in self?.setEnabled(true) } diff --git a/CoreStoreDemo/CoreStoreDemo/Transactions Demo/TransactionsDemoViewController.swift b/CoreStoreDemo/CoreStoreDemo/Transactions Demo/TransactionsDemoViewController.swift index 755b46b..5a03594 100644 --- a/CoreStoreDemo/CoreStoreDemo/Transactions Demo/TransactionsDemoViewController.swift +++ b/CoreStoreDemo/CoreStoreDemo/Transactions Demo/TransactionsDemoViewController.swift @@ -60,7 +60,7 @@ class TransactionsDemoViewController: UIViewController, MKMapViewDelegate, Objec super.viewDidLoad() - let longPressGesture = UILongPressGestureRecognizer(target: self, action: "longPressGestureRecognized:") + let longPressGesture = UILongPressGestureRecognizer(target: self, action: #selector(self.longPressGestureRecognized(_:))) self.mapView?.addGestureRecognizer(longPressGesture) Static.placeController.addObserver(self) @@ -68,7 +68,7 @@ class TransactionsDemoViewController: UIViewController, MKMapViewDelegate, Objec self.navigationItem.rightBarButtonItem = UIBarButtonItem( barButtonSystemItem: .Refresh, target: self, - action: "refreshButtonTapped:" + action: #selector(self.refreshButtonTapped(_:)) ) } From 7de13131a4a38ef21e1b7af94c6400df22d120cd Mon Sep 17 00:00:00 2001 From: John Estropia Date: Fri, 25 Mar 2016 18:18:17 +0900 Subject: [PATCH 2/3] small demo fix --- .../QueryingResultsViewController.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CoreStoreDemo/CoreStoreDemo/Fetching and Querying Demo/QueryingResultsViewController.swift b/CoreStoreDemo/CoreStoreDemo/Fetching and Querying Demo/QueryingResultsViewController.swift index 74047d6..3399187 100644 --- a/CoreStoreDemo/CoreStoreDemo/Fetching and Querying Demo/QueryingResultsViewController.swift +++ b/CoreStoreDemo/CoreStoreDemo/Fetching and Querying Demo/QueryingResultsViewController.swift @@ -20,7 +20,7 @@ class QueryingResultsViewController: UITableViewController { self.values = array.map { (item: AnyObject) -> (title: String, detail: String) in ( title: item.description, - detail: String(reflecting: item) + detail: String(reflecting: item.dynamicType) ) } @@ -28,7 +28,7 @@ class QueryingResultsViewController: UITableViewController { self.values = [ ( title: item.description, - detail: String(reflecting: item) + detail: String(reflecting: item.dynamicType) ) ] From b914a4b5ed73e86811bcde3b4401256a557e75bf Mon Sep 17 00:00:00 2001 From: John Estropia Date: Fri, 25 Mar 2016 18:20:24 +0900 Subject: [PATCH 3/3] updated Readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index aa5b65b..ddaeb8e 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ Unleashing the real power of Core Data with the elegance and safety of Swift

Build Status -Version" +Version Platform License Carthage compatible