Merge branch 'develop' into corestore2_develop

# Conflicts:
#	CoreStore.podspec
#	Sources/Info.plist
#	Sources/Internal/CoreStoreFetchRequest.swift
This commit is contained in:
John Rommel Estropia
2016-06-05 17:20:59 +09:00

View File

@@ -33,12 +33,10 @@ import CoreData
// http://stackoverflow.com/questions/14396375/nsfetchedresultscontroller-crashes-in-ios-6-if-affectedstores-is-specified // http://stackoverflow.com/questions/14396375/nsfetchedresultscontroller-crashes-in-ios-6-if-affectedstores-is-specified
internal final class CoreStoreFetchRequest: NSFetchRequest { internal final class CoreStoreFetchRequest: NSFetchRequest {
@objc
override var affectedStores: [NSPersistentStore]? { override var affectedStores: [NSPersistentStore]? {
get { return self.safeAffectedStores } get { return super.affectedStores }
set { self.safeAffectedStores = newValue } set { super.affectedStores = newValue }
} }
@nonobjc
private var safeAffectedStores: [NSPersistentStore]?
} }