starred/CoreStore
1
0
Fork 0
mirror of https://github.com/JohnEstropia/CoreStore.git synced 2026-03-30 14:21:49 +02:00
Code Issues 95 Packages Projects Releases 10 Wiki Activity

Merge branch 'develop' into corestore4_develop

Browse Source 
# Conflicts:
#	CoreStore.xcodeproj/project.pbxproj
This commit is contained in:
John Estropia
2017-03-28 11:38:02 +09:00
parent b97f6d6a0a 716e069984
commit d72d1afe8b
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CoreStore.podspec
View File

@@ -1,6 +1,6 @@
Pod::Spec.new do |s| Pod::Spec.new do |s|
s.name = "CoreStore" s.name = "CoreStore"
s.version = "3.0.3" s.version = "3.1.0"
s.license = "MIT" s.license = "MIT"
s.summary = "Unleashing the real power of Core Data with the elegance and safety of Swift" s.summary = "Unleashing the real power of Core Data with the elegance and safety of Swift"
s.homepage = "https://github.com/JohnEstropia/CoreStore" s.homepage = "https://github.com/JohnEstropia/CoreStore"

2
Sources/Info.plist
View File

@@ -15,7 +15,7 @@
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>FMWK</string> <string>FMWK</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>3.0.3</string> <string>3.1.0</string>
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>????</string> <string>????</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>

4
Sources/Observing/ListMonitor.swift
View File

@@ -202,7 +202,7 @@ public final class ListMonitor<T: NSManagedObject>: Hashable {
!self.isPendingRefetch || Thread.isMainThread, !self.isPendingRefetch || Thread.isMainThread,
"Attempted to access a \(cs_typeName(self)) outside the main thread while a refetch is in progress." "Attempted to access a \(cs_typeName(self)) outside the main thread while a refetch is in progress."
) )
return (self.fetchedResultsController.fetchedObjects as? [T]) ?? [] return self.fetchedResultsController.dynamicCast().fetchedObjects ?? []
} }
/** /**
@@ -371,7 +371,7 @@ public final class ListMonitor<T: NSManagedObject>: Hashable {
!self.isPendingRefetch || Thread.isMainThread, !self.isPendingRefetch || Thread.isMainThread,
"Attempted to access a \(cs_typeName(self)) outside the main thread while a refetch is in progress." "Attempted to access a \(cs_typeName(self)) outside the main thread while a refetch is in progress."
) )
return (self.fetchedResultsController.fetchedObjects as? [T] ?? []).index(of: object) return (self.fetchedResultsController.dynamicCast().fetchedObjects ?? []).index(of: object)
} }
/** /**