Skip to content

Commit b43fd63

Browse files
committed
Resolve observe ambiguity
1 parent 6642035 commit b43fd63

File tree

4 files changed

+6
-14
lines changed

4 files changed

+6
-14
lines changed

ReactiveKit.podspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
Pod::Spec.new do |s|
22
s.name = "ReactiveKit"
3-
s.version = "1.0.3"
3+
s.version = "1.0.4"
44
s.summary = "A Swift Reactive Programming Framework"
55
s.description = "ReactiveKit is a collection of Swift frameworks for reactive and functional reactive programming."
66
s.homepage = "https://github.com/ReactiveKit/ReactiveKit"
77
s.license = 'MIT'
88
s.author = { "Srdan Rasic" => "[email protected]" }
9-
s.source = { :git => "https://github.com/ReactiveKit/ReactiveKit.git", :tag => "v1.0.3" }
9+
s.source = { :git => "https://github.com/ReactiveKit/ReactiveKit.git", :tag => "v1.0.4" }
1010

1111
s.ios.deployment_target = '8.0'
1212
s.osx.deployment_target = '10.9'

ReactiveKit/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<key>CFBundlePackageType</key>
1616
<string>FMWK</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>1.0.3</string>
18+
<string>1.0.4</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>

ReactiveKit/Operation/Operation.swift

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,8 @@ public struct Operation<Value, Error: ErrorType>: OperationType {
4646
})
4747
}
4848
}
49-
50-
public func observe(observer: OperationEvent<Value, Error> -> ()) -> DisposableType {
51-
return observe(on: ImmediateOnMainExecutionContext, observer: observer)
52-
}
53-
54-
public func observe(on context: ExecutionContext, observer: OperationEvent<Value, Error> -> ()) -> DisposableType {
49+
50+
public func observe(on context: ExecutionContext = ImmediateOnMainExecutionContext, observer: OperationEvent<Value, Error> -> ()) -> DisposableType {
5551
return stream.observe(on: context, observer: observer)
5652
}
5753

ReactiveKit/Streams/ActiveStream.swift

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,7 @@ public class ActiveStream<Event>: ActiveStreamType {
6464
tmpSelfReference.release()
6565
self.selfReference = tmpSelfReference
6666
}
67-
68-
public func observe(observer: Observer) -> DisposableType {
69-
return observe(on: ImmediateOnMainExecutionContext, observer: observer)
70-
}
71-
67+
7268
public func observe(on context: ExecutionContext = ImmediateOnMainExecutionContext, observer: Observer) -> DisposableType {
7369
selfReference?.retain()
7470

0 commit comments

Comments
 (0)