Merge pull request #42 from omo/build-fix

Build fix: Follow alwaysTrue() move
ReactiveX · Nov 6, 2014 · 7079fae · 7079fae
2 parents 1ac188f + a3006c8
commit 7079fae
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/main/java/rx/android/operators/OperatorConditionalBinding.java b/src/main/java/rx/android/operators/OperatorConditionalBinding.java
@@ -16,7 +16,7 @@
 import rx.Observable;
 import rx.Subscriber;
 import rx.functions.Func1;
-import rx.functions.Functions;
+import rx.internal.util.UtilityFunctions;
 
 import android.util.Log;
 
@@ -44,7 +44,7 @@ public OperatorConditionalBinding(R bound, Func1<? super R, Boolean> predicate)
 
     public OperatorConditionalBinding(R bound) {
         boundRef = bound;
-        this.predicate = Functions.alwaysTrue();
+        this.predicate = UtilityFunctions.alwaysTrue();
     }
 
     @Override

diff --git a/src/test/java/rx/android/operators/OperatorConditionalBindingTest.java b/src/test/java/rx/android/operators/OperatorConditionalBindingTest.java
@@ -23,7 +23,7 @@
 import org.robolectric.RobolectricTestRunner;
 import rx.Subscriber;
 import rx.functions.Func1;
-import rx.functions.Functions;
+import rx.internal.util.UtilityFunctions;
 import rx.observers.TestSubscriber;
 
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -65,7 +65,7 @@ public Boolean call(Object o) {
     @Test
     public void shouldUnsubscribeFromSourceSequenceWhenPredicateFailsToPass() {
         OperatorConditionalBinding<String, Object> op = new OperatorConditionalBinding<String, Object>(
-                new Object(), Functions.alwaysFalse());
+                new Object(), UtilityFunctions.alwaysFalse());
 
         Subscriber<? super String> sub = op.call(subscriber);
         sub.onNext("one");