starred/CoreStore-JohnEstropia
1
0
Fork 0
mirror of https://github.com/JohnEstropia/CoreStore.git synced 2026-03-18 07:23:53 +01:00
Code Issues 95 Packages Projects Releases 10 Wiki Activity

Merge branch 'develop' into swift3_develop

Browse Source 
# Conflicts:
#	Cartfile
#	Carthage/Checkouts/GCDKit
#	CoreStore.podspec
#	CoreStore.xcodeproj/project.pbxproj
#	CoreStoreDemo/CoreStoreDemo.xcodeproj/project.pbxproj
#	CoreStoreTests/BaseTests/BaseTestCase.swift
#	CoreStoreTests/FromTests.swift
#	CoreStoreTests/GroupByTests.swift
#	CoreStoreTests/OrderByTests.swift
#	CoreStoreTests/StorageInterfaceTests.swift
#	CoreStoreTests/TweakTests.swift
#	CoreStoreTests/WhereTests.swift
#	README.md
#	Sources/Internal/CoreStoreFetchRequest.swift
#	Sources/Internal/NSManagedObjectContext+Querying.swift
#	Sources/Internal/NSManagedObjectModel+Setup.swift
#	Sources/Migrating/DataStack+Migration.swift
#	Sources/ObjectiveC/CSSQliteStore.swift
#	Sources/ObjectiveC/CSStorageInterface.swift
#	Sources/ObjectiveC/CoreStoreBridge.swift
#	Sources/Observing/ListMonitor.swift
#	Sources/Setup/DataStack.swift
#	Sources/Setup/StorageInterfaces/ICloudStore.swift
#	Sources/Setup/StorageInterfaces/LegacySQLiteStore.swift
#	Sources/Setup/StorageInterfaces/SQLiteStore.swift
#	Sources/Setup/StorageInterfaces/StorageInterface.swift
This commit is contained in:
John Estropia
2016-09-27 18:55:37 +09:00
parent 54be9d471c ed8c7b35e8
commit 2e44f86eb6
21 changed files with 227 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
Sources/Internal/CoreStoreFetchRequest.swift → Sources/Internal/CoreStoreFetchRequest+CoreStore.swift
View File

14
Sources/Internal/FetchedResultsControllerDelegate.swift
View File

@@ -132,6 +132,16 @@ internal final class FetchedResultsControllerDelegate<EntityType: NSManagedObjec
}
}
if #available(iOS 10.0, tvOS 10.0, watchOS 3.0, *) {
// I don't know if iOS 10 even attempted to fix this mess...
if case .update = actualType,
indexPath != nil && newIndexPath != nil {
actualType = .move
}
}
switch actualType {
case .update:
@@ -141,8 +151,8 @@ internal final class FetchedResultsControllerDelegate<EntityType: NSManagedObjec
}
if self.deletedSections.contains(section)
|| self.insertedSections.contains(section) {
return
return
}
case .move: