Merge release/19.9 (19.9-rc-3 + conflict resolution) #16620

ParaskP7 · 2022-05-23T12:04:15Z

Merging the release branch after doing a new beta.

The new beta includes:

Remove explore plans from Quick start #16582
Fixes focus point not being shown with animation after switching tabs #16604
Quick Start: Track Quick Start Card Shown #16607
Fix: Removes Explore Plan from Quick start list #16613
Integrate gutenberg-mobile release 1.76.1 #16614
- Release 1.76.1 gutenberg-mobile#4875
Replace icons with spectrum icons set. #16586
Latest strings.xml from GlotPress*
Version bump in version.properties

(*) FYI: During bundle exec fastlane new_beta_release I got the below Error downloading hi - 429 Too Many Requests for the id, hi, sk and cs locales: Cc @AliSoftware

Click to expand and see the android download translations build log

[13:31:26]: -------------------------------------------
[13:31:26]: --- Step: android_download_translations ---
[13:31:26]: -------------------------------------------
[13:31:26]: Downloading translations for 'ar' from GlotPress (ar) [{:status=>"current"}]...
[13:31:27]: Downloading translations for 'de' from GlotPress (de) [{:status=>"current"}]...
[13:31:29]: Downloading translations for 'en-rGB' from GlotPress (en-gb) [{:status=>"current"}]...
[13:31:30]: Downloading translations for 'es' from GlotPress (es) [{:status=>"current"}]...
[13:31:32]: Downloading translations for 'fr-rCA' from GlotPress (fr) [{:status=>"current"}]...
[13:31:33]: Downloading translations for 'fr' from GlotPress (fr) [{:status=>"current"}]...
[13:31:35]: Downloading translations for 'he' from GlotPress (he) [{:status=>"current"}]...
[13:31:36]: Downloading translations for 'id' from GlotPress (id) [{:status=>"current"}]...
[13:31:37]: Error downloading id - 429 Too Many Requests
[13:31:37]: Downloading translations for 'it' from GlotPress (it) [{:status=>"current"}]...
[13:31:38]: Downloading translations for 'ja' from GlotPress (ja) [{:status=>"current"}]...
[13:31:39]: Downloading translations for 'ko' from GlotPress (ko) [{:status=>"current"}]...
[13:31:41]: Downloading translations for 'nl' from GlotPress (nl) [{:status=>"current"}]...
[13:31:42]: Downloading translations for 'pl' from GlotPress (pl) [{:status=>"current"}]...
[13:31:44]: Downloading translations for 'pt-rBR' from GlotPress (pt-br) [{:status=>"current"}]...
[13:31:45]: Downloading translations for 'ru' from GlotPress (ru) [{:status=>"current"}]...
[13:31:46]: Downloading translations for 'sr' from GlotPress (sr) [{:status=>"current"}]...
[13:31:48]: Downloading translations for 'sv' from GlotPress (sv) [{:status=>"current"}]...
[13:31:49]: Downloading translations for 'th' from GlotPress (th) [{:status=>"current"}]...
[13:31:50]: Downloading translations for 'tr' from GlotPress (tr) [{:status=>"current"}]...
[13:31:51]: Downloading translations for 'vi' from GlotPress (vi) [{:status=>"current"}]...
[13:31:53]: Downloading translations for 'zh-rCN' from GlotPress (zh-cn) [{:status=>"current"}]...
[13:31:54]: Downloading translations for 'zh-rTW' from GlotPress (zh-tw) [{:status=>"current"}]...
[13:31:55]: Downloading translations for 'az' from GlotPress (az) [{:status=>"current"}]...
[13:31:56]: Downloading translations for 'el' from GlotPress (el) [{:status=>"current"}]...
[13:31:57]: Downloading translations for 'es-rMX' from GlotPress (es-mx) [{:status=>"current"}]...
[13:31:58]: Downloading translations for 'es-rCL' from GlotPress (es-cl) [{:status=>"current"}]...
[13:31:59]: Downloading translations for 'gd' from GlotPress (gd) [{:status=>"current"}]...
[13:32:00]: Downloading translations for 'hi' from GlotPress (hi) [{:status=>"current"}]...
[13:32:01]: Error downloading hi - 429 Too Many Requests
[13:32:01]: Downloading translations for 'hu' from GlotPress (hu) [{:status=>"current"}]...
[13:32:01]: Downloading translations for 'nb' from GlotPress (nb) [{:status=>"current"}]...
[13:32:02]: Downloading translations for 'pl' from GlotPress (pl) [{:status=>"current"}]...
[13:32:04]: Downloading translations for 'th' from GlotPress (th) [{:status=>"current"}]...
[13:32:05]: Downloading translations for 'uz' from GlotPress (uz) [{:status=>"current"}]...
[13:32:05]: Downloading translations for 'zh-rHK' from GlotPress (zh-tw) [{:status=>"current"}]...
[13:32:07]: Downloading translations for 'eu' from GlotPress (eu) [{:status=>"current"}]...
[13:32:07]: Downloading translations for 'ro' from GlotPress (ro) [{:status=>"current"}]...
[13:32:09]: Downloading translations for 'mk' from GlotPress (mk) [{:status=>"current"}]...
[13:32:09]: Downloading translations for 'en-rAU' from GlotPress (en-au) [{:status=>"current"}]...
[13:32:10]: Downloading translations for 'sr' from GlotPress (sr) [{:status=>"current"}]...
[13:32:12]: Downloading translations for 'sk' from GlotPress (sk) [{:status=>"current"}]...
[13:32:12]: Error downloading sk - 429 Too Many Requests
[13:32:12]: Downloading translations for 'cy' from GlotPress (cy) [{:status=>"current"}]...
[13:32:13]: Downloading translations for 'da' from GlotPress (da) [{:status=>"current"}]...
[13:32:13]: Downloading translations for 'bg' from GlotPress (bg) [{:status=>"current"}]...
[13:32:14]: Downloading translations for 'sq' from GlotPress (sq) [{:status=>"current"}]...
[13:32:16]: Downloading translations for 'hr' from GlotPress (hr) [{:status=>"current"}]...
[13:32:16]: Downloading translations for 'cs' from GlotPress (cs) [{:status=>"current"}]...
[13:32:17]: Error downloading cs - 429 Too Many Requests
[13:32:17]: Downloading translations for 'pt-rBR' from GlotPress (pt-br) [{:status=>"current"}]...
[13:32:18]: Downloading translations for 'en-rCA' from GlotPress (en-ca) [{:status=>"current"}]...
[13:32:20]: Downloading translations for 'ms' from GlotPress (ms) [{:status=>"current"}]...
[13:32:21]: Downloading translations for 'es-rVE' from GlotPress (es-ve) [{:status=>"current"}]...
[13:32:22]: Downloading translations for 'gl' from GlotPress (gl) [{:status=>"current"}]...
[13:32:23]: Downloading translations for 'is' from GlotPress (is) [{:status=>"current"}]...
[13:32:24]: Downloading translations for 'es-rCO' from GlotPress (es-co) [{:status=>"current"}]...
[13:32:25]: Downloading translations for 'kmr' from GlotPress (kmr) [{:status=>"current"}]...

Conflicts

1. `build.gradle`

FluxC version conflict:

<<<<<<< merge/19.9-rc-3
    fluxCVersion = '1.42.2'
=======
    fluxCVersion = 'trunk-c5a745e60ccb39fc8178a146d467c3221d931bb1'
>>>>>>> trunk

And I kept fluxCVersion = 'trunk-c5a745e60ccb39fc8178a146d467c3221d931bb1', which was in trunk. The trunk's version seems to be the latest out of the two and thus the version we want to keep in trunk after this PR lands. @ashiagr @AjeshRPai , can you please verify and confirm that the resolution is good and that this is indeed what we want? 🙇

2. `QuickStartTracker.kt` (NEW)

@ashiagr (see comment)

…plore-plans-from-quickstart Remove explore plans from Quick start

…eing-shown-switching-tabs Fixes focus point not being shown with animation after switching tabs

…hown Quick Start: Track Quick Start Card Shown

…plore-plans-quickstart Fix: Removes Explore Plan from Quick start list

peril-wordpress-mobile · 2022-05-23T12:12:34Z

You can trigger optional UI/connected tests for these changes by visiting CircleCI here.

ovitrif · 2022-05-23T12:14:55Z

The new beta includes:

#16619

@ParaskP7 I think this one should not belong to the list 😅

ParaskP7 · 2022-05-23T12:25:39Z

@ParaskP7 I think this one should not belong to the list 😅

@ovitrif This is true, I have no idea how I end-up adding this number there, I meant to have #16582 instead. 🤔

Fixed, thank you so much for noting that! 🙇 ❤️ 🙏

peril-wordpress-mobile · 2022-05-23T12:33:47Z

You can test the changes on this Pull Request by downloading the APKs:

Jetpack-pr-16620-build-124076.apk

WordPress-pr-16620-build-124076.apk

ashiagr · 2022-05-23T12:46:28Z

Thanks for this PR, @ParaskP7!

I kept fluxCVersion = 'trunk-c5a745e60ccb39fc8178a146d467c3221d931bb1', which was in trunk. The trunk's version seems to be the latest out of the two and thus the version we want to keep in trunk after this PR lands. Cc @ashiagr @AjeshRPai , can you please verify that this is indeed what we want?

FluxC 1.42.2 tag changes in release/1.42.2 branch are not merged to FluxC trunk. I'll create a FluxC PR to merge it to trunk as described in Steps for Fixing FluxC During a Code Freeze - Phase 2(Internal Ref: paqN3M-l3-p2) and add you as a reviewer.

I think once it is merged, we can point to the latest FluxC trunk commit in WPAndroid build.gradle.

ParaskP7 · 2022-05-23T12:48:55Z

Thanks for your info @ashiagr and for working on this!

FluxC 1.42.2 tag changes in release/1.42.2 branch are not merged to FluxC trunk. I'll create a FluxC PR to merge it to trunk as described in Steps for Fixing FluxC During a Code Freeze - Phase 2 and add you as a reviewer.

Coolio! 👍

I think once it is merged, we can point to the latest FluxC trunk commit in WPAndroid build.gradle.

Sounds like a plan! 🥇

mokagio

versionName rc number and versionCode bumps inversion.properties
string.xml updates
Diffs from the PRs that made it into this beta

This beta merge looks good to me.

I'm approving to unblock, but I'm not sure whether we want to merge as is or wait for the FluxC work @ashiagr mentions here to be done?

ashiagr · 2022-05-24T05:35:21Z

@ParaskP7 I created FluxC merge PR here: wordpress-mobile/WordPress-FluxC-Android#2420 and added you as a reviewer. Let me know if anything is not in order. 🙏

Once it is merged, we can point to the latest FluxC trunk commit in WPAndroid build.gradle.

ParaskP7 · 2022-05-24T07:31:40Z

@ParaskP7 I created FluxC merge PR here: wordpress-mobile/WordPress-FluxC-Android#2420 and added you as a reviewer. Let me know if anything is not in order. 🙏

Thank you @ashiagr , I am on it! 🥇

Once it is merged, we can point to the latest FluxC trunk commit in WPAndroid build.gradle.

👍 💯

ParaskP7 · 2022-05-24T07:40:53Z

👋 @ashiagr !

Once it is merged, we can point to the latest FluxC trunk commit in WPAndroid build.gradle.

This FluxC PR is now merged. I will now update this release merge PR to point to the latest FluxC trunk commit. ⚙️

This 'FluxC' has updates 'FluxC' to that trunk version where commits from 'FluxC' tags '1.42.1' and '1.42.2' are also included. This step is required in order to finalize the '19.9-rc-3' merge release PR into 'trunk'.

ParaskP7 · 2022-05-24T07:55:09Z

👋 @ashiagr @AjeshRPai !

Once it is merged, we can point to the latest FluxC trunk commit in WPAndroid build.gradle.

I just updated 'FluxC' to point to the latest 'FluxC' trunk commit. Can you verify that this is what you would also expect? 🙏

PS: Today, I noticed a new merge conflict with QuickStartTracker.kt on this PR. Would you mind to also take a look at it and resolve the conflict to what you would expect to land on trunk when this PR merges. I would have done it myself (I actually tried) but I don't want to mess anything as I don't have the needed context in terms of the Quick Start work you have done so far. 🙇

# Conflicts: # WordPress/src/main/java/org/wordpress/android/ui/quickstart/QuickStartTracker.kt

wpmobilebot · 2022-05-24T08:15:39Z

Found 1 violations:

The PR caused the following dependency changes:

-+--- org.wordpress:fluxc:{strictly trunk-c5a745e60ccb39fc8178a146d467c3221d931bb1} -> trunk-c5a745e60ccb39fc8178a146d467c3221d931bb1
-|    +--- org.wordpress:wellsql:1.7.0
-|    |    \--- org.wordpress.wellsql:wellsql-annotations:1.7.0
-|    +--- org.wordpress.fluxc:fluxc-annotations:trunk-c5a745e60ccb39fc8178a146d467c3221d931bb1
-|    +--- 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.3.1 (*)
-|    |    +--- androidx.lifecycle:lifecycle-livedata:2.0.0 -> 2.2.0 (*)
-|    |    \--- 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.1.0-beta01 (*)
-|    +--- 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.29.1 -> 2.41 (*)
-|    +--- 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-e8d924793cb408ede0f016e68c5420af0688ff90} -> trunk-e8d924793cb408ede0f016e68c5420af0688ff90
+|    +--- org.wordpress:wellsql:1.7.0
+|    |    \--- org.wordpress.wellsql:wellsql-annotations:1.7.0
+|    +--- org.wordpress.fluxc:fluxc-annotations:trunk-e8d924793cb408ede0f016e68c5420af0688ff90
+|    +--- 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.3.1 (*)
+|    |    +--- androidx.lifecycle:lifecycle-livedata:2.0.0 -> 2.2.0 (*)
+|    |    \--- 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.1.0-beta01 (*)
+|    +--- 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.29.1 -> 2.41 (*)
+|    +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9 -> 1.5.2 (*)
+|    \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9 -> 1.5.2 (*)
 +--- project :libs:editor:WordPressEditor
-|    \--- org.wordpress-mobile.gutenberg-mobile:react-native-gutenberg-bridge:v1.76.0
-|         +--- com.facebook.fresco:animated-gif:2.0.0
-|         |    +--- com.parse.bolts:bolts-tasks:1.4.0
-|         |    +--- com.facebook.soloader:soloader:0.6.0 -> 0.10.1
-|         |    |    +--- com.facebook.soloader:annotation:0.10.1
-|         |    |    \--- com.facebook.soloader:nativeloader:0.10.1
-|         |    +--- com.facebook.fresco:fbcore:2.0.0 -> 2.5.0
-|         |    \--- com.facebook.fresco:animated-base:2.0.0
-|         |         +--- com.facebook.fresco:fbcore:2.0.0 -> 2.5.0
-|         |         +--- com.facebook.fresco:imagepipeline-base:2.0.0 -> 2.5.0
-|         |         |    +--- com.facebook.infer.annotation:infer-annotation:0.18.0
-|         |         |    |    +--- com.google.code.findbugs:jsr305:3.0.1 -> 3.0.2
-|         |         |    |    \--- org.jetbrains.kotlin:kotlin-annotations-jvm:1.3.72
-|         |         |    +--- com.facebook.soloader:annotation:0.10.1
-|         |         |    +--- com.parse.bolts:bolts-tasks:1.4.0
-|         |         |    \--- com.facebook.fresco:fbcore:2.5.0
-|         |         +--- com.facebook.fresco:imagepipeline:2.0.0 -> 2.5.0
-|         |         |    +--- com.facebook.soloader:nativeloader:0.10.1
-|         |         |    +--- com.facebook.soloader:annotation:0.10.1
-|         |         |    +--- com.parse.bolts:bolts-tasks:1.4.0
-|         |         |    +--- com.facebook.fresco:fbcore:2.5.0
-|         |         |    \--- com.facebook.fresco:imagepipeline-base:2.5.0 (*)
-|         |         +--- com.facebook.fresco:animated-drawable:2.0.0
-|         |         |    +--- com.facebook.fresco:imagepipeline:2.0.0 -> 2.5.0 (*)
-|         |         |    +--- com.facebook.fresco:drawee:2.0.0 -> 2.5.0
-|         |         |    |    +--- com.facebook.fresco:fbcore:2.5.0
-|         |         |    |    +--- com.facebook.fresco:imagepipeline:2.5.0 (*)
-|         |         |    |    +--- com.facebook.fresco:imagepipeline-native:2.5.0
-|         |         |    |    |    +--- com.facebook.fresco:imagepipeline:2.5.0 (*)
-|         |         |    |    |    +--- com.facebook.fresco:fbcore:2.5.0
-|         |         |    |    |    \--- com.facebook.soloader:soloader:0.10.1 (*)
-|         |         |    |    +--- com.facebook.fresco:memory-type-ashmem:2.5.0
-|         |         |    |    |    +--- com.facebook.fresco:fbcore:2.5.0
-|         |         |    |    |    \--- com.facebook.fresco:imagepipeline:2.5.0 (*)
-|         |         |    |    +--- com.facebook.fresco:memory-type-native:2.5.0
-|         |         |    |    |    +--- com.facebook.fresco:fbcore:2.5.0
-|         |         |    |    |    +--- com.facebook.fresco:imagepipeline:2.5.0 (*)
-|         |         |    |    |    +--- com.facebook.fresco:imagepipeline-native:2.5.0 (*)
-|         |         |    |    |    \--- com.facebook.soloader:nativeloader:0.10.1
-|         |         |    |    +--- com.facebook.fresco:memory-type-java:2.5.0
-|         |         |    |    |    +--- com.facebook.fresco:fbcore:2.5.0
-|         |         |    |    |    +--- com.facebook.fresco:imagepipeline:2.5.0 (*)
-|         |         |    |    |    \--- com.facebook.fresco:imagepipeline-native:2.5.0 (*)
-|         |         |    |    +--- com.facebook.fresco:ui-common:2.5.0
-|         |         |    |    |    \--- com.facebook.fresco:fbcore:2.5.0
-|         |         |    |    \--- com.facebook.fresco:middleware:2.5.0
-|         |         |    |         +--- com.facebook.fresco:fbcore:2.5.0
-|         |         |    |         \--- com.facebook.fresco:ui-common:2.5.0 (*)
-|         |         |    \--- com.facebook.fresco:fbcore:2.0.0 -> 2.5.0
-|         |         \--- com.parse.bolts:bolts-tasks:1.4.0
-|         +--- com.google.android.material:material:1.2.1 -> 1.6.0-alpha01 (*)
-|         +--- com.facebook.react:react-native:0.66.2
-|         |    +--- com.facebook.infer.annotation:infer-annotation:0.18.0 (*)
-|         |    +--- com.facebook.yoga:proguard-annotations:1.19.0
-|         |    +--- javax.inject:javax.inject:1
-|         |    +--- androidx.appcompat:appcompat:1.0.2 -> 1.3.1 (*)
-|         |    +--- androidx.autofill:autofill:1.1.0 (*)
-|         |    +--- androidx.swiperefreshlayout:swiperefreshlayout:1.0.0 -> 1.1.0 (*)
-|         |    +--- com.facebook.fresco:fresco:2.5.0
-|         |    |    +--- com.facebook.fresco:soloader:2.5.0
-|         |    |    |    +--- com.facebook.fresco:fbcore:2.5.0
-|         |    |    |    \--- com.facebook.soloader:soloader:0.10.1 (*)
-|         |    |    +--- com.facebook.soloader:nativeloader:0.10.1
-|         |    |    +--- com.facebook.fresco:ui-common:2.5.0 (*)
-|         |    |    +--- com.facebook.fresco:fbcore:2.5.0
-|         |    |    +--- com.facebook.fresco:drawee:2.5.0 (*)
-|         |    |    +--- com.facebook.fresco:imagepipeline:2.5.0 (*)
-|         |    |    +--- com.facebook.fresco:imagepipeline-native:2.5.0 (*)
-|         |    |    +--- com.facebook.fresco:memory-type-ashmem:2.5.0 (*)
-|         |    |    +--- com.facebook.fresco:memory-type-native:2.5.0 (*)
-|         |    |    +--- com.facebook.fresco:memory-type-java:2.5.0 (*)
-|         |    |    +--- com.facebook.fresco:nativeimagefilters:2.5.0
-|         |    |    |    +--- com.facebook.fresco:imagepipeline:2.5.0 (*)
-|         |    |    |    +--- com.facebook.fresco:imagepipeline-native:2.5.0 (*)
-|         |    |    |    +--- com.facebook.fresco:memory-type-ashmem:2.5.0 (*)
-|         |    |    |    +--- com.facebook.fresco:memory-type-native:2.5.0 (*)
-|         |    |    |    +--- com.facebook.fresco:memory-type-java:2.5.0 (*)
-|         |    |    |    +--- com.facebook.soloader:nativeloader:0.10.1
-|         |    |    |    +--- com.parse.bolts:bolts-tasks:1.4.0
-|         |    |    |    \--- com.facebook.fresco:fbcore:2.5.0
-|         |    |    \--- com.facebook.fresco:nativeimagetranscoder:2.5.0
-|         |    |         +--- com.facebook.fresco:imagepipeline-base:2.5.0 (*)
-|         |    |         +--- com.facebook.soloader:nativeloader:0.10.1
-|         |    |         +--- com.parse.bolts:bolts-tasks:1.4.0
-|         |    |         \--- com.facebook.fresco:fbcore:2.5.0
-|         |    +--- com.facebook.fresco:imagepipeline-okhttp3:2.5.0
-|         |    |    +--- com.facebook.fresco:fbcore:2.5.0
-|         |    |    +--- com.facebook.fresco:imagepipeline:2.5.0 (*)
-|         |    |    +--- com.facebook.fresco:imagepipeline-native:2.5.0 (*)
-|         |    |    +--- com.facebook.fresco:memory-type-ashmem:2.5.0 (*)
-|         |    |    +--- com.facebook.fresco:memory-type-native:2.5.0 (*)
-|         |    |    +--- com.facebook.fresco:memory-type-java:2.5.0 (*)
-|         |    |    \--- com.squareup.okhttp3:okhttp:3.12.1 -> 4.9.2 (*)
-|         |    +--- com.facebook.fresco:ui-common:2.5.0 (*)
-|         |    +--- com.facebook.soloader:soloader:0.10.1 (*)
-|         |    +--- com.google.code.findbugs:jsr305:3.0.2
-|         |    +--- com.squareup.okhttp3:okhttp:4.9.1 -> 4.9.2 (*)
-|         |    +--- com.squareup.okhttp3:okhttp-urlconnection:4.9.1 -> 4.9.2 (*)
-|         |    +--- com.squareup.okio:okio:2.9.0 (*)
-|         |    \--- com.facebook.fbjni:fbjni-java-only:0.2.2
-|         |         \--- com.facebook.soloader:nativeloader:0.10.1
-|         +--- org.wordpress-mobile:react-native-svg:9.13.6
-|         |    \--- com.facebook.react:react-native:0.66.2 (*)
-|         +--- com.github.wordpress-mobile:react-native-video:5.2.0-wp-2
-|         |    +--- com.facebook.react:react-native:0.66.2 (*)
-|         |    +--- com.google.android.exoplayer:exoplayer:2.13.3
-|         |    |    +--- com.google.android.exoplayer:exoplayer-core:2.13.3
-|         |    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
-|         |    |    |    +--- com.google.android.exoplayer:exoplayer-common:2.13.3
-|         |    |    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
-|         |    |    |    |    \--- com.google.guava:guava:27.1-android
-|         |    |    |    |         +--- com.google.guava:failureaccess:1.0.1
-|         |    |    |    |         \--- com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
-|         |    |    |    \--- com.google.android.exoplayer:exoplayer-extractor:2.13.3
-|         |    |    |         +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
-|         |    |    |         \--- com.google.android.exoplayer:exoplayer-common:2.13.3 (*)
-|         |    |    +--- com.google.android.exoplayer:exoplayer-dash:2.13.3
-|         |    |    |    +--- com.google.android.exoplayer:exoplayer-core:2.13.3 (*)
-|         |    |    |    \--- androidx.annotation:annotation:1.1.0 -> 1.2.0
-|         |    |    +--- com.google.android.exoplayer:exoplayer-hls:2.13.3
-|         |    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
-|         |    |    |    \--- com.google.android.exoplayer:exoplayer-core:2.13.3 (*)
-|         |    |    +--- com.google.android.exoplayer:exoplayer-smoothstreaming:2.13.3
-|         |    |    |    +--- com.google.android.exoplayer:exoplayer-core:2.13.3 (*)
-|         |    |    |    \--- androidx.annotation:annotation:1.1.0 -> 1.2.0
-|         |    |    +--- com.google.android.exoplayer:exoplayer-transformer:2.13.3
-|         |    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
-|         |    |    |    \--- com.google.android.exoplayer:exoplayer-core:2.13.3 (*)
-|         |    |    \--- com.google.android.exoplayer:exoplayer-ui:2.13.3
-|         |    |         +--- com.google.android.exoplayer:exoplayer-core:2.13.3 (*)
-|         |    |         +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
-|         |    |         +--- androidx.recyclerview:recyclerview:1.1.0 (*)
-|         |    |         \--- androidx.media:media:1.2.1 (*)
-|         |    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
-|         |    +--- androidx.core:core:1.1.0 -> 1.7.0 (*)
-|         |    +--- androidx.media:media:1.1.0 -> 1.2.1 (*)
-|         |    +--- com.google.android.exoplayer:extension-okhttp:2.13.3
-|         |    |    +--- com.google.android.exoplayer:exoplayer-common:2.13.3 (*)
-|         |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
-|         |    |    \--- com.squareup.okhttp3:okhttp:3.12.11 -> 4.9.2 (*)
-|         |    \--- com.squareup.okhttp3:okhttp:${OKHTTP_VERSION} -> 4.9.2 (*)
-|         +--- com.github.wordpress-mobile:react-native-linear-gradient:2.5.6-wp-2
-|         |    \--- com.facebook.react:react-native:0.66.2 (*)
-|         +--- com.github.wordpress-mobile:react-native-slider:3.0.2-wp-2
-|         |    \--- com.facebook.react:react-native:0.66.2 (*)
-|         +--- org.wordpress-mobile:react-native-get-random-values:1.4.0
-|         |    \--- com.facebook.react:react-native:0.66.2 (*)
-|         +--- org.wordpress-mobile:react-native-masked-view:0.2.6
-|         |    \--- com.facebook.react:react-native:0.66.2 (*)
-|         +--- org.wordpress-mobile:react-native-screens:2.9.0
-|         |    +--- com.facebook.react:react-native:0.66.2 (*)
-|         |    +--- androidx.appcompat:appcompat:1.1.0 -> 1.3.1 (*)
-|         |    +--- androidx.fragment:fragment:1.2.1 -> 1.3.6 (*)
-|         |    +--- androidx.coordinatorlayout:coordinatorlayout:1.1.0 (*)
-|         |    +--- androidx.swiperefreshlayout:swiperefreshlayout:1.0.0 -> 1.1.0 (*)
-|         |    \--- com.google.android.material:material:1.1.0 -> 1.6.0-alpha01 (*)
-|         +--- org.wordpress-mobile:react-native-safe-area-context:3.2.0
-|         |    \--- com.facebook.react:react-native:0.66.2 (*)
-|         +--- com.github.wordpress-mobile:react-native-reanimated:2.4.1-wp-2
-|         +--- com.github.wordpress-mobile:react-native-prompt-android:1.0.0-wp-2
-|         |    +--- com.facebook.react:react-native:0.66.2 (*)
-|         |    \--- androidx.appcompat:appcompat:1.0.0 -> 1.3.1 (*)
-|         +--- org.wordpress-mobile:react-native-webview:11.6.2
-|         |    +--- com.facebook.react:react-native:0.66.2 (*)
-|         |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.10 -> 1.6.10 (*)
-|         +--- org.wordpress-mobile:react-native-clipboard:1.9.0
-|         |    \--- com.facebook.react:react-native:0.66.2 (*)
-|         +--- com.github.wordpress-mobile:react-native-gesture-handler:2.2.0-wp-4
-|         |    +--- com.github.wordpress-mobile:react-native-reanimated:2.4.1-wp-1 -> 2.4.1-wp-2
-|         |    +--- com.facebook.react:react-native:0.66.2 (*)
-|         |    +--- androidx.appcompat:appcompat:1.2.0 -> 1.3.1 (*)
-|         |    +--- androidx.core:core-ktx:1.6.0 -> 1.7.0 (*)
-|         |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.5.20 -> 1.6.10 (*)
-|         +--- org.wordpress-mobile.gutenberg-mobile:react-native-aztec:v1.76.0
-|         |    +--- androidx.legacy:legacy-support-v4:1.0.0 (*)
-|         |    +--- androidx.gridlayout:gridlayout:1.0.0 (*)
-|         |    +--- androidx.cardview:cardview:1.0.0 (*)
-|         |    +--- androidx.appcompat:appcompat:1.2.0 -> 1.3.1 (*)
-|         |    +--- androidx.recyclerview:recyclerview:1.1.0 (*)
-|         |    +--- com.facebook.react:react-native:0.66.2 (*)
-|         |    +--- org.wordpress:aztec:v1.5.8 (*)
-|         |    +--- org.wordpress.aztec:wordpress-shortcodes:v1.5.8 (*)
-|         |    +--- org.wordpress.aztec:wordpress-comments:v1.5.8 (*)
-|         |    +--- org.wordpress.aztec:glide-loader:v1.5.8
-|         |    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.20 -> 1.6.10 (*)
-|         |    |    +--- org.wordpress:aztec:v1.5.8 (*)
-|         |    |    \--- com.github.bumptech.glide:glide:4.10.0 -> 4.11.0 (*)
-|         |    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.32 -> 1.6.10 (*)
-|         +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.32 -> 1.6.10 (*)
-|         \--- org.wordpress-mobile:hermes-release-mirror:0.66.2
+|    \--- org.wordpress-mobile.gutenberg-mobile:react-native-gutenberg-bridge:v1.76.1
+|         +--- com.facebook.fresco:animated-gif:2.0.0
+|         |    +--- com.parse.bolts:bolts-tasks:1.4.0
+|         |    +--- com.facebook.soloader:soloader:0.6.0 -> 0.10.1
+|         |    |    +--- com.facebook.soloader:annotation:0.10.1
+|         |    |    \--- com.facebook.soloader:nativeloader:0.10.1
+|         |    +--- com.facebook.fresco:fbcore:2.0.0 -> 2.5.0
+|         |    \--- com.facebook.fresco:animated-base:2.0.0
+|         |         +--- com.facebook.fresco:fbcore:2.0.0 -> 2.5.0
+|         |         +--- com.facebook.fresco:imagepipeline-base:2.0.0 -> 2.5.0
+|         |         |    +--- com.facebook.infer.annotation:infer-annotation:0.18.0
+|         |         |    |    +--- com.google.code.findbugs:jsr305:3.0.1 -> 3.0.2
+|         |         |    |    \--- org.jetbrains.kotlin:kotlin-annotations-jvm:1.3.72
+|         |         |    +--- com.facebook.soloader:annotation:0.10.1
+|         |         |    +--- com.parse.bolts:bolts-tasks:1.4.0
+|         |         |    \--- com.facebook.fresco:fbcore:2.5.0
+|         |         +--- com.facebook.fresco:imagepipeline:2.0.0 -> 2.5.0
+|         |         |    +--- com.facebook.soloader:nativeloader:0.10.1
+|         |         |    +--- com.facebook.soloader:annotation:0.10.1
+|         |         |    +--- com.parse.bolts:bolts-tasks:1.4.0
+|         |         |    +--- com.facebook.fresco:fbcore:2.5.0
+|         |         |    \--- com.facebook.fresco:imagepipeline-base:2.5.0 (*)
+|         |         +--- com.facebook.fresco:animated-drawable:2.0.0
+|         |         |    +--- com.facebook.fresco:imagepipeline:2.0.0 -> 2.5.0 (*)
+|         |         |    +--- com.facebook.fresco:drawee:2.0.0 -> 2.5.0
+|         |         |    |    +--- com.facebook.fresco:fbcore:2.5.0
+|         |         |    |    +--- com.facebook.fresco:imagepipeline:2.5.0 (*)
+|         |         |    |    +--- com.facebook.fresco:imagepipeline-native:2.5.0
+|         |         |    |    |    +--- com.facebook.fresco:imagepipeline:2.5.0 (*)
+|         |         |    |    |    +--- com.facebook.fresco:fbcore:2.5.0
+|         |         |    |    |    \--- com.facebook.soloader:soloader:0.10.1 (*)
+|         |         |    |    +--- com.facebook.fresco:memory-type-ashmem:2.5.0
+|         |         |    |    |    +--- com.facebook.fresco:fbcore:2.5.0
+|         |         |    |    |    \--- com.facebook.fresco:imagepipeline:2.5.0 (*)
+|         |         |    |    +--- com.facebook.fresco:memory-type-native:2.5.0
+|         |         |    |    |    +--- com.facebook.fresco:fbcore:2.5.0
+|         |         |    |    |    +--- com.facebook.fresco:imagepipeline:2.5.0 (*)
+|         |         |    |    |    +--- com.facebook.fresco:imagepipeline-native:2.5.0 (*)
+|         |         |    |    |    \--- com.facebook.soloader:nativeloader:0.10.1
+|         |         |    |    +--- com.facebook.fresco:memory-type-java:2.5.0
+|         |         |    |    |    +--- com.facebook.fresco:fbcore:2.5.0
+|         |         |    |    |    +--- com.facebook.fresco:imagepipeline:2.5.0 (*)
+|         |         |    |    |    \--- com.facebook.fresco:imagepipeline-native:2.5.0 (*)
+|         |         |    |    +--- com.facebook.fresco:ui-common:2.5.0
+|         |         |    |    |    \--- com.facebook.fresco:fbcore:2.5.0
+|         |         |    |    \--- com.facebook.fresco:middleware:2.5.0
+|         |         |    |         +--- com.facebook.fresco:fbcore:2.5.0
+|         |         |    |         \--- com.facebook.fresco:ui-common:2.5.0 (*)
+|         |         |    \--- com.facebook.fresco:fbcore:2.0.0 -> 2.5.0
+|         |         \--- com.parse.bolts:bolts-tasks:1.4.0
+|         +--- com.google.android.material:material:1.2.1 -> 1.6.0-alpha01 (*)
+|         +--- com.facebook.react:react-native:0.66.2
+|         |    +--- com.facebook.infer.annotation:infer-annotation:0.18.0 (*)
+|         |    +--- com.facebook.yoga:proguard-annotations:1.19.0
+|         |    +--- javax.inject:javax.inject:1
+|         |    +--- androidx.appcompat:appcompat:1.0.2 -> 1.3.1 (*)
+|         |    +--- androidx.autofill:autofill:1.1.0 (*)
+|         |    +--- androidx.swiperefreshlayout:swiperefreshlayout:1.0.0 -> 1.1.0 (*)
+|         |    +--- com.facebook.fresco:fresco:2.5.0
+|         |    |    +--- com.facebook.fresco:soloader:2.5.0
+|         |    |    |    +--- com.facebook.fresco:fbcore:2.5.0
+|         |    |    |    \--- com.facebook.soloader:soloader:0.10.1 (*)
+|         |    |    +--- com.facebook.soloader:nativeloader:0.10.1
+|         |    |    +--- com.facebook.fresco:ui-common:2.5.0 (*)
+|         |    |    +--- com.facebook.fresco:fbcore:2.5.0
+|         |    |    +--- com.facebook.fresco:drawee:2.5.0 (*)
+|         |    |    +--- com.facebook.fresco:imagepipeline:2.5.0 (*)
+|         |    |    +--- com.facebook.fresco:imagepipeline-native:2.5.0 (*)
+|         |    |    +--- com.facebook.fresco:memory-type-ashmem:2.5.0 (*)
+|         |    |    +--- com.facebook.fresco:memory-type-native:2.5.0 (*)
+|         |    |    +--- com.facebook.fresco:memory-type-java:2.5.0 (*)
+|         |    |    +--- com.facebook.fresco:nativeimagefilters:2.5.0
+|         |    |    |    +--- com.facebook.fresco:imagepipeline:2.5.0 (*)
+|         |    |    |    +--- com.facebook.fresco:imagepipeline-native:2.5.0 (*)
+|         |    |    |    +--- com.facebook.fresco:memory-type-ashmem:2.5.0 (*)
+|         |    |    |    +--- com.facebook.fresco:memory-type-native:2.5.0 (*)
+|         |    |    |    +--- com.facebook.fresco:memory-type-java:2.5.0 (*)
+|         |    |    |    +--- com.facebook.soloader:nativeloader:0.10.1
+|         |    |    |    +--- com.parse.bolts:bolts-tasks:1.4.0
+|         |    |    |    \--- com.facebook.fresco:fbcore:2.5.0
+|         |    |    \--- com.facebook.fresco:nativeimagetranscoder:2.5.0
+|         |    |         +--- com.facebook.fresco:imagepipeline-base:2.5.0 (*)
+|         |    |         +--- com.facebook.soloader:nativeloader:0.10.1
+|         |    |         +--- com.parse.bolts:bolts-tasks:1.4.0
+|         |    |         \--- com.facebook.fresco:fbcore:2.5.0
+|         |    +--- com.facebook.fresco:imagepipeline-okhttp3:2.5.0
+|         |    |    +--- com.facebook.fresco:fbcore:2.5.0
+|         |    |    +--- com.facebook.fresco:imagepipeline:2.5.0 (*)
+|         |    |    +--- com.facebook.fresco:imagepipeline-native:2.5.0 (*)
+|         |    |    +--- com.facebook.fresco:memory-type-ashmem:2.5.0 (*)
+|         |    |    +--- com.facebook.fresco:memory-type-native:2.5.0 (*)
+|         |    |    +--- com.facebook.fresco:memory-type-java:2.5.0 (*)
+|         |    |    \--- com.squareup.okhttp3:okhttp:3.12.1 -> 4.9.2 (*)
+|         |    +--- com.facebook.fresco:ui-common:2.5.0 (*)
+|         |    +--- com.facebook.soloader:soloader:0.10.1 (*)
+|         |    +--- com.google.code.findbugs:jsr305:3.0.2
+|         |    +--- com.squareup.okhttp3:okhttp:4.9.1 -> 4.9.2 (*)
+|         |    +--- com.squareup.okhttp3:okhttp-urlconnection:4.9.1 -> 4.9.2 (*)
+|         |    +--- com.squareup.okio:okio:2.9.0 (*)
+|         |    \--- com.facebook.fbjni:fbjni-java-only:0.2.2
+|         |         \--- com.facebook.soloader:nativeloader:0.10.1
+|         +--- org.wordpress-mobile:react-native-svg:9.13.6
+|         |    \--- com.facebook.react:react-native:0.66.2 (*)
+|         +--- com.github.wordpress-mobile:react-native-video:5.2.0-wp-2
+|         |    +--- com.facebook.react:react-native:0.66.2 (*)
+|         |    +--- com.google.android.exoplayer:exoplayer:2.13.3
+|         |    |    +--- com.google.android.exoplayer:exoplayer-core:2.13.3
+|         |    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
+|         |    |    |    +--- com.google.android.exoplayer:exoplayer-common:2.13.3
+|         |    |    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
+|         |    |    |    |    \--- com.google.guava:guava:27.1-android
+|         |    |    |    |         +--- com.google.guava:failureaccess:1.0.1
+|         |    |    |    |         \--- com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
+|         |    |    |    \--- com.google.android.exoplayer:exoplayer-extractor:2.13.3
+|         |    |    |         +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
+|         |    |    |         \--- com.google.android.exoplayer:exoplayer-common:2.13.3 (*)
+|         |    |    +--- com.google.android.exoplayer:exoplayer-dash:2.13.3
+|         |    |    |    +--- com.google.android.exoplayer:exoplayer-core:2.13.3 (*)
+|         |    |    |    \--- androidx.annotation:annotation:1.1.0 -> 1.2.0
+|         |    |    +--- com.google.android.exoplayer:exoplayer-hls:2.13.3
+|         |    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
+|         |    |    |    \--- com.google.android.exoplayer:exoplayer-core:2.13.3 (*)
+|         |    |    +--- com.google.android.exoplayer:exoplayer-smoothstreaming:2.13.3
+|         |    |    |    +--- com.google.android.exoplayer:exoplayer-core:2.13.3 (*)
+|         |    |    |    \--- androidx.annotation:annotation:1.1.0 -> 1.2.0
+|         |    |    +--- com.google.android.exoplayer:exoplayer-transformer:2.13.3
+|         |    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
+|         |    |    |    \--- com.google.android.exoplayer:exoplayer-core:2.13.3 (*)
+|         |    |    \--- com.google.android.exoplayer:exoplayer-ui:2.13.3
+|         |    |         +--- com.google.android.exoplayer:exoplayer-core:2.13.3 (*)
+|         |    |         +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
+|         |    |         +--- androidx.recyclerview:recyclerview:1.1.0 (*)
+|         |    |         \--- androidx.media:media:1.2.1 (*)
+|         |    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
+|         |    +--- androidx.core:core:1.1.0 -> 1.7.0 (*)
+|         |    +--- androidx.media:media:1.1.0 -> 1.2.1 (*)
+|         |    +--- com.google.android.exoplayer:extension-okhttp:2.13.3
+|         |    |    +--- com.google.android.exoplayer:exoplayer-common:2.13.3 (*)
+|         |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
+|         |    |    \--- com.squareup.okhttp3:okhttp:3.12.11 -> 4.9.2 (*)
+|         |    \--- com.squareup.okhttp3:okhttp:${OKHTTP_VERSION} -> 4.9.2 (*)
+|         +--- com.github.wordpress-mobile:react-native-linear-gradient:2.5.6-wp-2
+|         |    \--- com.facebook.react:react-native:0.66.2 (*)
+|         +--- com.github.wordpress-mobile:react-native-slider:3.0.2-wp-2
+|         |    \--- com.facebook.react:react-native:0.66.2 (*)
+|         +--- org.wordpress-mobile:react-native-get-random-values:1.4.0
+|         |    \--- com.facebook.react:react-native:0.66.2 (*)
+|         +--- org.wordpress-mobile:react-native-masked-view:0.2.6
+|         |    \--- com.facebook.react:react-native:0.66.2 (*)
+|         +--- org.wordpress-mobile:react-native-screens:2.9.0
+|         |    +--- com.facebook.react:react-native:0.66.2 (*)
+|         |    +--- androidx.appcompat:appcompat:1.1.0 -> 1.3.1 (*)
+|         |    +--- androidx.fragment:fragment:1.2.1 -> 1.3.6 (*)
+|         |    +--- androidx.coordinatorlayout:coordinatorlayout:1.1.0 (*)
+|         |    +--- androidx.swiperefreshlayout:swiperefreshlayout:1.0.0 -> 1.1.0 (*)
+|         |    \--- com.google.android.material:material:1.1.0 -> 1.6.0-alpha01 (*)
+|         +--- org.wordpress-mobile:react-native-safe-area-context:3.2.0
+|         |    \--- com.facebook.react:react-native:0.66.2 (*)
+|         +--- com.github.wordpress-mobile:react-native-reanimated:2.4.1-wp-2
+|         +--- com.github.wordpress-mobile:react-native-prompt-android:1.0.0-wp-2
+|         |    +--- com.facebook.react:react-native:0.66.2 (*)
+|         |    \--- androidx.appcompat:appcompat:1.0.0 -> 1.3.1 (*)
+|         +--- org.wordpress-mobile:react-native-webview:11.6.2
+|         |    +--- com.facebook.react:react-native:0.66.2 (*)
+|         |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.10 -> 1.6.10 (*)
+|         +--- org.wordpress-mobile:react-native-clipboard:1.9.0
+|         |    \--- com.facebook.react:react-native:0.66.2 (*)
+|         +--- com.github.wordpress-mobile:react-native-gesture-handler:2.2.0-wp-4
+|         |    +--- com.github.wordpress-mobile:react-native-reanimated:2.4.1-wp-1 -> 2.4.1-wp-2
+|         |    +--- com.facebook.react:react-native:0.66.2 (*)
+|         |    +--- androidx.appcompat:appcompat:1.2.0 -> 1.3.1 (*)
+|         |    +--- androidx.core:core-ktx:1.6.0 -> 1.7.0 (*)
+|         |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.5.20 -> 1.6.10 (*)
+|         +--- org.wordpress-mobile.gutenberg-mobile:react-native-aztec:v1.76.1
+|         |    +--- androidx.legacy:legacy-support-v4:1.0.0 (*)
+|         |    +--- androidx.gridlayout:gridlayout:1.0.0 (*)
+|         |    +--- androidx.cardview:cardview:1.0.0 (*)
+|         |    +--- androidx.appcompat:appcompat:1.2.0 -> 1.3.1 (*)
+|         |    +--- androidx.recyclerview:recyclerview:1.1.0 (*)
+|         |    +--- com.facebook.react:react-native:0.66.2 (*)
+|         |    +--- org.wordpress:aztec:v1.5.8 (*)
+|         |    +--- org.wordpress.aztec:wordpress-shortcodes:v1.5.8 (*)
+|         |    +--- org.wordpress.aztec:wordpress-comments:v1.5.8 (*)
+|         |    +--- org.wordpress.aztec:glide-loader:v1.5.8
+|         |    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.20 -> 1.6.10 (*)
+|         |    |    +--- org.wordpress:aztec:v1.5.8 (*)
+|         |    |    \--- com.github.bumptech.glide:glide:4.10.0 -> 4.11.0 (*)
+|         |    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.32 -> 1.6.10 (*)
+|         +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.32 -> 1.6.10 (*)
+|         \--- org.wordpress-mobile:hermes-release-mirror:0.66.2
 \--- org.wordpress:login:0.14.0
-     \--- org.wordpress:fluxc:trunk-1436f46fc296ede0e65e117bbfced38fa34cec6d -> trunk-c5a745e60ccb39fc8178a146d467c3221d931bb1 (*)
+     \--- org.wordpress:fluxc:trunk-1436f46fc296ede0e65e117bbfced38fa34cec6d -> trunk-e8d924793cb408ede0f016e68c5420af0688ff90 (*)

Please review and act accordingly

ashiagr

👋 @ParaskP7

I just updated 'FluxC' to point to the latest 'FluxC' trunk commit. Can you verify that this is what you would also expect? 🙏

Yes, I pulled this branch and verified that our FluxC changes are included in it.

Today, I noticed a new merge conflict with QuickStartTracker.kt on this PR. Would you mind to also take a look at it and resolve the conflict to what you would expect to land on trunk when this PR merges.

Merged trunk in 6e70dfd which resolves the conflict.

All looks good to me now. Thank you so much for this PR! 🙏
Feel free to merge when CI completes.

ParaskP7 · 2022-05-24T08:38:40Z

👋 @ashiagr !

Yes, I pulled this branch and verified that our FluxC changes are included in it.

Thank you! 🙏

Merged trunk in 6e70dfd which resolves the conflict.

Thank you! 🙇

All looks good to me now. Thank you so much for this PR! 🙏

Thank YOU! 🥇

Feel free to merge when CI completes.

👍

AjeshRPai and others added 30 commits May 17, 2022 17:31

Removes: Explore plan from repository and viewmodel

27a3620

Updates: Explore plans test

720ff49

Updating jetpack icon res.

896ae23

Updating wordpress icon res.

3dfcf98

Updates: FluxC Version

358ef85

Removes: Explore plans strings and resource

d9b9a9f

Removes: Usages of Explore Plans tracking

82d1f8d

Fixes: Ktlint issues

9142497

Removes: Explores plans from quick start task details

fc8c19f

Updating png icons with black background.

d586b39

Removes: Unused resource

a862776

Updating adaptive icons files.

8708d70

Merge branch 'release/19.9' into replace-icon-with-spectrum

dca0a8f

Fixes: Migration issue

b7dfd15

Updates: FluxC Version

cadaaa7

Merge pull request #16582 from wordpress-mobile/issue/16477-remove-ex…

8f5bbc6

…plore-plans-from-quickstart Remove explore plans from Quick start

Fixes: Focus point animation not being shown when tab changed

07b492f

Fixes: Detekt issues

4eb5412

Track quick start shown in dashboard card shown

589b644

Track quick start shown by tab

cdaf84f

Merge pull request #16604 from wordpress-mobile/fix/focus-point-not-b…

cc024b4

…eing-shown-switching-tabs Fixes focus point not being shown with animation after switching tabs

Remove blank line

2489a87

Suppress detekt too many functions issue

bb0f915

Updates: FluxC Version

d735d17

Update Gutenberg ref

97d2447

Merge pull request #16607 from wordpress-mobile/issue/track-qs-card-s…

a377914

…hown Quick Start: Track Quick Start Card Shown

Update FluxC tag

9713906

Update Gutenberg Mobile ref

7c35b12

Update FluxC tag

f0d2879

Merge pull request #16613 from wordpress-mobile/issue/16477-remove-ex…

7bf0b48

…plore-plans-quickstart Fix: Removes Explore Plan from Quick start list

ParaskP7 added 3 commits May 23, 2022 13:31

Freeze strings for translation

3031432

Update translations

74f448d

Bump version number

0e9c854

ParaskP7 added the Releases Label related to managing releases label May 23, 2022

ParaskP7 added this to the 19.9 ❄️ milestone May 23, 2022

ParaskP7 requested a review from AliSoftware May 23, 2022 12:04

ParaskP7 self-assigned this May 23, 2022

Merge branch 'trunk' into merge/19.9-rc-3

ac9371b

ParaskP7 requested review from ashiagr, AjeshRPai and a team May 23, 2022 12:31

ParaskP7 marked this pull request as ready for review May 23, 2022 12:31

mokagio approved these changes May 23, 2022

View reviewed changes

Build: Update fluxc hash

cb52ac0

This 'FluxC' has updates 'FluxC' to that trunk version where commits from 'FluxC' tags '1.42.1' and '1.42.2' are also included. This step is required in order to finalize the '19.9-rc-3' merge release PR into 'trunk'.

Merge branch 'trunk' into merge/19.9-rc-3

6e70dfd

# Conflicts: # WordPress/src/main/java/org/wordpress/android/ui/quickstart/QuickStartTracker.kt

ashiagr approved these changes May 24, 2022

View reviewed changes

ParaskP7 merged commit 2244362 into trunk May 24, 2022

ParaskP7 deleted the merge/19.9-rc-3 branch May 24, 2022 08:40

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge release/19.9 (19.9-rc-3 + conflict resolution) #16620

Merge release/19.9 (19.9-rc-3 + conflict resolution) #16620

ParaskP7 commented May 23, 2022 •

edited

Loading

peril-wordpress-mobile bot commented May 23, 2022 •

edited

Loading

ovitrif commented May 23, 2022 •

edited

Loading

ParaskP7 commented May 23, 2022

peril-wordpress-mobile bot commented May 23, 2022 •

edited

Loading

ashiagr commented May 23, 2022 •

edited

Loading

ParaskP7 commented May 23, 2022

mokagio left a comment

ashiagr commented May 24, 2022 •

edited

Loading

ParaskP7 commented May 24, 2022

ParaskP7 commented May 24, 2022

ParaskP7 commented May 24, 2022

wpmobilebot commented May 24, 2022

ashiagr left a comment

ParaskP7 commented May 24, 2022

Merge release/19.9 (19.9-rc-3 + conflict resolution) #16620

Merge release/19.9 (19.9-rc-3 + conflict resolution) #16620

Conversation

ParaskP7 commented May 23, 2022 • edited Loading

Conflicts

1. build.gradle

2. QuickStartTracker.kt (NEW)

peril-wordpress-mobile bot commented May 23, 2022 • edited Loading

ovitrif commented May 23, 2022 • edited Loading

ParaskP7 commented May 23, 2022

peril-wordpress-mobile bot commented May 23, 2022 • edited Loading

ashiagr commented May 23, 2022 • edited Loading

ParaskP7 commented May 23, 2022

mokagio left a comment

Choose a reason for hiding this comment

ashiagr commented May 24, 2022 • edited Loading

ParaskP7 commented May 24, 2022

ParaskP7 commented May 24, 2022

ParaskP7 commented May 24, 2022

wpmobilebot commented May 24, 2022

The PR caused the following dependency changes:

ashiagr left a comment

Choose a reason for hiding this comment

ParaskP7 commented May 24, 2022

ParaskP7 commented May 23, 2022 •

edited

Loading

1. `build.gradle`

2. `QuickStartTracker.kt` (NEW)

peril-wordpress-mobile bot commented May 23, 2022 •

edited

Loading

ovitrif commented May 23, 2022 •

edited

Loading

peril-wordpress-mobile bot commented May 23, 2022 •

edited

Loading

ashiagr commented May 23, 2022 •

edited

Loading

ashiagr commented May 24, 2022 •

edited

Loading