Skip to content

Commit

Permalink
Update the availability annotations.
Browse files Browse the repository at this point in the history
  • Loading branch information
andersio committed Apr 19, 2020
1 parent 6a0a681 commit 4cffe30
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 10 deletions.
1 change: 1 addition & 0 deletions Sources/CombineInteroperability/FromCombine.swift
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#if canImport(Combine)
import Combine

@available(macOS 10.15, iOS 13.0, tvOS 13.0, macCatalyst 13.0, watchOS 6.0, *)
extension Publisher {
public func producer() -> SignalProducer<Output, Failure> {
return SignalProducer { observer, lifetime in
Expand Down
12 changes: 2 additions & 10 deletions Sources/CombineInteroperability/ToCombine.swift
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,13 @@
import Combine

extension SignalProducerConvertible {
@available(macOS 10.15, *)
@available(iOS 13.0, *)
@available(tvOS 13.0, *)
@available(macCatalyst 13.0, *)
@available(watchOS 6.0, *)
@available(macOS 10.15, iOS 13.0, tvOS 13.0, macCatalyst 13.0, watchOS 6.0, *)
public func publisher() -> ProducerPublisher<Value, Error> {
ProducerPublisher(base: producer)
}
}

@available(macOS 10.15, *)
@available(iOS 13.0, *)
@available(tvOS 13.0, *)
@available(macCatalyst 13.0, *)
@available(watchOS 6.0, *)
@available(macOS 10.15, iOS 13.0, tvOS 13.0, macCatalyst 13.0, watchOS 6.0, *)
public struct ProducerPublisher<Output, Failure: Swift.Error>: Publisher {
public let base: SignalProducer<Output, Failure>

Expand Down
4 changes: 4 additions & 0 deletions Sources/CombineInteroperability/Utilities.swift
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,28 @@
import Combine

extension Lifetime {
@available(macOS 10.15, iOS 13.0, tvOS 13.0, macCatalyst 13.0, watchOS 6.0, *)
@discardableResult
public static func += <C: Cancellable>(lhs: Lifetime, rhs: C) -> Disposable? {
lhs.observeEnded(rhs.cancel)
}
}

@available(macOS 10.15, iOS 13.0, tvOS 13.0, macCatalyst 13.0, watchOS 6.0, *)
extension AnyDisposable: Cancellable {
public func cancel() {
dispose()
}
}

@available(macOS 10.15, iOS 13.0, tvOS 13.0, macCatalyst 13.0, watchOS 6.0, *)
extension SerialDisposable: Cancellable {
public func cancel() {
dispose()
}
}

@available(macOS 10.15, iOS 13.0, tvOS 13.0, macCatalyst 13.0, watchOS 6.0, *)
extension CompositeDisposable: Cancellable {
public func cancel() {
dispose()
Expand Down

0 comments on commit 4cffe30

Please sign in to comment.