Merge pull request #76 from square/jw/one-one

JakeWharton · JakeWharton · commit def5c26d2905 · 2015-12-09T13:08:54.000-05:00
Drop custom backpressure support in favor of RxJava 1.1's built-in…
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,12 @@
 Change Log
 =========
 
+Version 0.5.0 *(In Development)*
+--------------------------------
+
+ * Requires RxJava 1.1.0 or newer.
+
+
 Version 0.4.1 *(2015-10-19)*
 ----------------------------
 
diff --git a/build.gradle b/build.gradle
@@ -29,7 +29,7 @@ ext {
   timber = 'com.jakewharton.timber:timber:2.7.1'
   autoParcel = 'com.github.frankiesardo:auto-parcel:0.3'
   autoParcelProcessor = 'com.github.frankiesardo:auto-parcel-processor:0.3'
-  rxJava = 'io.reactivex:rxjava:1.0.14'
+  rxJava = 'io.reactivex:rxjava:1.1.0'
   rxAndroid = 'io.reactivex:rxandroid:1.0.1'
   rxBinding = 'com.jakewharton.rxbinding:rxbinding:0.2.0'
   truth = 'com.google.truth:truth:0.27'
diff --git a/sqlbrite/src/main/java/com/squareup/sqlbrite/BackpressureBufferLastOperator.java b/sqlbrite/src/main/java/com/squareup/sqlbrite/BackpressureBufferLastOperator.java
diff --git a/sqlbrite/src/main/java/com/squareup/sqlbrite/BriteContentResolver.java b/sqlbrite/src/main/java/com/squareup/sqlbrite/BriteContentResolver.java
@@ -106,7 +106,7 @@ public QueryObservable createQuery(@NonNull final Uri uri, @Nullable final Strin
     };
     Observable<Query> queryObservable = Observable.create(subscribe) //
         .startWith(query) //
-        .lift(BackpressureBufferLastOperator.<Query>instance());
+        .onBackpressureLatest();
     return new QueryObservable(queryObservable);
   }
 
diff --git a/sqlbrite/src/main/java/com/squareup/sqlbrite/BriteDatabase.java b/sqlbrite/src/main/java/com/squareup/sqlbrite/BriteDatabase.java
@@ -309,7 +309,7 @@ private QueryObservable createQuery(final Func1<Set<String>, Boolean> tableFilte
             return query;
           }
         }) //
-        .lift(BackpressureBufferLastOperator.<Query>instance());
+        .onBackpressureLatest();
     return new QueryObservable(queryObservable);
   }
 

Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ public QueryObservable createQuery(@NonNull final Uri uri, @Nullable final Strin`
`106`	`106`	`};`
`107`	`107`	`Observable<Query> queryObservable = Observable.create(subscribe) //`
`108`	`108`	`.startWith(query) //`
`109`		`- .lift(BackpressureBufferLastOperator.<Query>instance());`
	`109`	`+ .onBackpressureLatest();`
`110`	`110`	`return new QueryObservable(queryObservable);`
`111`	`111`	`}`
`112`	`112`
Original file line number	Diff line number	Diff line change
`@@ -309,7 +309,7 @@ private QueryObservable createQuery(final Func1<Set<String>, Boolean> tableFilte`
`309`	`309`	`return query;`
`310`	`310`	`}`
`311`	`311`	`}) //`
`312`		`- .lift(BackpressureBufferLastOperator.<Query>instance());`
	`312`	`+ .onBackpressureLatest();`
`313`	`313`	`return new QueryObservable(queryObservable);`
`314`	`314`	`}`
`315`	`315`