Replaces DelegateProxy delegate conformance to NSObjectProtocol w…

…ith `AnyObject`. ReactiveX#1442
sue71 · Oct 17, 2017 · bb83428 · bb83428
1 parent fc6de4f
commit bb83428
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/RxCocoa/Common/DelegateProxy.swift b/RxCocoa/Common/DelegateProxy.swift
@@ -18,7 +18,7 @@
  /// Base class for `DelegateProxyType` protocol.
  ///
  /// This implementation is not thread safe and can be used only from one thread (Main thread).
- open class DelegateProxy<P: AnyObject, D: NSObjectProtocol>: _RXDelegateProxy {
+ open class DelegateProxy<P: AnyObject, D: AnyObject>: _RXDelegateProxy {
  public typealias ParentObject = P
  public typealias Delegate = D
 
@@ -171,7 +171,7 @@
  return
  }
 
- guard (self.forwardToDelegate()?.responds(to: selector) ?? false) || voidDelegateMethodsContain(selector) else {
+ guard ((self.forwardToDelegate() as? NSObject)?.responds(to: selector) ?? false) || voidDelegateMethodsContain(selector) else {
  rxFatalError("This class doesn't respond to selector \(selector)")
  }
  }
@@ -190,7 +190,7 @@
  /// through `self`.
  ///
  /// - returns: Value of reference if set or nil.
- public func forwardToDelegate() -> Delegate? {
+ open func forwardToDelegate() -> Delegate? {
  return castOptionalOrFatalError(self._forwardToDelegate)
  }
 

diff --git a/RxCocoa/Common/DelegateProxyType.swift b/RxCocoa/Common/DelegateProxyType.swift
@@ -72,7 +72,7 @@ Since RxCocoa needs to automagically create those Proxys and because views that
  RxScrollViewDelegateProxy.register { RxTableViewDelegateProxy(parentObject: $0) }
 
 */
-public protocol DelegateProxyType : AnyObject {
+public protocol DelegateProxyType: class {
  associatedtype ParentObject: AnyObject
  associatedtype Delegate: AnyObject