Skip to content

Commit 4d540f0

Browse files
committed
Update ReactiveSwift to 1.1
1 parent 53ad7a6 commit 4d540f0

File tree

7 files changed

+7
-12
lines changed

7 files changed

+7
-12
lines changed

.Package.test.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import PackageDescription
33
let package = Package(
44
name: "ReactiveTask",
55
dependencies: [
6-
.Package(url: "https://github.com/ReactiveCocoa/ReactiveSwift.git", majorVersion: 1),
6+
.Package(url: "https://github.com/ReactiveCocoa/ReactiveSwift.git", versions: Version(1, 1, 0)..<Version(1, .max, .max)),
77
.Package(url: "https://github.com/Quick/Quick.git", majorVersion: 1, minor: 1),
88
.Package(url: "https://github.com/Quick/Nimble.git", majorVersion: 6),
99
]

Cartfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github "ReactiveCocoa/ReactiveSwift" ~> 1.0
1+
github "ReactiveCocoa/ReactiveSwift" ~> 1.1

Cartfile.resolved

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
github "Quick/Nimble" "v6.0.1"
22
github "Quick/Quick" "v1.1.0"
3+
github "ReactiveCocoa/ReactiveSwift" "1.1.0"
34
github "antitypical/Result" "3.1.0"
45
github "jspahrsummers/xcconfigs" "3d9d99634cae6d586e272543d527681283b33eb0"
5-
github "ReactiveCocoa/ReactiveSwift" "1.0.0"

Carthage/Checkouts/ReactiveSwift

Submodule ReactiveSwift updated 49 files

Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ import PackageDescription
33
let package = Package(
44
name: "ReactiveTask",
55
dependencies: [
6-
.Package(url: "https://github.com/ReactiveCocoa/ReactiveSwift.git", majorVersion: 1),
6+
.Package(url: "https://github.com/ReactiveCocoa/ReactiveSwift.git", versions: Version(1, 1, 0)..<Version(1, .max, .max)),
77
]
88
)

Sources/Task.swift

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -389,11 +389,7 @@ extension Signal where Value: TaskEventType {
389389
/// Ignores incremental standard output and standard error data from the given
390390
/// task, sending only a single value with the final, aggregated result.
391391
public func ignoreTaskData() -> Signal<Value.T, Error> {
392-
return self
393-
.map { event in
394-
return event.value
395-
}
396-
.skipNil()
392+
return self.filterMap { $0.value }
397393
}
398394
}
399395

Tests/ReactiveTaskTests/TaskSpec.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,7 @@ class TaskSpec: QuickSpec {
7171
let data = strings.map { $0.data(using: .utf8)! }
7272

7373
let result = Task("/usr/bin/sort").launch(standardInput: SignalProducer(data))
74-
.map { event in event.value }
75-
.skipNil()
74+
.filterMap { event in event.value }
7675
.single()
7776

7877
expect(result).notTo(beNil())

0 commit comments

Comments
 (0)