Resolve observe ambiguity

DeclarativeHub · Nov 18, 2015 · b43fd63 · b43fd63
1 parent 6642035
commit b43fd63
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 14 deletions.
diff --git a/ReactiveKit.podspec b/ReactiveKit.podspec
@@ -1,12 +1,12 @@
 Pod::Spec.new do |s|
   s.name             = "ReactiveKit"
-  s.version          = "1.0.3"
+  s.version          = "1.0.4"
   s.summary          = "A Swift Reactive Programming Framework"
   s.description      = "ReactiveKit is a collection of Swift frameworks for reactive and functional reactive programming."
   s.homepage         = "https://github.com/ReactiveKit/ReactiveKit"
   s.license          = 'MIT'
   s.author           = { "Srdan Rasic" => "[email protected]" }
-  s.source           = { :git => "https://github.com/ReactiveKit/ReactiveKit.git", :tag => "v1.0.3" }
+  s.source           = { :git => "https://github.com/ReactiveKit/ReactiveKit.git", :tag => "v1.0.4" }
 
   s.ios.deployment_target       = '8.0'
   s.osx.deployment_target       = '10.9'

diff --git a/ReactiveKit/Info.plist b/ReactiveKit/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.3</string>
+	<string>1.0.4</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

diff --git a/ReactiveKit/Operation/Operation.swift b/ReactiveKit/Operation/Operation.swift
@@ -46,12 +46,8 @@ public struct Operation<Value, Error: ErrorType>: OperationType {
       })
     }
   }
-
-  public func observe(observer: OperationEvent<Value, Error> -> ()) -> DisposableType {
-    return observe(on: ImmediateOnMainExecutionContext, observer: observer)
-  }
-
-  public func observe(on context: ExecutionContext, observer: OperationEvent<Value, Error> -> ()) -> DisposableType {
+
+  public func observe(on context: ExecutionContext = ImmediateOnMainExecutionContext, observer: OperationEvent<Value, Error> -> ()) -> DisposableType {
     return stream.observe(on: context, observer: observer)
   }
 

diff --git a/ReactiveKit/Streams/ActiveStream.swift b/ReactiveKit/Streams/ActiveStream.swift
@@ -64,11 +64,7 @@ public class ActiveStream<Event>: ActiveStreamType {
     tmpSelfReference.release()
     self.selfReference = tmpSelfReference
   }
-
-  public func observe(observer: Observer) -> DisposableType {
-    return observe(on: ImmediateOnMainExecutionContext, observer: observer)
-  }
-
+
   public func observe(on context: ExecutionContext = ImmediateOnMainExecutionContext, observer: Observer) -> DisposableType {
     selfReference?.retain()