Skip to content
Permalink
Browse files

Removed support to UIWebView

  • Loading branch information...
gringoireDM authored and kzaher committed Sep 13, 2019
1 parent f6115f5 commit 529681e180f79559af81aa296dcc17111eeb8a8a
@@ -31,9 +31,6 @@
271A97411CFC996B00D64125 /* UIViewController+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = 271A97401CFC996B00D64125 /* UIViewController+Rx.swift */; };
271A97441CFC9F7B00D64125 /* UIViewController+RxTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 271A97421CFC99FE00D64125 /* UIViewController+RxTests.swift */; };
4583D8231FE94BBA00AA1BB1 /* Recorded+Event.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4583D8211FE94BB100AA1BB1 /* Recorded+Event.swift */; };
4613456F1D9A4467001ABAF2 /* UIWebView+RxTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4613456E1D9A4467001ABAF2 /* UIWebView+RxTests.swift */; };
461345711D9A4543001ABAF2 /* UIWebView+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = 461345701D9A4543001ABAF2 /* UIWebView+Rx.swift */; };
4613457C1D9A4AEE001ABAF2 /* RxWebViewDelegateProxy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4613457B1D9A4AEE001ABAF2 /* RxWebViewDelegateProxy.swift */; };
46307D4E1CDE77D800E47A1C /* UIAlertAction+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = 46307D4D1CDE77D800E47A1C /* UIAlertAction+Rx.swift */; };
4C5213AA225D41E60079FC77 /* CompactMap.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C5213A9225D41E60079FC77 /* CompactMap.swift */; };
4C5213AE225E224F0079FC77 /* Observable+CompactMapTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C5213AB225E20350079FC77 /* Observable+CompactMapTests.swift */; };
@@ -949,9 +946,6 @@
271A97401CFC996B00D64125 /* UIViewController+Rx.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIViewController+Rx.swift"; sourceTree = "<group>"; };
271A97421CFC99FE00D64125 /* UIViewController+RxTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIViewController+RxTests.swift"; sourceTree = "<group>"; };
4583D8211FE94BB100AA1BB1 /* Recorded+Event.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Recorded+Event.swift"; sourceTree = "<group>"; };
4613456E1D9A4467001ABAF2 /* UIWebView+RxTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIWebView+RxTests.swift"; sourceTree = "<group>"; };
461345701D9A4543001ABAF2 /* UIWebView+Rx.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIWebView+Rx.swift"; sourceTree = "<group>"; };
4613457B1D9A4AEE001ABAF2 /* RxWebViewDelegateProxy.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RxWebViewDelegateProxy.swift; sourceTree = "<group>"; };
46307D4D1CDE77D800E47A1C /* UIAlertAction+Rx.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIAlertAction+Rx.swift"; sourceTree = "<group>"; };
4C5213A9225D41E60079FC77 /* CompactMap.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CompactMap.swift; sourceTree = "<group>"; };
4C5213AB225E20350079FC77 /* Observable+CompactMapTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Observable+CompactMapTests.swift"; sourceTree = "<group>"; };
@@ -1926,7 +1920,6 @@
C8F27DB11CE6711600D5FB4F /* UITextView+RxTests.swift */,
C83508F11C38706D0027C24C /* UIView+RxTests.swift */,
271A97421CFC99FE00D64125 /* UIViewController+RxTests.swift */,
4613456E1D9A4467001ABAF2 /* UIWebView+RxTests.swift */,
C8A81CA51E05EAF70008DEF4 /* Binder+Tests.swift */,
6B9CA56D202A1F96002C2D11 /* KeyPathBinder+RxTests.swift */,
);
@@ -2206,7 +2199,6 @@
54D2138C1CE081890028D5B4 /* UINavigationItem+Rx.swift */,
844BC8B31CE4FD7500F5C7CB /* UIPickerView+Rx.swift */,
46307D4D1CDE77D800E47A1C /* UIAlertAction+Rx.swift */,
461345701D9A4543001ABAF2 /* UIWebView+Rx.swift */,
);
path = iOS;
sourceTree = "<group>";
@@ -2257,7 +2249,6 @@
846436E11C9AF64C0035B40D /* RxSearchControllerDelegateProxy.swift */,
844BC8AA1CE4FA5600F5C7CB /* RxPickerViewDelegateProxy.swift */,
D9080ACD1EA05A16002B433B /* RxNavigationControllerDelegateProxy.swift */,
4613457B1D9A4AEE001ABAF2 /* RxWebViewDelegateProxy.swift */,
A520FFFB1F0D291500573734 /* RxPickerViewDataSourceProxy.swift */,
);
path = Proxies;
@@ -2963,7 +2954,6 @@
C83E39822189066F001F4F0E /* NSSlider+Rx.swift in Sources */,
844BC8B41CE4FD7500F5C7CB /* UIPickerView+Rx.swift in Sources */,
C89AB20E1DAAC3350065FBE6 /* Logging.swift in Sources */,
461345711D9A4543001ABAF2 /* UIWebView+Rx.swift in Sources */,
C83E39802189066F001F4F0E /* NSControl+Rx.swift in Sources */,
C8093EE31B8A732E0088E94D /* DelegateProxyType.swift in Sources */,
C8093EFD1B8A732E0088E94D /* RxTarget.swift in Sources */,
@@ -3061,7 +3051,6 @@
C882541A1B8A752B00B02D69 /* RxCollectionViewDataSourceType.swift in Sources */,
C8A81CA01E05E82C0008DEF4 /* DispatchQueue+Extensions.swift in Sources */,
C88254351B8A752B00B02D69 /* UITextField+Rx.swift in Sources */,
4613457C1D9A4AEE001ABAF2 /* RxWebViewDelegateProxy.swift in Sources */,
C88254301B8A752B00B02D69 /* UISearchBar+Rx.swift in Sources */,
C89AB2121DAAC3350065FBE6 /* NotificationCenter+Rx.swift in Sources */,
C88254181B8A752B00B02D69 /* ItemEvents.swift in Sources */,
@@ -3191,7 +3180,6 @@
C898147E1E75AD380035949C /* PrimitiveSequenceTest+zip+arity.swift in Sources */,
C8C4F1631DE9D0A800003FA7 /* UIProgressView+RxTests.swift in Sources */,
C8A81CA61E05EAF70008DEF4 /* Binder+Tests.swift in Sources */,
4613456F1D9A4467001ABAF2 /* UIWebView+RxTests.swift in Sources */,
C820A9BA1EB5097700D431BC /* Observable+TakeTests.swift in Sources */,
C835094C1C38706E0027C24C /* AssumptionsTest.swift in Sources */,
6B9CA56E202A206A002C2D11 /* KeyPathBinder+RxTests.swift in Sources */,
@@ -222,15 +222,6 @@ extension ObservableType {
}
#endif

#if os(iOS) && !targetEnvironment(UIKitForMac)
extension UIWebView {
@available(*, unavailable, message: "createRxDelegateProxy is now unavailable, check DelegateProxyFactory")
public func createRxDelegateProxy() -> RxWebViewDelegateProxy {
fatalError()
}
}
#endif

#if os(macOS)
import Cocoa

This file was deleted.

This file was deleted.

@@ -92,14 +92,6 @@ extension DelegateProxyTest {
}
#endif

#if os(iOS)
extension DelegateProxyTest {
func test_UIWebViewDelegateExtension() {
performDelegateTest(UIWebViewSubclass(frame: CGRect.zero)) { ExtendWebViewDelegateProxy(webViewSubclass: $0) }
}
}
#endif

extension DelegateProxyTest {
func test_UITabBarControllerDelegateExtension() {
performDelegateTest(UITabBarControllerSubclass()) { ExtendTabBarControllerDelegateProxy(tabBarControllerSubclass: $0) }
@@ -458,32 +450,6 @@ final class UIPickerViewSubclass2: UIPickerView, TestDelegateControl {
return RxPickerViewDataSourceProxy.installForwardDelegate(testDelegate, retainDelegate: false, onProxyForObject: self)
}
}

final class ExtendWebViewDelegateProxy
: RxWebViewDelegateProxy
, TestDelegateProtocol {
init(webViewSubclass: UIWebViewSubclass) {
super.init(webView: webViewSubclass)
}
}

final class UIWebViewSubclass: UIWebView, TestDelegateControl {
func doThatTest(_ value: Int) {
(delegate as! TestDelegateProtocol).testEventHappened?(value)
}

var delegateProxy: DelegateProxy<UIWebView, UIWebViewDelegate> {
return self.rx.delegate
}

func setMineForwardDelegate(_ testDelegate: UIWebViewDelegate) -> Disposable {
return RxWebViewDelegateProxy.installForwardDelegate(testDelegate,
retainDelegate: false,
onProxyForObject: self)
}

}

#endif


@@ -767,7 +767,6 @@ extension MockTestDelegateProtocol
#if os(iOS)
extension MockTestDelegateProtocol
: UIPickerViewDelegate
, UIWebViewDelegate
{
}
#endif

This file was deleted.

0 comments on commit 529681e

Please sign in to comment.
You can’t perform that action at this time.