wbrawner/Store
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix issues occured from RxJava1 dependency (#314)

Browse source 
* Remove RxJava1 dependencies
* Fixed an ErrorProne warning
This commit is contained in:
Pavlos-Petros Tournaris 2018-02-20 19:05:46 +02:00 committed by Ramona Harrison
parent ca615320a8
commit 6f2f1c12fe
7 changed files with 3 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
buildsystem/dependencies.gradle
View file

@ -22,15 +22,12 @@ ext.versions = [
// UI libs.
supportLibs : '25.1.1',
picasso : '2.5.2',
rxBinding : '0.3.0',
butterKnife : '7.0.1',
// Reactive.
rxJava : '1.3.0',
rxJava2 : '2.1.2',
rxJavaProGuardRules : '1.1.6.0',
rxJavaAsyncUtil : '0.21.0',
rxAndroid : '1.3.0',
rxAndroid2 : '2.0.1',
// Others.
@ -78,15 +75,12 @@ ext.libraries = [
supportVectorDrawable : "com.android.support:support-vector-drawable:$versions.supportLibs",
supportAnimatedDrawable : "com.android.support:animated-vector-drawable:$versions.supportLibs",
picasso : "com.squareup.picasso:picasso:$versions.picasso",
rxBinding : "com.jakewharton.rxbinding:rxbinding:$versions.rxBinding",
butterKnife : "com.jakewharton:butterknife:$versions.butterKnife",
// Reactive.
rxJava : "io.reactivex:rxjava:$versions.rxJava",
rxJava2 : "io.reactivex.rxjava2:rxjava:$versions.rxJava2",
rxJavaAsyncUtil : "io.reactivex:rxjava-async-util:$versions.rxJavaAsyncUtil",
rxJavaProGuardRules : "com.artemzin.rxjava:proguard-rules:$versions.rxJavaProGuardRules",
rxAndroid : "io.reactivex:rxandroid:$versions.rxAndroid",
rxAndroid2 : "io.reactivex.rxjava2:rxandroid:$versions.rxAndroid2",
// Others.

2
filesystem/build.gradle
View file

@ -5,9 +5,9 @@ version = VERSION_NAME
dependencies {
implementation libraries.okio
implementation libraries.rxJava
compileOnly libraries.jsr305
compileOnly libraries.javax
implementation libraries.rxJava2
implementation project(path: ':cache')
implementation project(path: ':store')
testImplementation libraries.mockito

2
filesystem/src/test/java/com/nytimes/android/external/fs3/StoreNetworkBeforeStaleFailTest.java vendored
View file

@ -53,7 +53,7 @@ public class StoreNetworkBeforeStaleFailTest {
verify(fetcher, times(1)).fetch(barCode);
}
final class TestPersister implements Persister<BufferedSource, BarCode>, RecordProvider<BarCode> {
private static final class TestPersister implements Persister<BufferedSource, BarCode>, RecordProvider<BarCode> {
@Nonnull
@Override
public RecordState getRecordState(@Nonnull BarCode barCode) {

1
middleware-jackson/build.gradle
View file

@ -9,7 +9,6 @@ dependencies {
compileOnly libraries.jsr305
implementation libraries.jacksonCore
implementation libraries.jacksonDatabind
implementation libraries.rxJava
implementation libraries.okio
compileOnly libraries.javax
testImplementation libraries.mockito

1
middleware-moshi/build.gradle
View file

@ -7,7 +7,6 @@ dependencies {
implementation project(path: ':store')
implementation project(path: ':filesystem')
implementation libraries.moshi
implementation libraries.rxJava
compileOnly libraries.jsr305
compileOnly libraries.javax
testImplementation libraries.mockito

1
middleware/build.gradle
View file

@ -9,7 +9,6 @@ dependencies {
implementation project(path: ':filesystem')
implementation libraries.okio
implementation libraries.gson
implementation libraries.rxJava
compileOnly libraries.jsr305
compileOnly libraries.javax
testImplementation libraries.mockito

2
store/build.gradle
View file

@ -25,4 +25,4 @@ apply from: rootProject.file("gradle/maven-push.gradle")
apply from: rootProject.file("gradle/checkstyle.gradle")
apply from: rootProject.file("gradle/pmd.gradle")
targetCompatibility = 1.8
sourceCompatibility = 1.8
sourceCompatibility = 1.8