mirror of
https://github.com/JohnEstropia/CoreStore.git
synced 2026-11-14 21:03:51 +01:00
Merge branch 'corestore2_develop' into corestore2_develop_objc
# Conflicts: # Sources/Migrating/MigrationChain.swift
This commit is contained in:
commit
ed8891a6d5
4 files changed
+4
-3
No files matched your search
Vendored
+1
-1
Submodule Carthage/Checkouts/GCDKit updated: b927cd65a8...5d8c34772c.
+1
-1
@@ -18,5 +18,5 @@ Pod::Spec.new do |s|
|
||||
s.requires_arc = true
|
||||
s.pod_target_xcconfig = { 'OTHER_SWIFT_FLAGS' => '-D USE_FRAMEWORKS' }
|
||||
|
||||
s.dependency "GCDKit", "1.2.0"
|
||||
s.dependency "GCDKit", "1.2.1"
|
||||
end
|
||||
@@ -0,0 +1 @@
|
||||
github "JohnEstropia/GCDKit" == 1.2.1
|
||||
@@ -154,7 +154,7 @@ internal extension NSManagedObjectModel {
|
||||
}
|
||||
|
||||
@nonobjc internal func entityTypesMapping() -> [String: NSManagedObject.Type] {
|
||||
|
||||
|
||||
var mapping = [String: NSManagedObject.Type]()
|
||||
self.entityNameMapping.forEach { (className, entityName) in
|
||||
|
||||
|
||||
Reference in new issue
Block a user