Skip to content

Commit 03df53c

Browse files
lechristianlechristian
committed
Update ReactiveSwift to 6.0.0
1 parent 3e78574 commit 03df53c

20 files changed

+37
-53
lines changed

‎Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ let package = Package(
1111
targets: ["Workflow"]),
1212
],
1313
dependencies: [
14-
.package(url: "https://github.com/ReactiveCocoa/ReactiveSwift.git", from: "5.0.0")
14+
.package(url: "https://github.com/ReactiveCocoa/ReactiveSwift.git", from: "6.0.0")
1515
],
1616
targets: [
1717
.target(

‎Workflow.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Pod::Spec.new do |s|
1515

1616
s.source_files = 'swift/Workflow/Sources/*.swift'
1717

18-
s.dependency 'ReactiveSwift', '~> 5.0.0'
18+
s.dependency 'ReactiveSwift', '~> 6.0.0'
1919

2020
s.test_spec 'Tests' do |test_spec|
2121
test_spec.source_files = 'swift/Workflow/Tests/**/*.swift'

‎WorkflowTesting.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Pod::Spec.new do |s|
1515

1616
s.source_files = 'swift/WorkflowTesting/Sources/*.swift'
1717

18-
s.dependency 'ReactiveSwift', '~> 5.0.0'
18+
s.dependency 'ReactiveSwift', '~> 6.0.0'
1919
s.dependency 'Workflow', "#{s.version}"
2020
s.framework = 'XCTest'
2121

‎docs/tutorial/adding-workflow-to-a-project.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ You'll need the following four libraries:
1010
import Workflow
1111
import WorkflowUI
1212
import ReactiveSwift
13-
import Result
1413
```
1514

1615
The easiest way to integrate these libraries is via Cocoapods. If you are using Cocoapods, you can
@@ -24,7 +23,6 @@ Pod::Spec.new do |s|
2423
s.dependency 'Workflow'
2524
s.dependency 'WorkflowUI'
2625
s.dependency 'ReactiveSwift'
27-
s.dependency 'Result'
2826

2927
# ...
3028
end

‎docs/tutorial/building-a-workflow.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ struct RefreshWorker: Worker {
187187
case error(Error)
188188
}
189189

190-
func run() -> SignalProducer<RefreshWorker.Output, NoError> {
190+
func run() -> SignalProducer<RefreshWorker.Output, Never> {
191191
return SignalProducer(value: .success("We did it!"))
192192
.delay(1.0, on: QueueScheduler.main)
193193
}

‎docs/tutorial/using-a-workflow-for-ui.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Workflows and the UI that is ultimately displayed. On iOS, the container is impl
1212
public final class ContainerViewController<Output, ScreenType>: UIViewController where ScreenType: Screen {
1313

1414
/// Emits output events from the bound workflow.
15-
public let output: Signal<Output, NoError>
15+
public let output: Signal<Output, Never>
1616

1717
public convenience init<W: Workflow>(workflow: W, viewRegistry: ViewRegistry) where W.Rendering == ScreenType, W.Output == Output
1818
}

‎swift/Samples/SampleApp/Sources/DemoWorkflow.swift

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import Workflow
22
import WorkflowUI
33
import ReactiveSwift
4-
import Result
54

65

76
// MARK: Input and Output
@@ -111,7 +110,7 @@ struct RefreshWorker: Worker {
111110
case error(Error)
112111
}
113112

114-
func run() -> SignalProducer<RefreshWorker.Output, NoError> {
113+
func run() -> SignalProducer<RefreshWorker.Output, Never> {
115114
return SignalProducer(value: .success("We did it!"))
116115
.delay(1.0, on: QueueScheduler.main)
117116
}
@@ -200,12 +199,12 @@ extension DemoWorkflow {
200199

201200

202201
fileprivate class TimerSignal {
203-
let signal: Signal<Void, NoError>
204-
let observer: Signal<Void, NoError>.Observer
202+
let signal: Signal<Void, Never>
203+
let observer: Signal<Void, Never>.Observer
205204
let timer: Timer
206205

207206
init() {
208-
let (signal, observer) = Signal<Void, NoError>.pipe()
207+
let (signal, observer) = Signal<Void, Never>.pipe()
209208

210209
let timer = Timer.scheduledTimer(withTimeInterval: 1.0, repeats: true) { [weak observer] _ in
211210
observer?.send(value: ())

‎swift/Tooling/Templates/Workflow (Verbose).xctemplate/___FILEBASENAME___Workflow.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import Workflow
44
import WorkflowUI
55
import ReactiveSwift
6-
import Result
76

87

98
// MARK: Input and Output
@@ -63,7 +62,7 @@ extension ___VARIABLE_productName___Workflow {
6362

6463
}
6564

66-
func run() -> SignalProducer<Output, NoError> {
65+
func run() -> SignalProducer<Output, Never> {
6766
fatalError()
6867
}
6968

‎swift/Workflow/Sources/RenderContext.swift

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import ReactiveSwift
2-
import Result
32

43
/// `RenderContext` is the composition point for the workflow tree.
54
///
@@ -57,7 +56,7 @@ public class RenderContext<WorkflowType: Workflow>: RenderContextType {
5756
fatalError()
5857
}
5958

60-
public func subscribe<Action>(signal: Signal<Action, NoError>) where Action : WorkflowAction, WorkflowType == Action.WorkflowType {
59+
public func subscribe<Action>(signal: Signal<Action, Never>) where Action : WorkflowAction, WorkflowType == Action.WorkflowType {
6160
fatalError()
6261
}
6362

@@ -94,7 +93,7 @@ public class RenderContext<WorkflowType: Workflow>: RenderContextType {
9493
return implementation.makeSink(of: actionType)
9594
}
9695

97-
override func subscribe<Action>(signal: Signal<Action, NoError>) where WorkflowType == Action.WorkflowType, Action : WorkflowAction {
96+
override func subscribe<Action>(signal: Signal<Action, Never>) where WorkflowType == Action.WorkflowType, Action : WorkflowAction {
9897
assertStillValid()
9998
return implementation.subscribe(signal: signal)
10099
}
@@ -121,7 +120,7 @@ internal protocol RenderContextType: class {
121120

122121
func makeSink<Action>(of actionType: Action.Type) -> Sink<Action> where Action: WorkflowAction, Action.WorkflowType == WorkflowType
123122

124-
func subscribe<Action>(signal: Signal<Action, NoError>) where Action: WorkflowAction, Action.WorkflowType == WorkflowType
123+
func subscribe<Action>(signal: Signal<Action, Never>) where Action: WorkflowAction, Action.WorkflowType == WorkflowType
125124

126125
func awaitResult<W, Action>(for worker: W, outputMap: @escaping (W.Output) -> Action) where W: Worker, Action: WorkflowAction, Action.WorkflowType == WorkflowType
127126

‎swift/Workflow/Sources/SubtreeManager.swift

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import Dispatch
22
import ReactiveSwift
3-
import Result
43

54
extension WorkflowNode {
65

@@ -144,7 +143,7 @@ extension WorkflowNode.SubtreeManager {
144143
private let originalChildWorkers: [AnyChildWorker]
145144
private (set) internal var usedChildWorkers: [AnyChildWorker]
146145

147-
private (set) internal var eventSources: [Signal<AnyWorkflowAction<WorkflowType>, NoError>] = []
146+
private (set) internal var eventSources: [Signal<AnyWorkflowAction<WorkflowType>, Never>] = []
148147

149148
internal init(previousSinks: [ObjectIdentifier:AnyReusableSink], originalChildWorkflows: [ChildKey:AnyChildWorkflow], originalChildWorkers: [AnyChildWorker]) {
150149
self.eventPipes = []
@@ -214,7 +213,7 @@ extension WorkflowNode.SubtreeManager {
214213
return sink
215214
}
216215

217-
func subscribe<Action>(signal: Signal<Action, NoError>) where Action : WorkflowAction, WorkflowType == Action.WorkflowType {
216+
func subscribe<Action>(signal: Signal<Action, Never>) where Action : WorkflowAction, WorkflowType == Action.WorkflowType {
218217
eventSources.append(signal.map { AnyWorkflowAction($0) })
219218
}
220219

@@ -419,7 +418,7 @@ extension WorkflowNode.SubtreeManager {
419418

420419
let worker: W
421420

422-
let signalProducer: SignalProducer<W.Output, NoError>
421+
let signalProducer: SignalProducer<W.Output, Never>
423422

424423
private var outputMap: (W.Output) -> AnyWorkflowAction<WorkflowType>
425424

@@ -463,7 +462,7 @@ extension WorkflowNode.SubtreeManager {
463462
private var (lifetime, token) = Lifetime.make()
464463
private (set) internal var eventPipe: EventPipe
465464

466-
init(eventSources: [Signal<AnyWorkflowAction<WorkflowType>, NoError>], eventPipe: EventPipe) {
465+
init(eventSources: [Signal<AnyWorkflowAction<WorkflowType>, Never>], eventPipe: EventPipe) {
467466
self.eventPipe = eventPipe
468467

469468
Signal

‎swift/Workflow/Sources/Worker.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import ReactiveSwift
2-
import Result
32

43
/// Workers define a unit of asynchronous work.
54
///
@@ -15,7 +14,7 @@ public protocol Worker {
1514
associatedtype Output
1615

1716
/// Returns a signal producer to execute the work represented by this worker.
18-
func run() -> SignalProducer<Output, NoError>
17+
func run() -> SignalProducer<Output, Never>
1918

2019
/// Returns `true` if the other worker should be considered equivalent to `self`. Equivalence should take into
2120
/// account whatever data is meaninful to the task. For example, a worker that loads a user account from a server

‎swift/Workflow/Sources/WorkflowHost.swift

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import ReactiveSwift
2-
import Result
32

43
/// Defines a type that receives debug information about a running workflow hierarchy.
54
public protocol WorkflowDebugger {
@@ -21,7 +20,7 @@ public final class WorkflowHost<WorkflowType: Workflow> {
2120

2221
private let debugger: WorkflowDebugger?
2322

24-
private let (outputEvent, outputEventObserver) = Signal<WorkflowType.Output, NoError>.pipe()
23+
private let (outputEvent, outputEventObserver) = Signal<WorkflowType.Output, Never>.pipe()
2524

2625
private let rootNode: WorkflowNode<WorkflowType>
2726

@@ -81,7 +80,7 @@ public final class WorkflowHost<WorkflowType: Workflow> {
8180
}
8281

8382
/// A signal containing output events emitted by the root workflow in the hierarchy.
84-
public var output: Signal<WorkflowType.Output, NoError> {
83+
public var output: Signal<WorkflowType.Output, Never> {
8584
return outputEvent
8685
}
8786

‎swift/Workflow/Tests/AnyWorkflowTests.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import XCTest
22
@testable import Workflow
33
import ReactiveSwift
4-
import Result
54

65
public class AnyWorkflowTests: XCTestCase {
76

‎swift/Workflow/Tests/ConcurrencyTests.swift

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import XCTest
22
@testable import Workflow
33

44
import ReactiveSwift
5-
import Result
65

76

87
final class ConcurrencyTests: XCTestCase {
@@ -468,7 +467,7 @@ final class ConcurrencyTests: XCTestCase {
468467
struct DelayWorker: Worker {
469468
typealias Output = Action
470469

471-
func run() -> SignalProducer<Output, NoError> {
470+
func run() -> SignalProducer<Output, Never> {
472471
return SignalProducer(value: .update).delay(0.1, on: QueueScheduler.main)
473472
}
474473

@@ -501,7 +500,7 @@ final class ConcurrencyTests: XCTestCase {
501500
// MARK - Test Types
502501

503502
fileprivate class TestSignal {
504-
let (signal, observer) = Signal<Int, NoError>.pipe()
503+
let (signal, observer) = Signal<Int, Never>.pipe()
505504
var sent: Bool = false
506505

507506
func send(value: Int) {
@@ -595,7 +594,7 @@ final class ConcurrencyTests: XCTestCase {
595594
struct TestWorker: Worker {
596595
typealias Output = TestWorkflow.Action
597596

598-
func run() -> SignalProducer<Output, NoError> {
597+
func run() -> SignalProducer<Output, Never> {
599598
return SignalProducer(value: .update)
600599
}
601600

‎swift/Workflow/Tests/SubtreeManagerTests.swift

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import XCTest
22
@testable import Workflow
33
import ReactiveSwift
4-
import Result
54

65

76
final class SubtreeManagerTests: XCTestCase {
@@ -167,8 +166,8 @@ final class SubtreeManagerTests: XCTestCase {
167166

168167
typealias Output = Void
169168

170-
func run() -> SignalProducer<Void, NoError> {
171-
return SignalProducer<Void, NoError>({ [weak startExpectation, weak endExpectation] (observer, lifetime) in
169+
func run() -> SignalProducer<Void, Never> {
170+
return SignalProducer<Void, Never>({ [weak startExpectation, weak endExpectation] (observer, lifetime) in
172171
lifetime.observeEnded {
173172
endExpectation?.fulfill()
174173
}
@@ -214,7 +213,7 @@ final class SubtreeManagerTests: XCTestCase {
214213

215214
func test_subscriptionsUnsubscribe() {
216215
struct SubscribingWorkflow: Workflow {
217-
var signal: Signal<Void, NoError>?
216+
var signal: Signal<Void, Never>?
218217

219218
struct State {}
220219

@@ -246,7 +245,7 @@ final class SubtreeManagerTests: XCTestCase {
246245
emittedExpectation.fulfill()
247246
}
248247

249-
let (signal, observer) = Signal<Void, NoError>.pipe()
248+
let (signal, observer) = Signal<Void, Never>.pipe()
250249

251250
let isSubscribing = manager.render { context -> Bool in
252251
SubscribingWorkflow(

‎swift/Workflow/Tests/WorkflowNodeTests.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import XCTest
22
@testable import Workflow
33

44
import ReactiveSwift
5-
import Result
65

76

87
final class WorkflowNodeTests: XCTestCase {
@@ -212,7 +211,7 @@ final class WorkflowNodeTests: XCTestCase {
212211
return true
213212
}
214213

215-
func run() -> SignalProducer<Int, NoError> {
214+
func run() -> SignalProducer<Int, Never> {
216215
return SignalProducer{ observer, lifetime in
217216
DispatchQueue.main.asyncAfter(deadline: .now() + 0.1, execute: {
218217
observer.send(value: 1)

‎swift/WorkflowTesting/Sources/WorkflowRenderTester.swift

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import XCTest
22
import ReactiveSwift
3-
import Result
43
@testable import Workflow
54

65

@@ -209,15 +208,15 @@ fileprivate final class RenderTestContext<T: Workflow>: RenderContextType {
209208
}
210209

211210
func makeSink<Action>(of actionType: Action.Type) -> Sink<Action> where Action : WorkflowAction, T == Action.WorkflowType {
212-
let (signal, observer) = Signal<AnyWorkflowAction<WorkflowType>, NoError>.pipe()
211+
let (signal, observer) = Signal<AnyWorkflowAction<WorkflowType>, Never>.pipe()
213212
let sink = Sink<Action> { action in
214213
observer.send(value: AnyWorkflowAction(action))
215214
}
216215
subscribe(signal: signal)
217216
return sink
218217
}
219218

220-
func subscribe<Action>(signal: Signal<Action, NoError>) where Action : WorkflowAction, RenderTestContext<T>.WorkflowType == Action.WorkflowType {
219+
func subscribe<Action>(signal: Signal<Action, Never>) where Action : WorkflowAction, RenderTestContext<T>.WorkflowType == Action.WorkflowType {
221220
signal
222221
.take(during: lifetime)
223222
.observeValues { [weak self] action in

‎swift/WorkflowTesting/Tests/WorkflowRenderTesterTests.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import XCTest
22
import ReactiveSwift
3-
import Result
43
import Workflow
54
import WorkflowTesting
65

@@ -260,7 +259,7 @@ fileprivate struct TestWorker: Worker {
260259
case failure
261260
}
262261

263-
func run() -> SignalProducer<Output, NoError> {
262+
func run() -> SignalProducer<Output, Never> {
264263
return SignalProducer(value: .success)
265264
}
266265

‎swift/WorkflowUI/Sources/Container/ContainerViewController.swift

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
import UIKit
22
import ReactiveSwift
3-
import Result
43
import Workflow
54

65

76
/// Drives view controllers from a root Workflow.
87
public final class ContainerViewController<Output, ScreenType>: UIViewController where ScreenType: Screen {
98

109
/// Emits output events from the bound workflow.
11-
public let output: Signal<Output, NoError>
10+
public let output: Signal<Output, Never>
1211

1312
internal let rootViewController: ScreenViewController<ScreenType>
1413

@@ -18,7 +17,7 @@ public final class ContainerViewController<Output, ScreenType>: UIViewController
1817

1918
private let (lifetime, token) = Lifetime.make()
2019

21-
private init(workflowHost: Any, rendering: Property<ScreenType>, output: Signal<Output, NoError>, viewRegistry: ViewRegistry) {
20+
private init(workflowHost: Any, rendering: Property<ScreenType>, output: Signal<Output, Never>, viewRegistry: ViewRegistry) {
2221
self.workflowHost = workflowHost
2322
self.rootViewController = viewRegistry.provideView(for: rendering.value)
2423
self.rendering = rendering

0 commit comments

Comments
 (0)