From 163a28b9068d5035fcd1c7cf7f1baa38c8edda65 Mon Sep 17 00:00:00 2001 From: Syo Ikeda Date: Tue, 15 Nov 2016 23:51:08 +0900 Subject: [PATCH 1/2] [Deprecations+Removals] Add `unavailable` to `SignalProducer.retry(_:)` --- Sources/Deprecations+Removals.swift | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Sources/Deprecations+Removals.swift b/Sources/Deprecations+Removals.swift index f83fbd099..66a9e1c9d 100644 --- a/Sources/Deprecations+Removals.swift +++ b/Sources/Deprecations+Removals.swift @@ -229,6 +229,9 @@ extension SignalProducerProtocol { @available(*, unavailable, renamed:"skip(first:)") public func skip(_ count: Int) -> SignalProducer { fatalError() } + @available(*, unavailable, renamed:"retry(upTo:)") + public func retry(_ count: Int) -> SignalProducer { fatalError() } + @available(*, unavailable, renamed:"observe(on:)") public func observeOn(_ scheduler: UIScheduler) -> SignalProducer { fatalError() } From 5424f447578da9c2a218e34e449c51d49ba5149d Mon Sep 17 00:00:00 2001 From: Syo Ikeda Date: Tue, 15 Nov 2016 23:56:21 +0900 Subject: [PATCH 2/2] [Deprecations+Removals] Fix scheduler types --- Sources/Deprecations+Removals.swift | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Sources/Deprecations+Removals.swift b/Sources/Deprecations+Removals.swift index 66a9e1c9d..b1e355ef8 100644 --- a/Sources/Deprecations+Removals.swift +++ b/Sources/Deprecations+Removals.swift @@ -179,7 +179,7 @@ extension SignalProtocol { public func skip(_ count: Int) -> Signal { fatalError() } @available(*, unavailable, renamed:"observe(on:)") - public func observeOn(_ scheduler: UIScheduler) -> Signal { fatalError() } + public func observeOn(_ scheduler: SchedulerProtocol) -> Signal { fatalError() } @available(*, unavailable, renamed:"combineLatest(with:)") public func combineLatestWith(_ otherSignal: S) -> Signal<(Value, S.Value), Error> { fatalError() } @@ -203,7 +203,7 @@ extension SignalProtocol { public func takeWhile(_ predicate: (Value) -> Bool) -> Signal { fatalError() } @available(*, unavailable, renamed:"timeout(after:raising:on:)") - public func timeoutWithError(_ error: Error, afterInterval: TimeInterval, onScheduler: SchedulerProtocol) -> Signal { fatalError() } + public func timeoutWithError(_ error: Error, afterInterval: TimeInterval, onScheduler: DateSchedulerProtocol) -> Signal { fatalError() } @available(*, unavailable, message: "This Signal may emit errors which must be handled explicitly, or observed using `observeResult(_:)`") public func observeNext(_ next: (Value) -> Void) -> Disposable? { fatalError() } @@ -233,10 +233,10 @@ extension SignalProducerProtocol { public func retry(_ count: Int) -> SignalProducer { fatalError() } @available(*, unavailable, renamed:"observe(on:)") - public func observeOn(_ scheduler: UIScheduler) -> SignalProducer { fatalError() } + public func observeOn(_ scheduler: SchedulerProtocol) -> SignalProducer { fatalError() } @available(*, unavailable, renamed:"start(on:)") - public func startOn(_ scheduler: UIScheduler) -> SignalProducer { fatalError() } + public func startOn(_ scheduler: SchedulerProtocol) -> SignalProducer { fatalError() } @available(*, unavailable, renamed:"combineLatest(with:)") public func combineLatestWith(_ otherProducer: SignalProducer) -> SignalProducer<(Value, U), Error> { fatalError() } @@ -275,7 +275,7 @@ extension SignalProducerProtocol { public func takeWhile(_ predicate: (Value) -> Bool) -> SignalProducer { fatalError() } @available(*, unavailable, renamed:"timeout(after:raising:on:)") - public func timeoutWithError(_ error: Error, afterInterval: TimeInterval, onScheduler: SchedulerProtocol) -> SignalProducer { fatalError() } + public func timeoutWithError(_ error: Error, afterInterval: TimeInterval, onScheduler: DateSchedulerProtocol) -> SignalProducer { fatalError() } @available(*, unavailable, message:"This SignalProducer may emit errors which must be handled explicitly, or observed using `startWithResult(_:)`.") public func startWithNext(_ next: (Value) -> Void) -> Disposable { fatalError() }