Skip to content

Commit da4b24b

Browse files
authored
Merge pull request #81 from Carthage/reactiveswift-1.0.0-rc-1
Update ReactiveSwift to 1.0.0-rc.1
2 parents dd85e8d + 2d14f53 commit da4b24b

File tree

7 files changed

+11
-8
lines changed

7 files changed

+11
-8
lines changed

.travis.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ language: objective-c
22
xcode_workspace: ReactiveTask.xcworkspace
33
git:
44
submodules: false
5+
branches:
6+
only:
7+
- master
58
before_script:
69
- git submodule update --init --recursive
710
script:

Cartfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github "ReactiveCocoa/ReactiveSwift" "1.0.0-alpha.3"
1+
github "ReactiveCocoa/ReactiveSwift" "1.0.0-rc.1"

Cartfile.resolved

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
github "Quick/Nimble" "v5.0.0"
1+
github "Quick/Nimble" "v5.1.1"
22
github "Quick/Quick" "v0.10.0"
3-
github "antitypical/Result" "3.0.0"
3+
github "antitypical/Result" "3.1.0"
44
github "jspahrsummers/xcconfigs" "3d9d99634cae6d586e272543d527681283b33eb0"
5-
github "ReactiveCocoa/ReactiveSwift" "1.0.0-alpha.3"
5+
github "ReactiveCocoa/ReactiveSwift" "1.0.0-rc.1"

Carthage/Checkouts/Nimble

Submodule Nimble updated 58 files

Carthage/Checkouts/ReactiveSwift

Submodule ReactiveSwift updated 47 files

ReactiveTaskTests/TaskSpec.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ class TaskSpec: QuickSpec {
7070
let strings = [ "foo\n", "bar\n", "buzz\n", "fuzz\n" ]
7171
let data = strings.map { $0.data(using: .utf8)! }
7272

73-
let result = Task("/usr/bin/sort").launch(standardInput: SignalProducer(values: data))
73+
let result = Task("/usr/bin/sort").launch(standardInput: SignalProducer(data))
7474
.map { event in event.value }
7575
.skipNil()
7676
.single()

0 commit comments

Comments
 (0)