Skip to content

Commit a69d756

Browse files
committed
Add support for RxSwift 6
1 parent f800f43 commit a69d756

7 files changed

+22
-18
lines changed

Diff for: Cartfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github "ReactiveX/RxSwift" ~> 5.0
1+
github "ReactiveX/RxSwift" ~> 6.0

Diff for: Cartfile.resolved

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
github "Quick/Nimble" "v8.0.7"
2-
github "Quick/Quick" "v2.2.0"
3-
github "ReactiveX/RxSwift" "5.1.1"
1+
github "Quick/Nimble" "v9.0.0"
2+
github "Quick/Quick" "v3.0.0"
3+
github "ReactiveX/RxSwift" "6.0.0"

Diff for: Example/FailedRequestViewController.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class FailedRequestViewController: UIViewController {
2323

2424
wkWebView.rx
2525
.didFailProvisionalNavigation
26-
.observeOn(MainScheduler.instance)
26+
.observe(on: MainScheduler.instance)
2727
.debug("didFailProvisionalNavigation")
2828
.subscribe(onNext: { [weak self] webView, navigation, error in
2929
guard let self = self else { return }

Diff for: Example/InvokeJSFunctionViewController.swift

+12-8
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,18 @@ class InvokeJSFunctionViewController : UIViewController {
4343
super.viewDidLoad()
4444
view.addSubview(webview)
4545
self.navigationItem.rightBarButtonItem = UIBarButtonItem(title: "Invoke", style: .plain, target: nil, action: nil)
46-
self.navigationItem.rightBarButtonItem?.rx.tap.bind { [weak self] in
47-
guard let self = self else { return }
48-
self.webview.rx.evaluateJavaScript("presentAlert()").observeOn(MainScheduler.asyncInstance).subscribe { event in
49-
if case .next(let body) = event, let message = body as? String {
50-
print(message)
51-
}
52-
}.disposed(by: self.bag)
53-
}.disposed(by: self.bag)
46+
self.navigationItem.rightBarButtonItem?.rx.tap
47+
.bind { [weak self] in
48+
guard let self = self else { return }
49+
self.webview.rx.evaluateJavaScript("presentAlert()")
50+
.observe(on: MainScheduler.asyncInstance)
51+
.subscribe { event in
52+
if case .next(let body) = event, let message = body as? String {
53+
print(message)
54+
}
55+
}.disposed(by: self.bag)
56+
}
57+
.disposed(by: self.bag)
5458
webview.loadHTMLString(html, baseURL: nil)
5559
}
5660

Diff for: Example/RedirectViewController.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class RedirectViewController: UIViewController {
2424

2525
wkWebView.rx
2626
.didReceiveServerRedirectForProvisionalNavigation
27-
.observeOn(MainScheduler.instance)
27+
.observe(on: MainScheduler.instance)
2828
.debug("didReceiveServerRedirectForProvisionalNavigation")
2929
.subscribe(onNext: { [weak self] webView, navigation in
3030
guard let self = self else { return }

Diff for: README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ $(SRCROOT)/carthage/Build/iOS/RxWebKit.framework
5959

6060
## Requirements
6161

62-
RxWebKit requires Swift 5.2.2 and dedicated versions of RxSwift 5.1.1
62+
RxWebKit requires Swift 5.2.2 and dedicated versions of RxSwift 6.0.0
6363

6464
## License
6565

Diff for: RxWebKit.podspec

+3-3
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ Pod::Spec.new do |s|
3636
s.source = { :git => "https://github.com/RxSwiftCommunity/RxWebKit.git", :tag => s.version.to_s }
3737
s.source_files = "RxWebKit/Sources/**/*.{swift}"
3838
s.exclude_files = "RxWebKit/Sources/**/*.{plist}"
39-
s.ios.deployment_target = '8.0'
39+
s.ios.deployment_target = '9.0'
4040
s.osx.deployment_target = '10.13'
4141
s.swift_version = '5.0'
42-
s.dependency 'RxSwift', '~> 5.0'
43-
s.dependency 'RxCocoa', '~> 5.0'
42+
s.dependency 'RxSwift', '~> 6.0'
43+
s.dependency 'RxCocoa', '~> 6.0'
4444
end

0 commit comments

Comments
 (0)