Upgrade to RxJava 2.1.4 and OkHttp 3.9.0 #5349
Conversation
vivekkiran
changed the title
vivekkiran
changed the title
cmelchior
left a comment
cmelchior
left a comment
There was a problem hiding this comment.
This is targeting the wrong branch. It should target master. Also, please update the CHANGELOG.md to indicate that Okhttp has been updated. You can see how it was done previously. Apart from that, this looks good 👍 Thanks for updating
cmelchior
left a comment
cmelchior
left a comment
There was a problem hiding this comment.
Apart from small error in the CHANGELOG this looks 👍
CHANGELOG.md
Outdated
|
|
||
|
|
||
| ## 4.0.0-BETA3 (YYYY-MM-DD) | ||
| ## 4.0.0-BETA3 (2017-09-18) |
There was a problem hiding this comment.
This doesn't look right. We haven't released a BETA3 publically.
There was a problem hiding this comment.
@cmelchior I can find the BETA3 Published here http://oss.jfrog.org/oss-snapshot-local/io/realm/realm-gradle-plugin/ and http://oss.jfrog.org/oss-snapshot-local/io/realm/realm-gradle-plugin/4.0.0-BETA3-SNAPSHOT/, it was published on 18-Sep-2017 at 10:20, I am also using it in my project.
There was a problem hiding this comment.
Yes, but that is a -SNAPSHOT release. They are done automatically from master and is not considered a "real" release. Only releases done from the releases branch are. They are also tagged: https://github.com/realm/realm-java/releases
There was a problem hiding this comment.
Yes, thats why it is appended with 4.0.0-BETA3 , "BETA3", real release wont have -BETA Tag, I have followed the similar convention as per the change log since it was done for BETA1 and BETA2 in the same way. See https://github.com/realm/realm-java/blob/master/CHANGELOG.md , in that case we shouldn't be logging any -BETA Releases in the Changelog.
There was a problem hiding this comment.
The BETA releases were mostly private releases done from the master-4.0 branch. They should have been collapsed when moving to master, and they will be in the next few days. I do realize this is confusing. Sorry about that.
nhachicha
left a comment
nhachicha
left a comment
There was a problem hiding this comment.
LGTM tests pass locally
|
Hi @vivekkiran PR looks good, can you please resolve the conflict so we can merge it? |
|
@nhachicha resolved the conflicts :) |
|
|
||
| ## Enhancements | ||
|
|
||
| * All Realm annotations are now kept at runtime, allowing runtime tools access to them (#5344). |
There was a problem hiding this comment.
@vivekkiran These shouldn't be removed. Apart from that everything looks fine to me
vivekkiran
left a comment
vivekkiran
left a comment
There was a problem hiding this comment.
Fixed the conflicts
3 participants
https://github.com/ReactiveX/RxJava/blob/2.x/CHANGES.md
https://github.com/square/okhttp/blob/master/CHANGELOG.md