Skip to content

Commit 7079fae

Browse files
committed
Merge pull request #42 from omo/build-fix
Build fix: Follow alwaysTrue() move
2 parents 1ac188f + a3006c8 commit 7079fae

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/main/java/rx/android/operators/OperatorConditionalBinding.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import rx.Observable;
1717
import rx.Subscriber;
1818
import rx.functions.Func1;
19-
import rx.functions.Functions;
19+
import rx.internal.util.UtilityFunctions;
2020

2121
import android.util.Log;
2222

@@ -44,7 +44,7 @@ public OperatorConditionalBinding(R bound, Func1<? super R, Boolean> predicate)
4444

4545
public OperatorConditionalBinding(R bound) {
4646
boundRef = bound;
47-
this.predicate = Functions.alwaysTrue();
47+
this.predicate = UtilityFunctions.alwaysTrue();
4848
}
4949

5050
@Override

src/test/java/rx/android/operators/OperatorConditionalBindingTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import org.robolectric.RobolectricTestRunner;
2424
import rx.Subscriber;
2525
import rx.functions.Func1;
26-
import rx.functions.Functions;
26+
import rx.internal.util.UtilityFunctions;
2727
import rx.observers.TestSubscriber;
2828

2929
import java.util.concurrent.atomic.AtomicBoolean;
@@ -65,7 +65,7 @@ public Boolean call(Object o) {
6565
@Test
6666
public void shouldUnsubscribeFromSourceSequenceWhenPredicateFailsToPass() {
6767
OperatorConditionalBinding<String, Object> op = new OperatorConditionalBinding<String, Object>(
68-
new Object(), Functions.alwaysFalse());
68+
new Object(), UtilityFunctions.alwaysFalse());
6969

7070
Subscriber<? super String> sub = op.call(subscriber);
7171
sub.onNext("one");

0 commit comments

Comments
 (0)