Dispose UIKit related stuff on the main thread

DeclarativeHub · Dec 12, 2019 · 28373ce · 28373ce
1 parent 84eaa8e
commit 28373ce
Show file tree

Hide file tree

Showing 9 changed files with 52 additions and 27 deletions.
diff --git a/Bond.podspec b/Bond.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name         = "Bond"
-  s.version      = "7.6.1"
+  s.version      = "7.6.2"
   s.summary      = "A Swift binding framework"
 
   s.description  = <<-DESC
@@ -21,7 +21,7 @@ Pod::Spec.new do |s|
   s.ios.deployment_target = "8.0"
   s.osx.deployment_target = "10.11"
   s.tvos.deployment_target = "9.0"
-  s.source       = { :git => "https://github.com/SwiftBond/Bond.git", :tag => "7.6.1" }
+  s.source       = { :git => "https://github.com/SwiftBond/Bond.git", :tag => "7.6.2" }
   s.source_files  = "Sources/**/*.{h,m,swift}", "Supporting Files/Bond.h"
   s.ios.exclude_files = "Sources/Bond/AppKit"
   s.tvos.exclude_files = "Sources/Bond/AppKit"

diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,2 +1,2 @@
-github "DeclarativeHub/ReactiveKit" "v3.14.2"
+github "DeclarativeHub/ReactiveKit" "v3.15.4"
 github "tonyarnold/Differ" "1.4.3"
diff --git a/Sources/Bond/AppKit/NSGestureRecognizer.swift b/Sources/Bond/AppKit/NSGestureRecognizer.swift
@@ -50,7 +50,9 @@ extension ReactiveExtensions where Base: NSView {
                 observer.receive(recog as! T)
             }
             return BlockDisposable {
-                target.unregister()
+                ExecutionContext.immediateOnMain.execute {
+                    target.unregister()
+                }
             }
         }
         .prefix(untilOutputFrom: base.deallocated)

diff --git a/Sources/Bond/ProtocolProxy.swift b/Sources/Bond/ProtocolProxy.swift
@@ -73,8 +73,10 @@ public class ProtocolProxy: BNDProtocolProxyBase {
         }
         registerDelegate()
         return BlockDisposable { [weak self] in
-            self?.invokers[selector] = nil
-            self?.registerDelegate()
+            ExecutionContext.immediateOnMain.execute {
+                self?.invokers[selector] = nil
+                self?.registerDelegate()
+            }
         }
     }
 
@@ -85,8 +87,10 @@ public class ProtocolProxy: BNDProtocolProxyBase {
         }
         registerDelegate()
         return BlockDisposable { [weak self] in
-            self?.invokers[selector] = nil
-            self?.registerDelegate()
+            ExecutionContext.immediateOnMain.execute {
+                self?.invokers[selector] = nil
+                self?.registerDelegate()
+            }
         }
     }
 
@@ -97,8 +101,10 @@ public class ProtocolProxy: BNDProtocolProxyBase {
         }
         registerDelegate()
         return BlockDisposable { [weak self] in
-            self?.invokers[selector] = nil
-            self?.registerDelegate()
+            ExecutionContext.immediateOnMain.execute {
+                self?.invokers[selector] = nil
+                self?.registerDelegate()
+            }
         }
     }
 
@@ -109,8 +115,10 @@ public class ProtocolProxy: BNDProtocolProxyBase {
         }
         registerDelegate()
         return BlockDisposable { [weak self] in
-            self?.invokers[selector] = nil
-            self?.registerDelegate()
+            ExecutionContext.immediateOnMain.execute {
+                self?.invokers[selector] = nil
+                self?.registerDelegate()
+            }
         }
     }
 
@@ -121,8 +129,10 @@ public class ProtocolProxy: BNDProtocolProxyBase {
         }
         registerDelegate()
         return BlockDisposable { [weak self] in
-            self?.invokers[selector] = nil
-            self?.registerDelegate()
+            ExecutionContext.immediateOnMain.execute {
+                self?.invokers[selector] = nil
+                self?.registerDelegate()
+            }
         }
     }
 
@@ -133,8 +143,10 @@ public class ProtocolProxy: BNDProtocolProxyBase {
         }
         registerDelegate()
         return BlockDisposable { [weak self] in
-            self?.invokers[selector] = nil
-            self?.registerDelegate()
+            ExecutionContext.immediateOnMain.execute {
+                self?.invokers[selector] = nil
+                self?.registerDelegate()
+            }
         }
     }
 
@@ -147,7 +159,11 @@ public class ProtocolProxy: BNDProtocolProxyBase {
                 let disposable = CompositeDisposable()
                 disposable += registerInvoker(subject)
                 disposable += subject.observe(with: observer)
-                disposable += BlockDisposable { [weak self] in self?.handlers[selector] = nil }
+                disposable += BlockDisposable { [weak self] in
+                    ExecutionContext.immediateOnMain.execute {
+                        self?.handlers[selector] = nil
+                    }
+                }
                 return disposable
             }.share(limit: 0)
             handlers[selector] = signal

diff --git a/Sources/Bond/Shared/NSObject+KVO.swift b/Sources/Bond/Shared/NSObject+KVO.swift
@@ -75,13 +75,14 @@ extension ReactiveExtensions where Base: NSObject {
             }
 
             return DeinitDisposable(disposable: BlockDisposable {
-                if #available(iOS 11, *) {} else {
-                    let keyPathString = NSExpression(forKeyPath: keyPath).keyPath
-                    base.removeObserver(base, forKeyPath: keyPathString)
+                ExecutionContext.immediateOnMain.execute {
+                    if #available(iOS 11, *) {} else {
+                        let keyPathString = NSExpression(forKeyPath: keyPath).keyPath
+                        base.removeObserver(base, forKeyPath: keyPathString)
+                    }
+                    subscription.invalidate()
+                    disposable.dispose()
                 }
-
-                subscription.invalidate()
-                disposable.dispose()
             })
         }
     }

diff --git a/Sources/Bond/Shared/NotificationCenter.swift b/Sources/Bond/Shared/NotificationCenter.swift
@@ -34,7 +34,9 @@ extension ReactiveExtensions where Base: NotificationCenter {
                 observer.receive(notification)
             })
             return BlockDisposable {
-                self.base.removeObserver(subscription)
+                ExecutionContext.immediateOnMain.execute {
+                    self.base.removeObserver(subscription)
+                }
             }
         }
     }

diff --git a/Sources/Bond/UIKit/UIControl.swift b/Sources/Bond/UIKit/UIControl.swift
@@ -40,7 +40,9 @@ extension ReactiveExtensions where Base: UIControl {
                 observer.receive(())
             }
             return BlockDisposable {
-                target.unregister()
+                ExecutionContext.immediateOnMain.execute {
+                    target.unregister()
+                }
             }
         }.prefix(untilOutputFrom: base.deallocated)
     }

diff --git a/Sources/Bond/UIKit/UIGestureRecognizer.swift b/Sources/Bond/UIKit/UIGestureRecognizer.swift
@@ -56,7 +56,9 @@ extension ReactiveExtensions where Base: UIView {
                 observer.receive(recog as! T)
             }
             return BlockDisposable {
-                target.unregister()
+                ExecutionContext.immediateOnMain.execute {
+                    target.unregister()
+                }
             }
         }.prefix(untilOutputFrom: base.deallocated)
     }

diff --git a/Supporting Files/Bond-Info.plist b/Supporting Files/Bond-Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>7.6.1</string>
+	<string>7.6.2</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>