Merge pull request #5 from AndrewSB/patch-1

Target RxSwift 3
inamiy · Oct 26, 2016 · 596df45 · 596df45
2 parents 3890e36 + 19a4e19
commit 596df45
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 9 deletions.
diff --git a/Cartfile b/Cartfile
@@ -1 +1 @@
-github "ReactiveX/RxSwift" "3.0.0-beta.1" #~> 3.0
+github "ReactiveX/RxSwift" ~> 3.0
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,5 +1,5 @@
-github "Quick/Nimble" "v5.0.0"
+github "Quick/Nimble" "v5.1.0"
 github "shu223/Pulsator" "0.2.0"
 github "Quick/Quick" "v0.10.0"
-github "ReactiveX/RxSwift" "3.0.0-beta.1"
+github "ReactiveX/RxSwift" "3.0.0"
 github "mrackwitz/xcconfigs" "3.0"
diff --git a/Carthage/Checkouts/Nimble b/Carthage/Checkouts/Nimble
diff --git a/Carthage/Checkouts/RxSwift b/Carthage/Checkouts/RxSwift
diff --git a/Tests/MappingSpec.swift b/Tests/MappingSpec.swift
@@ -7,7 +7,7 @@
 //
 
 import RxSwift
-import RxTests
+import RxTest
 import RxAutomaton
 import Quick
 import Nimble

diff --git a/Tests/NextMappingSpec.swift b/Tests/NextMappingSpec.swift
@@ -7,7 +7,7 @@
 //
 
 import RxSwift
-import RxTests
+import RxTest
 import RxAutomaton
 import Quick
 import Nimble

diff --git a/Tests/TerminatingSpec.swift b/Tests/TerminatingSpec.swift
@@ -37,10 +37,11 @@ class TerminatingSpec: QuickSpec
                 signal = signal_
                 observer = observer_
 
-                let sendInput1And2AfterDelay: Observable<MyInput> = [
+
+                let sendInput1And2AfterDelay: Observable<MyInput> = Observable.concat([
                     Observable.just(.input1).delay(1, onScheduler: testScheduler),
                     Observable.just(.input2).delay(1, onScheduler: testScheduler),
-                ].concat()
+                ])
 
                 let mappings: [Automaton.NextMapping] = [
                     .input0 | .state0 => .state1 | sendInput1And2AfterDelay,