Skip to content

Commit 86ef794

Browse files
committed
RxCombine 2.0.0
1 parent 8e7cba7 commit 86ef794

File tree

4 files changed

+39
-16
lines changed

4 files changed

+39
-16
lines changed

ExampleApp/Podfile.lock

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
PODS:
2-
- RxCombine (1.6.0):
3-
- RxRelay (~> 5)
4-
- RxSwift (~> 5)
5-
- RxRelay (5.1.0):
6-
- RxSwift (~> 5)
7-
- RxSwift (5.1.0)
2+
- RxCombine (2.0.0):
3+
- RxRelay (~> 6)
4+
- RxSwift (~> 6)
5+
- RxRelay (6.0.0):
6+
- RxSwift (= 6.0.0)
7+
- RxSwift (6.0.0)
88

99
DEPENDENCIES:
1010
- RxCombine (from `../`)
@@ -19,10 +19,10 @@ EXTERNAL SOURCES:
1919
:path: "../"
2020

2121
SPEC CHECKSUMS:
22-
RxCombine: 81552341b3239e99d5ffea4e48bf11b3f9b638c3
23-
RxRelay: a168bd6caf712d00c676ac344e9295afc93b418e
24-
RxSwift: ad5874f24bb0dbffd1e9bb8443604e3578796c7a
22+
RxCombine: 1d88b0392e4c9ccfc5187af3dbc8b10791a4b128
23+
RxRelay: 8d593be109c06ea850df027351beba614b012ffb
24+
RxSwift: c14e798c59b9f6e9a2df8fd235602e85cc044295
2525

2626
PODFILE CHECKSUM: 27ab59783b75a3dbb4fec21bad1cf7a4348abaa3
2727

28-
COCOAPODS: 1.9.1
28+
COCOAPODS: 1.10.0

Package.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ import PackageDescription
55
let package = Package(
66
name: "RxCombine",
77
platforms: [
8-
.macOS(.v10_10), .iOS(.v8), .tvOS(.v9), .watchOS(.v3)
8+
.macOS(.v10_10), .iOS(.v9), .tvOS(.v9), .watchOS(.v3)
99
],
1010
products: [
1111
.library(
1212
name: "RxCombine",
1313
targets: ["RxCombine"]),
1414
],
1515
dependencies: [
16-
.package(url: "https://github.com/ReactiveX/RxSwift.git", from: "5.0.0")
16+
.package(url: "https://github.com/ReactiveX/RxSwift.git", from: "6.0.0")
1717
],
1818
targets: [
1919
.target(

RxCombine.podspec

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "RxCombine"
3-
s.version = "1.6.1"
3+
s.version = "2.0.0"
44
s.summary = "RxSwift is a Swift implementation of Reactive Extensions"
55
s.description = <<-DESC
66
Bi-directional type conversions between RxSwift and Apple's Combine framework.
@@ -20,8 +20,8 @@ Pod::Spec.new do |s|
2020

2121
s.source_files = 'Sources/**/*.swift'
2222
s.frameworks = ['Combine']
23-
s.dependency 'RxSwift', '~> 5'
24-
s.dependency 'RxRelay', '~> 5'
23+
s.dependency 'RxSwift', '~> 6'
24+
s.dependency 'RxRelay', '~> 6'
2525

26-
s.swift_version = '5.0'
26+
s.swift_version = '5.1'
2727
end

Sources/Combine+Rx/Publisher+Rx.swift

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,27 @@ public extension Publisher {
3737
}
3838
}
3939
}
40+
41+
@available(OSX 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
42+
public extension Publisher where Failure == Never {
43+
/// Returns an Observable<Output> representing the underlying
44+
/// Publisher. Upon subscription, the Publisher's sink pushes
45+
/// events into the Observable. Upon disposing of the subscription,
46+
/// the sink is cancelled.
47+
///
48+
/// - returns: Observable<Output>
49+
func asInfallible() -> Infallible<Output> {
50+
Infallible<Output>.create { observer in
51+
let cancellable = self.sink(
52+
receiveCompletion: { completion in
53+
observer(.completed)
54+
},
55+
receiveValue: { value in
56+
observer(.next(value))
57+
})
58+
59+
return Disposables.create { cancellable.cancel() }
60+
}
61+
}
62+
}
4063
#endif

0 commit comments

Comments
 (0)