starred/CoreStore
1
0
Fork 0
mirror of https://github.com/JohnEstropia/CoreStore.git synced 2026-03-29 13:51:48 +02:00
Code Issues 95 Packages Projects Releases 10 Wiki Activity

Merge branch 'develop' into corestore2_develop

Browse Source 
# Conflicts:
#	CoreStore.podspec
#	CoreStore/CartFile
#	README.md
#	Sources/Info.plist
#	Sources/Internal/NSManagedObjectModel+Setup.swift
#	Sources/Logging/CoreStore+Logging.swift
This commit is contained in:
John Rommel Estropia
2016-03-23 21:23:08 +09:00
parent d9422f7f2e 928585029d
commit dd6c6abaf0
5 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Carthage/Checkouts/GCDKit vendored

Submodule Carthage/Checkouts/GCDKit updated: b927cd65a8...5d8c34772c

2
CoreStore.podspec
View File

@@ -18,5 +18,5 @@ Pod::Spec.new do |s|
s.requires_arc = true s.requires_arc = true
s.pod_target_xcconfig = { 'OTHER_SWIFT_FLAGS' => '-D USE_FRAMEWORKS' } s.pod_target_xcconfig = { 'OTHER_SWIFT_FLAGS' => '-D USE_FRAMEWORKS' }
s.dependency "GCDKit", "1.2.0" s.dependency "GCDKit", "1.2.1"
end end

1
CoreStore/CartFile Normal file
View File

@@ -0,0 +1 @@
github "JohnEstropia/GCDKit" == 1.2.1

2
Sources/Internal/NSManagedObjectModel+Setup.swift
View File

@@ -154,7 +154,7 @@ internal extension NSManagedObjectModel {
} }
@nonobjc internal func entityTypesMapping() -> [String: NSManagedObject.Type] { @nonobjc internal func entityTypesMapping() -> [String: NSManagedObject.Type] {
var mapping = [String: NSManagedObject.Type]() var mapping = [String: NSManagedObject.Type]()
self.entityNameMapping.forEach { (className, entityName) in self.entityNameMapping.forEach { (className, entityName) in

2
Sources/Migrating/MigrationChain.swift
View File

@@ -128,7 +128,7 @@ public struct MigrationChain: NilLiteralConvertible, StringLiteralConvertible, D
return versionTree[tuple.1] == nil return versionTree[tuple.1] == nil
}.map { $1 } }.map { $1 }
) )
let isVersionAmbiguous = { (start: String) -> Bool in let isVersionAmbiguous = { (start: String) -> Bool in