Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updating to RxSwift 5. #195

Merged
merged 12 commits into from
May 2, 2019
Merged

Updating to RxSwift 5. #195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
343bb61
Upating dependencies to Rx 4.5.0
LucianoPAlmeida Apr 6, 2019
facd182
Reverting version.
LucianoPAlmeida Apr 7, 2019
562e356
From 4.0.0 on package
LucianoPAlmeida Apr 7, 2019
acf36f7
Apply suggestions from code review
LucianoPAlmeida Apr 10, 2019
1503317
Updating to Rx 5.0
LucianoPAlmeida May 1, 2019
0115797
Updating to Rx 5.0 and fixing deprecated warnings.
LucianoPAlmeida May 1, 2019
06d48da
Swiftlint autocorrect on test directory.
LucianoPAlmeida May 1, 2019
5a74e85
Update all to 5.0
LucianoPAlmeida May 1, 2019
85984dd
Recorded.events()
LucianoPAlmeida May 1, 2019
890acc6
Xcode ctrl + i
LucianoPAlmeida May 1, 2019
3ace10a
Align with XCT...
LucianoPAlmeida May 1, 2019
524688f
Adjustments on identation
LucianoPAlmeida May 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .swift-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.2
5.0
4 changes: 2 additions & 2 deletions Action.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ Pod::Spec.new do |s|
s.source_files = "Sources/**/*.{swift}"

s.frameworks = "Foundation"
s.dependency "RxSwift", "~> 4.0"
s.dependency "RxCocoa", "~> 4.0"
s.dependency "RxSwift", "~> 5.0"
s.dependency "RxCocoa", "~> 5.0"

s.watchos.exclude_files = "Control+Action.swift", "Button+Action.swift", "UIBarButtonItem+Action.swift", "UIAlertAction+Action.swift"
s.osx.exclude_files = "UIBarButtonItem+Action.swift", "UIAlertAction+Action.swift"
Expand Down
2 changes: 1 addition & 1 deletion Cartfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
github "ReactiveX/RxSwift" ~> 4.4.2
github "ReactiveX/RxSwift" ~> 5.0
2 changes: 1 addition & 1 deletion Cartfile.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
github "Quick/Nimble" "v8.0.1"
github "Quick/Quick" "v2.1.0"
github "ReactiveX/RxSwift" "4.5.0"
github "ReactiveX/RxSwift" "5.0.1"
4 changes: 2 additions & 2 deletions Package.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"repositoryURL": "https://github.com/ReactiveX/RxSwift.git",
"state": {
"branch": null,
"revision": "12cccb171ad9038251af6883807f0290c1d75a5b",
"version": "4.0.0"
"revision": "b3e888b4972d9bc76495dd74d30a8c7fad4b9395",
"version": "5.0.1"
}
}
]
Expand Down
2 changes: 1 addition & 1 deletion Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ let package = Package(
targets: ["Action"]),
],
dependencies: [
.package(url: "https://github.com/ReactiveX/RxSwift.git", from: "4.0.0")
.package(url: "https://github.com/ReactiveX/RxSwift.git", from: "5.0.0")
],
targets: [
// Targets are the basic building blocks of a package. A target can define a module or a test suite.
Expand Down
2 changes: 1 addition & 1 deletion Sources/Action/Action.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public final class Action<Input, Element> {
public convenience init<O: ObservableConvertibleType>(
enabledIf: Observable<Bool> = Observable.just(true),
workFactory: @escaping (Input) -> O
) where O.E == Element {
) where O.Element == Element {
self.init(enabledIf: enabledIf) {
workFactory($0).asObservable()
}
Expand Down
Loading