Skip to content

Upgrade to RxJava 2.1.4 and OkHttp 3.9.0 #5349

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nhachicha merged 5 commits into from
Oct 14, 2017
Merged

Upgrade to RxJava 2.1.4 and OkHttp 3.9.0 #5349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2c246d2
Update build.gradle
vivekkiran Sep 29, 2017
f7d577a
Update CHANGELOG.md
vivekkiran Sep 29, 2017
1bc72f8
Resolve conflicts
vivekkiran Sep 29, 2017
6d8806a
Merge branch 'master' into patch-1
vivekkiran Oct 13, 2017
1edbc56
Update CHANGELOG.md
vivekkiran Oct 14, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@

* Upgraded to Realm Sync 2.0.0.
* Upgraded to Realm Core 4.0.2.
* Upgraded to OkHttp 3.9.0 .
* Upgraded to RxJava 2.1.4 .

## Credits

Expand Down
6 changes: 3 additions & 3 deletions realm/realm-library/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,19 +188,19 @@ repositories {

dependencies {

compileOnly 'io.reactivex.rxjava2:rxjava:2.1.1'
compileOnly 'io.reactivex.rxjava2:rxjava:2.1.4'
compileOnly 'com.google.code.findbugs:findbugs-annotations:3.0.1'

api "io.realm:realm-annotations:${version}"
implementation 'com.google.code.findbugs:jsr305:3.0.2'
implementation 'com.getkeepsafe.relinker:relinker:1.2.2'

kaptObjectServer project(':realm-annotations-processor')
objectServerImplementation 'com.squareup.okhttp3:okhttp:3.7.0'
objectServerImplementation 'com.squareup.okhttp3:okhttp:3.9.0'

kaptAndroidTest project(':realm-annotations-processor')
androidTestImplementation fileTree(dir: 'testLibs', include: ['*.jar'])
androidTestImplementation 'io.reactivex.rxjava2:rxjava:2.1.1'
androidTestImplementation 'io.reactivex.rxjava2:rxjava:2.1.4'
androidTestImplementation 'com.android.support.test:runner:1.0.1'
androidTestImplementation 'com.android.support.test:rules:1.0.1'
androidTestImplementation 'com.google.dexmaker:dexmaker:1.2'
Expand Down