Update Fluxc and Login Libraries to Latest Trunk Version #17056
Conversation
This 'Login' hash update 'Login' to that latest 'trunk' version where its 'FluxC' hash updates 'FluxC' to that latest 'trunk' version where the 'RefreshSitesXMLRPCPayload' data class becomes immutable. For more info see: https://github.com/wordpress-mobile/ WordPress-Login-Flow-Android/pull/92 This, in coordination to the subsequent 'FluxC' update commit that will follow, is done in order to make sure that both, this WPAndroid client and its 'Login' library dependency, are pointing to that 'FluxC' version where everything works as expected, without crashes or weird behaviors.
This 'FluxC' hash updates 'FluxC' to that latest 'trunk' version where the 'RefreshSitesXMLRPCPayload' data class becomes immutable. The 'Login' library and its 'FluxC' dependency is using this model and as such requires this change. For more info see: https://github.com/wordpress-mobile/ WordPress-Login-Flow-Android/pull/92 This, in coordination to the previous 'Login' update commit that followed, is done in order to make sure that both, this WPAndroid client and its 'Login' library dependency, are pointing to that 'FluxC' version where everything works as expected, without crashes or weird behaviors.
|
Found 1 violations: The PR caused the following dependency changes:-+--- org.wordpress:fluxc:{strictly 1.49.0} -> 1.49.0
-| +--- org.wordpress:wellsql:1.7.0
-| | \--- org.wordpress.wellsql:wellsql-annotations:1.7.0
-| +--- org.wordpress.fluxc:fluxc-annotations:1.49.0
-| +--- org.greenrobot:eventbus:3.3.1 (*)
-| +--- com.squareup.okhttp3:okhttp:4.9.0 -> 4.9.2 (*)
-| +--- com.android.volley:volley:1.1.1 -> 1.2.0
-| +--- androidx.paging:paging-runtime:2.1.2
-| | +--- androidx.paging:paging-common:2.1.2
-| | | +--- androidx.annotation:annotation:1.0.0 -> 1.2.0
-| | | \--- androidx.arch.core:core-common:2.0.0 -> 2.1.0 (*)
-| | +--- androidx.arch.core:core-runtime:2.0.0 -> 2.1.0 (*)
-| | +--- androidx.lifecycle:lifecycle-runtime:2.0.0 -> 2.4.1 (*)
-| | +--- androidx.lifecycle:lifecycle-livedata:2.0.0 -> 2.4.1 (*)
-| | \--- androidx.recyclerview:recyclerview:1.0.0 -> 1.1.0 (*)
-| +--- com.goterl:lazysodium-android:5.0.2
-| +--- net.java.dev.jna:jna:5.5.0
-| +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.10 (*)
-| +--- org.jetbrains.kotlin:kotlin-android-extensions-runtime:1.6.10 (*)
-| +--- androidx.appcompat:appcompat:1.0.2 -> 1.3.1 (*)
-| +--- androidx.recyclerview:recyclerview:1.0.0 -> 1.1.0 (*)
-| +--- androidx.exifinterface:exifinterface:1.0.0 -> 1.2.0 (*)
-| +--- com.squareup.okhttp3:okhttp-urlconnection:4.9.0 -> 4.9.2
-| | +--- com.squareup.okhttp3:okhttp:4.9.2 (*)
-| | \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.10 -> 1.6.10 (*)
-| +--- com.google.code.gson:gson:2.8.5
-| +--- org.apache.commons:commons-text:1.1 (*)
-| +--- androidx.room:room-runtime:2.4.2 (*)
-| +--- androidx.room:room-ktx:2.4.2
-| | +--- androidx.room:room-common:2.4.2 (*)
-| | +--- androidx.room:room-runtime:2.4.2 (*)
-| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.6.10 (*)
-| | \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2 (*)
-| +--- com.google.dagger:dagger:2.42 (*)
-| +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9 -> 1.5.2 (*)
-| \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9 -> 1.5.2 (*)
++--- org.wordpress:fluxc:{strictly trunk-eb1d39ad095c01367af03c4259ab93cda14c675e} -> trunk-eb1d39ad095c01367af03c4259ab93cda14c675e
+| +--- org.wordpress:wellsql:1.7.0
+| | \--- org.wordpress.wellsql:wellsql-annotations:1.7.0
+| +--- org.wordpress.fluxc:fluxc-annotations:trunk-eb1d39ad095c01367af03c4259ab93cda14c675e
+| +--- org.greenrobot:eventbus:3.3.1 (*)
+| +--- com.squareup.okhttp3:okhttp:4.9.0 -> 4.9.2 (*)
+| +--- com.android.volley:volley:1.1.1 -> 1.2.0
+| +--- androidx.paging:paging-runtime:2.1.2
+| | +--- androidx.paging:paging-common:2.1.2
+| | | +--- androidx.annotation:annotation:1.0.0 -> 1.2.0
+| | | \--- androidx.arch.core:core-common:2.0.0 -> 2.1.0 (*)
+| | +--- androidx.arch.core:core-runtime:2.0.0 -> 2.1.0 (*)
+| | +--- androidx.lifecycle:lifecycle-runtime:2.0.0 -> 2.4.1 (*)
+| | +--- androidx.lifecycle:lifecycle-livedata:2.0.0 -> 2.4.1 (*)
+| | \--- androidx.recyclerview:recyclerview:1.0.0 -> 1.1.0 (*)
+| +--- com.goterl:lazysodium-android:5.0.2
+| +--- net.java.dev.jna:jna:5.5.0
+| +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.10 (*)
+| +--- org.jetbrains.kotlin:kotlin-android-extensions-runtime:1.6.10 (*)
+| +--- androidx.appcompat:appcompat:1.0.2 -> 1.3.1 (*)
+| +--- androidx.recyclerview:recyclerview:1.0.0 -> 1.1.0 (*)
+| +--- androidx.exifinterface:exifinterface:1.0.0 -> 1.2.0 (*)
+| +--- com.squareup.okhttp3:okhttp-urlconnection:4.9.0 -> 4.9.2
+| | +--- com.squareup.okhttp3:okhttp:4.9.2 (*)
+| | \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.10 -> 1.6.10 (*)
+| +--- com.google.code.gson:gson:2.8.5
+| +--- org.apache.commons:commons-text:1.1 (*)
+| +--- androidx.room:room-runtime:2.4.2 (*)
+| +--- androidx.room:room-ktx:2.4.2
+| | +--- androidx.room:room-common:2.4.2 (*)
+| | +--- androidx.room:room-runtime:2.4.2 (*)
+| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.6.10 (*)
+| | \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2 (*)
+| +--- com.google.dagger:dagger:2.42 (*)
+| +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9 -> 1.5.2 (*)
+| \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9 -> 1.5.2 (*)
-\--- org.wordpress:login:trunk-657bed28fa735780e3ffcc214503a9e5d1286d6c
- +--- com.google.android.gms:play-services-auth:18.1.0 (*)
- +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.10 (*)
- +--- androidx.appcompat:appcompat:1.0.2 -> 1.3.1 (*)
- +--- androidx.vectordrawable:vectordrawable-animated:1.1.0 (*)
- +--- androidx.media:media:1.2.1 (*)
- +--- androidx.legacy:legacy-support-v13:1.0.0
- | \--- androidx.legacy:legacy-support-v4:1.0.0 (*)
- +--- androidx.gridlayout:gridlayout:1.0.0 (*)
- +--- androidx.constraintlayout:constraintlayout:2.0.4 (*)
- +--- com.google.android.material:material:1.2.1 -> 1.6.0-alpha01 (*)
- +--- androidx.core:core-ktx:1.3.2 -> 1.7.0 (*)
- +--- org.wordpress:fluxc:1.49.0 (*)
- +--- com.google.dagger:dagger:2.42 (*)
- \--- com.google.dagger:dagger-android-support:2.42 (*)
+\--- org.wordpress:login:trunk-e11535105725e02dd1e8aa8065314ceb67079278
+ +--- com.google.android.gms:play-services-auth:18.1.0 (*)
+ +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.10 (*)
+ +--- androidx.appcompat:appcompat:1.0.2 -> 1.3.1 (*)
+ +--- androidx.vectordrawable:vectordrawable-animated:1.1.0 (*)
+ +--- androidx.media:media:1.2.1 (*)
+ +--- androidx.legacy:legacy-support-v13:1.0.0
+ | \--- androidx.legacy:legacy-support-v4:1.0.0 (*)
+ +--- androidx.gridlayout:gridlayout:1.0.0 (*)
+ +--- androidx.constraintlayout:constraintlayout:2.0.4 (*)
+ +--- com.google.android.material:material:1.2.1 -> 1.6.0-alpha01 (*)
+ +--- androidx.core:core-ktx:1.3.2 -> 1.7.0 (*)
+ +--- org.wordpress:fluxc:trunk-e94126bf9eb942d262768f8851cf2c4980e249fc -> trunk-eb1d39ad095c01367af03c4259ab93cda14c675e (*)
+ +--- com.google.dagger:dagger:2.42 (*)
+ \--- com.google.dagger:dagger-android-support:2.42 (*)
Please review and act accordingly
|
You can test the Jetpack changes on this Pull Request by downloading an installable build (jetpack-installable-build-pr17056-0f2d043.apk), or scanning this QR code:
|
You can test the WordPress changes on this Pull Request by downloading an installable build (wordpress-installable-build-pr17056-0f2d043.apk), or scanning this QR code:
|
| @@ -9,7 +9,7 @@ plugins { | |||
|
|
|||
| ext { | |||
| wordPressUtilsVersion = '2.7.0' | |||
| wordPressLoginVersion = 'trunk-657bed28fa735780e3ffcc214503a9e5d1286d6c' | |||
| wordPressLoginVersion = 'trunk-e11535105725e02dd1e8aa8065314ceb67079278' | |||
There was a problem hiding this comment.
This matches the sha1 of current Login's trunk, so 👍
But that Login commit… points to fluxc:trunk-e94126bf9eb942d262768f8851cf2c4980e249fc in its own build.gradle, as opposed to pointing to FluxC's latest commit in trunk aka trunk-eb1d39ad095c01367af03c4259ab93cda14c675e aka what's also used as fluxCVersion in this WPAndroid build.gradle on line 24. And FluxC's e94126b (which Login points to) is 3 commits behind eb1d39a.
While it's not surprising to see Login's pointer to fluxc be behind the FluxC we points to in the clients, especially because FluxC is updated way more often than the Login lib is, I'm a bit surprised by this given that Login and FluxC were just synchronzed a couple of hours ago — in fact, that is the whole points of this update of both Login and FluxC being done in parallel here — and I wouldn't expect FluxC to already have moved ahead much?
So I'm wondering if this is expected to have Login not include those 3 recent commits from FluxC while this was all about synchronizing and updating the version of FluxC that both were pointing to to match 🤔
There was a problem hiding this comment.
Ok after checking with @ParaskP7 in Slack, this is in fact expected. And the 3 FluxC commits that Login does not include are not relevant to the Login library anyway.
While it's not surprising to see Login's pointer to fluxc be behind the FluxC we points to in the clients, especially because FluxC is updated way more often than the Login lib is, I'm a bit surprised by this given that Login and FluxC were just synchronzed a couple of hours ago […] and I wouldn't expect FluxC to already have moved ahead much?
So in practice this is just because FluxC already shipped a couple of recent PRs after this synchronization in Login lib happened earlier today. So… FluxC already moving that much ahead already after all 😄
There was a problem hiding this comment.
👋 @AliSoftware !
Short answer, yes, this is expected and thank you for asking! 🥇
- This morning we fixed an issue with the Login PR and then update WCAndroid to point to that with a WCAndroid PR.
- Then, later on today, I merged 3 more PRs on FluxC (here, here and here) and completed the project I was working for this sprint.
- This problem that this PR is trying to fix was on a previous FluxC commit, even before there extra 3 PRs, which got already merged 10 days ago on FluxC (via this PR and this commit).
- Thus these 3 PRs that were merged afterwards weren’t going to help with this
Loginproblem anyway, they are just nice to have on top of whatLogin'sFluxCis pointing to.
Just that makes sense to you? 🤔
There was a problem hiding this comment.
That makes total sense now, thanks for explaining in such details 👍
There was a problem hiding this comment.
Great, thank you for taking the time to investigate all that! 🥇
|
The diff looks good (once my question above wrt to the sha1 was clarified and confirmed that all is expected). I probably won't have time to smoke-test the app with those changes today tho, as I'm already late to do the final build to submit 20.5 in my day. |
Relates To:
This PR is about updating both, the
FluxCandLoginlibraries, to their corresponding latesttrunkversion. This is mainly done because of a crash that was identified on the WCAndroid site due to theRefreshSitesXMLRPCPayloaddata class becoming immutable as part of aFluxCupdate. However, theLoginlibrary was pointing to a previous version ofFluxC, which didn't have the same change, thus causing that specific flow which was utilizing the previous version ofRefreshSitesXMLRPCPayloadto crash.This update is done in order to make sure that both, this WPAndroid client and its
Loginlibrary dependency, are pointing to thatFluxCversion where everything works as expected, without crashes or weird behaviors.👋 @zwarm , I shamelessly added you as an extra reviewer. Can you help @AliSoftware with the smoke testing part, just to verify that everything works as expected before he starts with the
20.6code freeze on Monday? 🙇To test:
Loginfunctionality,My Site/Reader/Notificationtabs,Stats/Media/Posts/Pages/Comments/Me/Jetpackscreens, createStory/Post/Page, etc).Regression Notes
Since this
FluxCversion comes with lots of small changes, like models becoming immutable (var->val, etc), it might be the case that either the app is not complilying (can be easily verified by CI) or the app might be crashing on specific scenarios (thus needing manual smoke testing) due to transitive dependencies on various libraries that point to a different version ofFluxC(like theLoginlibrary).See
To testsection above.N/A
PR submission checklist:
RELEASE-NOTES.txtif necessary.