Merge branch 'develop' into swift3_develop

# Conflicts:
#	Sources/Internal/NotificationObserver.swift
This commit is contained in:
John Estropia
2016-09-06 12:05:40 +09:00
3 changed files with 3 additions and 11 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
Pod::Spec.new do |s| Pod::Spec.new do |s|
s.name = "CoreStore" s.name = "CoreStore"
s.version = "2.0.3" s.version = "2.0.4"
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"
+1 -1
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>2.0.3</string> <string>2.0.4</string>
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>????</string> <string>????</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
+1 -9
View File
@@ -32,14 +32,10 @@ internal final class NotificationObserver {
// MARK: Public // MARK: Public
let notificationName: Notification.Name
let object: AnyObject?
let observer: NSObjectProtocol let observer: NSObjectProtocol
init(notificationName: Notification.Name, object: AnyObject?, queue: OperationQueue? = nil, closure: @escaping (_ note: Notification) -> Void) { init(notificationName: Notification.Name, object: AnyObject?, queue: OperationQueue? = nil, closure: @escaping (_ note: Notification) -> Void) {
self.notificationName = notificationName
self.object = object
self.observer = NotificationCenter.default.addObserver( self.observer = NotificationCenter.default.addObserver(
forName: notificationName, forName: notificationName,
object: object, object: object,
@@ -50,10 +46,6 @@ internal final class NotificationObserver {
deinit { deinit {
NotificationCenter.default.removeObserver( NotificationCenter.default.removeObserver(self.observer)
self.observer,
name: self.notificationName,
object: self.object
)
} }
} }