starred/CoreStore
1
0
Fork 0
mirror of https://github.com/JohnEstropia/CoreStore.git synced 2026-04-27 11:17:05 +02:00
Code Issues 95 Packages Projects Releases 10 Wiki Activity

updated for Xcode 7 beta 3

Browse Source
This commit is contained in:
John Estropia
2015-07-09 21:25:19 +09:00
parent 450afb00fa
commit 35fbaf9513
4 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
CoreStore/Migrating/DataStack+Migration.swift
View File

@@ -406,10 +406,12 @@ public extension DataStack {
destinationModel: destinationModel) { destinationModel: destinationModel) {
migrationSteps.append( migrationSteps.append(
sourceModel: sourceModel, (
destinationModel: destinationModel, sourceModel: sourceModel,
mappingModel: mappingModel, destinationModel: destinationModel,
migrationType: .Heavyweight mappingModel: mappingModel,
migrationType: .Heavyweight
)
) )
} }
else { else {
@@ -422,10 +424,12 @@ public extension DataStack {
) )
migrationSteps.append( migrationSteps.append(
sourceModel: sourceModel, (
destinationModel: destinationModel, sourceModel: sourceModel,
mappingModel: mappingModel, destinationModel: destinationModel,
migrationType: .Lightweight mappingModel: mappingModel,
migrationType: .Lightweight
)
) )
} }
catch { catch {

2
CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ObjectObserverDemoViewController.swift
View File

@@ -43,7 +43,7 @@ class ObjectObserverDemoViewController: UIViewController, ObjectObserver {
// MARK: UIViewController // MARK: UIViewController
required init(coder aDecoder: NSCoder) { required init?(coder aDecoder: NSCoder) {
if let palette = CoreStore.fetchOne(From(Palette), OrderBy(.Ascending("hue"))) { if let palette = CoreStore.fetchOne(From(Palette), OrderBy(.Ascending("hue"))) {

4
CoreStoreDemo/CoreStoreDemo/Transactions Demo/TransactionsDemoViewController.swift
View File

@@ -193,11 +193,11 @@ class TransactionsDemoViewController: UIViewController, MKMapViewDelegate, Objec
CLLocation(latitude: place.latitude, longitude: place.longitude), CLLocation(latitude: place.latitude, longitude: place.longitude),
completionHandler: { [weak self] (placemarks, error) -> Void in completionHandler: { [weak self] (placemarks, error) -> Void in
if let placemark = placemarks?.first { if let placemark = placemarks?.first, let addressDictionary = placemark.addressDictionary {
let place = transaction.edit(Static.placeController.object) let place = transaction.edit(Static.placeController.object)
place?.title = placemark.name place?.title = placemark.name
place?.subtitle = ABCreateStringWithAddressDictionary(placemark.addressDictionary, true) place?.subtitle = ABCreateStringWithAddressDictionary(addressDictionary, true)
transaction.commit { (_) -> Void in } transaction.commit { (_) -> Void in }
} }

2
CoreStoreTests/CoreStoreTests.swift
View File

@@ -43,7 +43,7 @@ class CoreStoreTests: XCTestCase {
func testExample() { func testExample() {
let stack = DataStack(modelName: "Model", sourceBundle: NSBundle(forClass: self.dynamicType)) let stack = DataStack(modelName: "Model", bundle: NSBundle(forClass: self.dynamicType))
CoreStore.defaultStack = stack CoreStore.defaultStack = stack
XCTAssert(CoreStore.defaultStack === stack, "CoreStore.defaultStack === stack") XCTAssert(CoreStore.defaultStack === stack, "CoreStore.defaultStack === stack")