Skip to content

[Dependency Updates] Update androidxComposeBomVersion to 2023.05.00#18378

Merged
ovitrif merged 2 commits intodeps/main-batch-androidx-compose-kotlinfrom
deps/update-androidx-compose-bom-to-2023.05.00
May 8, 2023
Merged

[Dependency Updates] Update androidxComposeBomVersion to 2023.05.00#18378
ovitrif merged 2 commits intodeps/main-batch-androidx-compose-kotlinfrom
deps/update-androidx-compose-bom-to-2023.05.00

Conversation

@ParaskP7
Copy link
Copy Markdown
Contributor

@ParaskP7 ParaskP7 commented May 5, 2023

Parent #17563
Batch Branch: deps/main-batch-androidx-compose-kotlin

This PR updates androidxComposeBomVersion to 2023.05.00.


PS: @ovitrif I added you as the main reviewer, but not so randomly (context), since I just wanted someone from the WordPress team to be aware of and sign-off on that change for WPAndroid. I also added the @wordpress-mobile/apps-infrastructure team, but this in done only for monitoring purposes, as such, I am not expecting any active review from that team. Thus, feel free to merge this PR if you deem so.


Lint Warnings Resolution List:

  1. Resolve composable naming lint warning on loaded state

To test:

  1. See the dependency tree diff result and verify correctness.
  2. Thoroughly smoke test any Compose related screen, on both, the WordPress and Jetpack apps, and see if everything is working as expected.
  3. In addition to the above smoke test, you can expand the below and follow the inner and more explicitly test steps within:
1. Login Screen [LoginPrologueRevampedFragment.kt]

ℹ️ This test applies to both, the WordPress and Jetpack apps.

  • Log out of the app (if already logged-in).
  • Verify that the Login screen is shown and functioning as expected.
2. QR Code Auth Screen [QRCodeAuthFragment.kt]

ℹ️ This test applies to the Jetpack app.
ℹ️ You don't have to follow all 3 steps, just logging in with a non A8C and non 2FA enabled
account, followed by tapping the Scan Login Code item on the Me screen should be enough, which
is effectively just Step.1 and the beginning of Step.3.

Step.1:

  • Build and install the Jetpack app (note that you don't need a release build, a debug build will
    suffice).
  • Login to the Jetpack app with a WP.com account (note that you need to use a non A8C account
    and a non 2FA enabled account).
  • Navigate to the Me screen (click on avatar at top-right).
    (STOP)

Step.2:

  • Head over to your desktop and open a web browser (note that using an incognito tab works best).
  • Browse to wordpress.com (note that if you are logged-in, log-out first).
  • Tap the Log In link (top-right).
  • Tap the Login via the mobile app link in the list of options below the main Continue button
    (bottom-middle).
  • Verify you are on the Login via the mobile app view and Use QR Code to login is shown, along with
    a QR code for you to scan.
  • (STOP)

Step.3:

  • Head back to your mobile.
  • Tap the Scan Login Code item on the Me screen you are currently at.
  • Scan the QR code on the web browser.
  • Follow the remaining prompts on your mobile to login to WordPress on your web browser (desktop),
    verify that you have successfully logged-in and are able to use WordPress as expected.
3a. Jetpack Static Poster Screen [JetpackStaticPosterActivity.kt + JetpackStaticPosterFragment.kt]

ℹ️ This test applies to the WordPress app.

  • Go to My Site tab -> MENU sub-tab.
  • Find the Traffic section in the middle and click on its Stats option.
  • Verify that the Jetpack Static Poster screen is shown and functioning as expected, that is,
    instead of showing the Stats screen (like it is done with the Jetpack app).
3b. Jetpack Static Poster Screen [JetpackStaticPosterFragment.kt]

ℹ️ This test applies to the WordPress app.

  • Go to Reader or Notifications tab.
  • Verify that the Jetpack Static Poster screen is shown and functioning as expected, that is,
    instead of showing the Reader or Notifications screen (like it is done with the Jetpack app).
4a. Jetpack Migration Screen [JetpackMigrationFragment.kt]

ℹ️ This test applies to the Jetpack app.

  • Go to My Site tab -> HOME sub-tab.
  • Find the card on top that prompts the user to uninstall the WordPress app and click on it.
  • Verify that the Jetpack Migration screen is shown and functioning as expected.
4a. Jetpack Migration Flow [JetpackMigrationFragment.kt]

ℹ️ This test applies to the Jetpack app.

  • Install both apps.
  • Clear cache/data of the Jetpack app and restart it.
  • The migration flow should appear, verify that it is shown and functioning as expected.
5. Blaze Screen [BlazeOverlayFragment.kt + BlazeWebViewFragment.kt]

ℹ️ This test applies to the Jetpack app.

  • Go to My Site tab -> MENU sub-tab.
  • Find the Traffic section in the middle and click on its Blaze option.
  • Verify that the Blaze screen is shown and functioning as expected.
6. Blogging Prompts Screen [BloggingPromptsListActivity.kt]

ℹ️ This test applies to the Jetpack app.

  • Go to My Site tab -> HOME sub-tab.
  • Find the Prompts card on top and click on its options (top right).
  • From the options menu, select View more prompts.
  • Verify that the Blogging Prompts screen is shown and functioning as expected.
7. Individual Plugin Screen [WPJetpackIndividualPluginFragment.kt]

ℹ️ This test applies to the WordPress app.
❗️ Apply the provided individual.patch patch to quickly test this screen.

  • Go to My Site tab -> Site Picker (down-arrow).
  • Let individual.patch patch do its magic... 🪄
  • Verify that the Individual Plugin screen is shown and functioning as expected.
8a. Jetpack Full Plugin Install Screen [JetpackFullPluginInstallOnboardingDialogFragment.kt + JetpackFullPluginInstallActivity.kt]

ℹ️ This test applies to the WordPress app.
❗️ Apply the provided full.patch patch to quickly test this screen.

  • Go to My Site tab.
  • Let full.patch patch do its magic... 🪄
  • Verify that the Jetpack Full Plugin Install dialog is shown and functioning as expected.
  • Click on Install the full plugin button.
  • Verify that the Jetpack Full Plugin Install screen is shown and functioning as expected.
8b. Jetpack Install Full Plugin View [JetpackInstallFullPluginCardViewHolder.kt]

ℹ️ This test applies to the Jetpack app.
❗️ Apply the provided card.patch patch to quickly test this screen.

  • Go to Debug Settings and make sure to enable only jetpack_removal_one from all the Jetpack
    removal flags.
  • Go to My Site tab -> HOME sub-tab.
  • Let full.patch patch do its magic... 🪄
  • Find the card in the middle that prompts the user to install the full Jetpack plugin and click on
    Learn more.
  • Verify that the Jetpack Full Plugin Install screen is shown and functioning as expected.
9. Jetpack Remove Install Screen [JetpackRemoteInstallActivity.kt]

ℹ️ This test applies to the Jetpack app.

  • Spin up a self-hosted site via Jurassic Ninja with no Jetpack plugins at all.
    https://fieldguide.automattic.com/jurassic-ninja/
  • Login to the app using the credentials of the new site and then go to Stats.
  • Tap Install Jetpack button.
  • Verify that the Jetpack Remove Install screen is shown and functioning as expected.
10. Site Creation Domain View [SiteCreationDomainViewHolder.kt]
  • Go to Debug Settings and enable the SiteCreationDomainPurchasingFeatureConfig feature flag.
  • Go to Site Picker -> Click the + button -> Chose Create WordPress.com site ->
    Click the SKIP button -> And again, click the SKIP button.
  • Enter any search query in the input (eg. 'awesome').
  • Verify the list of domain suggestions is presented (the item UI is compose)
  • Verify that the Site Creation Domain view and its list is shown and functioning as expected.
11. About App Screen [com.automattic:about]

ℹ️ This test applies to both, the WordPress and Jetpack apps.
❗️ This test makes sure that the About App screen, which comes from the com.automattic:about
library is also working as expected and that any transitive dependency changes aren't affecting
this Compose related screen.

  • Go to My Site tab and navigate to the Me screen (click on avatar at top-right).
  • Tap the About App item on the Me screen you are currently at.
  • Verify that the About App screen is shown and functioning as expected.

Merge instructions


Regression Notes

  1. Potential unintended areas of impact

    • Potential breakage or misbehaviour on any or all Compose related screens, like the Login screen, the Jetpack Migration screens or the Blaze green (to name a few).
  2. What I did to test those areas of impact (or what existing automated tests I relied on)

    • See To test section above.
  3. What automated tests I added (or what prevented me from doing so)

    • N/A

PR submission checklist:

  • I have completed the Regression Notes.
  • I have considered adding accessibility improvements for my changes.
  • I have considered if this change warrants user-facing release notes and have added them to RELEASE-NOTES.txt if necessary.

UI Changes testing checklist:

  • Portrait and landscape orientations.
  • Light and dark modes.
  • Fonts: Larger, smaller and bold text.
  • High contrast.
  • Talkback.
  • Languages with large words or with letters/accents not frequently used in English.
  • Right-to-left languages. (Even if translation isn’t complete, formatting should still respect the right-to-left layout)
  • Large and small screen sizes. (Tablet and smaller phones)
  • Multi-tasking: Split screen and Pop-up view. (Android 10 or higher)

@wpmobilebot
Copy link
Copy Markdown
Contributor

Found 1 violations:

The PR caused the following dependency changes:

 +--- project :libs:analytics
 |    \--- androidx.preference:preference:1.2.0
 |         \--- androidx.appcompat:appcompat:1.1.0 -> 1.6.1
-|              +--- androidx.emoji2:emoji2:1.2.0
-|              |    +--- androidx.annotation:annotation:1.2.0 -> 1.6.0 (*)
-|              |    +--- androidx.collection:collection:1.1.0 -> 1.2.0 (*)
-|              |    +--- androidx.core:core:1.3.0 -> 1.10.0 (*)
-|              |    +--- androidx.lifecycle:lifecycle-process:2.4.1 -> 2.6.1 (*)
-|              |    \--- androidx.startup:startup-runtime:1.0.0 -> 1.1.1 (*)
+|              +--- androidx.emoji2:emoji2:1.2.0 -> 1.3.0
+|              |    +--- androidx.annotation:annotation:1.2.0 -> 1.6.0 (*)
+|              |    +--- androidx.collection:collection:1.1.0 -> 1.2.0 (*)
+|              |    +--- androidx.core:core:1.3.0 -> 1.10.0 (*)
+|              |    +--- androidx.lifecycle:lifecycle-process:2.4.1 -> 2.6.1 (*)
+|              |    +--- androidx.startup:startup-runtime:1.0.0 -> 1.1.1 (*)
+|              |    \--- androidx.emoji2:emoji2-views-helper:1.3.0 (c)
-|              \--- androidx.emoji2:emoji2-views-helper:1.2.0
-|                   +--- androidx.collection:collection:1.1.0 -> 1.2.0 (*)
-|                   +--- androidx.core:core:1.3.0 -> 1.10.0 (*)
-|                   \--- androidx.emoji2:emoji2:1.2.0 (*)
+|              \--- androidx.emoji2:emoji2-views-helper:1.2.0 -> 1.3.0
+|                   +--- androidx.collection:collection:1.1.0 -> 1.2.0 (*)
+|                   +--- androidx.core:core:1.3.0 -> 1.10.0 (*)
+|                   +--- androidx.emoji2:emoji2:1.3.0 (*)
+|                   \--- androidx.emoji2:emoji2:1.3.0 (c)
 +--- com.automattic:about:1.1.0
-|    +--- androidx.compose.ui:ui:1.0.5 -> 1.3.3
-|    |    +--- androidx.activity:activity-ktx:1.5.1 -> 1.7.1 (*)
-|    |    +--- androidx.annotation:annotation:1.5.0 -> 1.6.0 (*)
-|    |    +--- androidx.autofill:autofill:1.0.0
-|    |    |    \--- androidx.core:core:1.1.0 -> 1.10.0 (*)
-|    |    +--- androidx.collection:collection:1.0.0 -> 1.2.0 (*)
-|    |    +--- androidx.compose.runtime:runtime:1.3.3
-|    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
-|    |    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.7.10 -> 1.8.20 (*)
-|    |    |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4 (*)
-|    |    |    \--- io.sentry:sentry-compose-android:6.17.0
-|    |    |         +--- io.sentry:sentry:6.17.0
-|    |    |         +--- io.sentry:sentry-android-navigation:6.17.0
-|    |    |         |    \--- io.sentry:sentry:6.17.0
-|    |    |         \--- androidx.lifecycle:lifecycle-common-java8:2.2.0 -> 2.6.1 (*)
-|    |    +--- androidx.compose.runtime:runtime-saveable:1.3.3
-|    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
-|    |    |    +--- androidx.compose.runtime:runtime:1.3.3 (*)
-|    |    |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.7.10 -> 1.8.20 (*)
-|    |    +--- androidx.compose.ui:ui-geometry:1.3.3
-|    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
-|    |    |    +--- androidx.compose.runtime:runtime:1.1.1 -> 1.3.3 (*)
-|    |    |    +--- androidx.compose.ui:ui-util:1.3.3
-|    |    |    |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.7.10 -> 1.8.20 (*)
-|    |    |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.7.10 -> 1.8.20 (*)
-|    |    +--- androidx.compose.ui:ui-graphics:1.3.3
-|    |    |    +--- androidx.annotation:annotation:1.2.0 -> 1.6.0 (*)
-|    |    |    +--- androidx.compose.runtime:runtime:1.1.1 -> 1.3.3 (*)
-|    |    |    +--- androidx.compose.ui:ui-unit:1.3.3
-|    |    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
-|    |    |    |    +--- androidx.compose.runtime:runtime:1.1.1 -> 1.3.3 (*)
-|    |    |    |    +--- androidx.compose.ui:ui-geometry:1.3.3 (*)
-|    |    |    |    +--- androidx.compose.ui:ui-util:1.3.3 (*)
-|    |    |    |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.7.10 -> 1.8.20 (*)
-|    |    |    +--- androidx.compose.ui:ui-util:1.3.3 (*)
-|    |    |    \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10 -> 1.8.20
-|    |    +--- androidx.compose.ui:ui-text:1.3.3
-|    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
-|    |    |    +--- androidx.collection:collection:1.0.0 -> 1.2.0 (*)
-|    |    |    +--- androidx.compose.runtime:runtime:1.2.0 -> 1.3.3 (*)
-|    |    |    +--- androidx.compose.runtime:runtime-saveable:1.2.0 -> 1.3.3 (*)
-|    |    |    +--- androidx.compose.ui:ui-graphics:1.3.3 (*)
-|    |    |    +--- androidx.compose.ui:ui-unit:1.3.3 (*)
-|    |    |    +--- androidx.compose.ui:ui-util:1.3.3 (*)
-|    |    |    +--- androidx.core:core:1.7.0 -> 1.10.0 (*)
-|    |    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.7.10 -> 1.8.20 (*)
-|    |    |    +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10 -> 1.8.20
-|    |    |    \--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4 (*)
-|    |    +--- androidx.compose.ui:ui-unit:1.3.3 (*)
-|    |    +--- androidx.compose.ui:ui-util:1.3.3 (*)
-|    |    +--- androidx.core:core:1.5.0 -> 1.10.0 (*)
-|    |    +--- androidx.customview:customview-poolingcontainer:1.0.0 (*)
-|    |    +--- androidx.lifecycle:lifecycle-common-java8:2.3.0 -> 2.6.1 (*)
-|    |    +--- androidx.lifecycle:lifecycle-runtime:2.3.0 -> 2.6.1 (*)
-|    |    +--- androidx.lifecycle:lifecycle-viewmodel:2.3.0 -> 2.6.1 (*)
-|    |    +--- androidx.profileinstaller:profileinstaller:1.2.0 -> 1.3.0 (*)
-|    |    +--- androidx.savedstate:savedstate-ktx:1.2.0 -> 1.2.1 (*)
-|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.7.10 -> 1.8.20 (*)
-|    |    +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10 -> 1.8.20
-|    |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4 (*)
-|    |    \--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4 (*)
+|    +--- androidx.compose.ui:ui:1.0.5 -> 1.4.3
+|    |    +--- androidx.activity:activity-ktx:1.7.0 -> 1.7.1 (*)
+|    |    +--- androidx.annotation:annotation:1.5.0 -> 1.6.0 (*)
+|    |    +--- androidx.autofill:autofill:1.0.0
+|    |    |    \--- androidx.core:core:1.1.0 -> 1.10.0 (*)
+|    |    +--- androidx.collection:collection:1.0.0 -> 1.2.0 (*)
+|    |    +--- androidx.compose.runtime:runtime:1.4.3
+|    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
+|    |    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.10 -> 1.8.20 (*)
+|    |    |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4 (*)
+|    |    |    +--- io.sentry:sentry-compose-android:6.17.0
+|    |    |    |    +--- io.sentry:sentry:6.17.0
+|    |    |    |    +--- io.sentry:sentry-android-navigation:6.17.0
+|    |    |    |    |    \--- io.sentry:sentry:6.17.0
+|    |    |    |    \--- androidx.lifecycle:lifecycle-common-java8:2.2.0 -> 2.6.1 (*)
+|    |    |    +--- androidx.compose.runtime:runtime-livedata:1.4.3 (c)
+|    |    |    \--- androidx.compose.runtime:runtime-saveable:1.4.3 (c)
+|    |    +--- androidx.compose.runtime:runtime-saveable:1.4.3
+|    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
+|    |    |    +--- androidx.compose.runtime:runtime:1.4.3 (*)
+|    |    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.10 -> 1.8.20 (*)
+|    |    |    +--- androidx.compose.runtime:runtime:1.4.3 (c)
+|    |    |    \--- androidx.compose.runtime:runtime-livedata:1.4.3 (c)
+|    |    +--- androidx.compose.ui:ui-geometry:1.4.3
+|    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
+|    |    |    +--- androidx.compose.runtime:runtime:1.2.1 -> 1.4.3 (*)
+|    |    |    +--- androidx.compose.ui:ui-util:1.4.3
+|    |    |    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.10 -> 1.8.20 (*)
+|    |    |    |    +--- androidx.compose.ui:ui:1.4.3 (c)
+|    |    |    |    +--- androidx.compose.ui:ui-geometry:1.4.3 (c)
+|    |    |    |    +--- androidx.compose.ui:ui-graphics:1.4.3 (c)
+|    |    |    |    +--- androidx.compose.ui:ui-text:1.4.3 (c)
+|    |    |    |    +--- androidx.compose.ui:ui-tooling:1.4.3 (c)
+|    |    |    |    +--- androidx.compose.ui:ui-tooling-data:1.4.3 (c)
+|    |    |    |    +--- androidx.compose.ui:ui-tooling-preview:1.4.3 (c)
+|    |    |    |    \--- androidx.compose.ui:ui-unit:1.4.3 (c)
+|    |    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.10 -> 1.8.20 (*)
+|    |    |    +--- androidx.compose.ui:ui:1.4.3 (c)
+|    |    |    +--- androidx.compose.ui:ui-graphics:1.4.3 (c)
+|    |    |    +--- androidx.compose.ui:ui-text:1.4.3 (c)
+|    |    |    +--- androidx.compose.ui:ui-tooling:1.4.3 (c)
+|    |    |    +--- androidx.compose.ui:ui-tooling-data:1.4.3 (c)
+|    |    |    +--- androidx.compose.ui:ui-tooling-preview:1.4.3 (c)
+|    |    |    +--- androidx.compose.ui:ui-unit:1.4.3 (c)
+|    |    |    \--- androidx.compose.ui:ui-util:1.4.3 (c)
+|    |    +--- androidx.compose.ui:ui-graphics:1.4.3
+|    |    |    +--- androidx.annotation:annotation:1.2.0 -> 1.6.0 (*)
+|    |    |    +--- androidx.compose.runtime:runtime:1.2.1 -> 1.4.3 (*)
+|    |    |    +--- androidx.compose.ui:ui-unit:1.4.3
+|    |    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
+|    |    |    |    +--- androidx.compose.runtime:runtime:1.2.1 -> 1.4.3 (*)
+|    |    |    |    +--- androidx.compose.ui:ui-geometry:1.4.3 (*)
+|    |    |    |    +--- androidx.compose.ui:ui-util:1.4.3 (*)
+|    |    |    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.10 -> 1.8.20 (*)
+|    |    |    |    +--- androidx.compose.ui:ui:1.4.3 (c)
+|    |    |    |    +--- androidx.compose.ui:ui-geometry:1.4.3 (c)
+|    |    |    |    +--- androidx.compose.ui:ui-graphics:1.4.3 (c)
+|    |    |    |    +--- androidx.compose.ui:ui-text:1.4.3 (c)
+|    |    |    |    +--- androidx.compose.ui:ui-tooling:1.4.3 (c)
+|    |    |    |    +--- androidx.compose.ui:ui-tooling-preview:1.4.3 (c)
+|    |    |    |    +--- androidx.compose.ui:ui-util:1.4.3 (c)
+|    |    |    |    \--- androidx.compose.ui:ui-tooling-data:1.4.3 (c)
+|    |    |    +--- androidx.compose.ui:ui-util:1.4.3 (*)
+|    |    |    +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.8.10 -> 1.8.20
+|    |    |    +--- androidx.compose.ui:ui:1.4.3 (c)
+|    |    |    +--- androidx.compose.ui:ui-geometry:1.4.3 (c)
+|    |    |    +--- androidx.compose.ui:ui-text:1.4.3 (c)
+|    |    |    +--- androidx.compose.ui:ui-tooling:1.4.3 (c)
+|    |    |    +--- androidx.compose.ui:ui-tooling-preview:1.4.3 (c)
+|    |    |    +--- androidx.compose.ui:ui-unit:1.4.3 (c)
+|    |    |    +--- androidx.compose.ui:ui-util:1.4.3 (c)
+|    |    |    \--- androidx.compose.ui:ui-tooling-data:1.4.3 (c)
+|    |    +--- androidx.compose.ui:ui-text:1.4.3
+|    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
+|    |    |    +--- androidx.collection:collection:1.0.0 -> 1.2.0 (*)
+|    |    |    +--- androidx.compose.runtime:runtime:1.2.1 -> 1.4.3 (*)
+|    |    |    +--- androidx.compose.runtime:runtime-saveable:1.2.1 -> 1.4.3 (*)
+|    |    |    +--- androidx.compose.ui:ui-graphics:1.4.3 (*)
+|    |    |    +--- androidx.compose.ui:ui-unit:1.4.3 (*)
+|    |    |    +--- androidx.compose.ui:ui-util:1.4.3 (*)
+|    |    |    +--- androidx.core:core:1.7.0 -> 1.10.0 (*)
+|    |    |    +--- androidx.emoji2:emoji2:1.2.0 -> 1.3.0 (*)
+|    |    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.10 -> 1.8.20 (*)
+|    |    |    +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.8.10 -> 1.8.20
+|    |    |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4 (*)
+|    |    |    +--- androidx.compose.ui:ui:1.4.3 (c)
+|    |    |    +--- androidx.compose.ui:ui-geometry:1.4.3 (c)
+|    |    |    +--- androidx.compose.ui:ui-graphics:1.4.3 (c)
+|    |    |    +--- androidx.compose.ui:ui-tooling:1.4.3 (c)
+|    |    |    +--- androidx.compose.ui:ui-tooling-preview:1.4.3 (c)
+|    |    |    +--- androidx.compose.ui:ui-unit:1.4.3 (c)
+|    |    |    +--- androidx.compose.ui:ui-util:1.4.3 (c)
+|    |    |    \--- androidx.compose.ui:ui-tooling-data:1.4.3 (c)
+|    |    +--- androidx.compose.ui:ui-unit:1.4.3 (*)
+|    |    +--- androidx.compose.ui:ui-util:1.4.3 (*)
+|    |    +--- androidx.core:core:1.9.0 -> 1.10.0 (*)
+|    |    +--- androidx.customview:customview-poolingcontainer:1.0.0 (*)
+|    |    +--- androidx.emoji2:emoji2:1.2.0 -> 1.3.0 (*)
+|    |    +--- androidx.lifecycle:lifecycle-runtime:2.6.1 (*)
+|    |    +--- androidx.lifecycle:lifecycle-viewmodel:2.6.1 (*)
+|    |    +--- androidx.profileinstaller:profileinstaller:1.3.0 (*)
+|    |    +--- androidx.savedstate:savedstate-ktx:1.2.1 (*)
+|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.10 -> 1.8.20 (*)
+|    |    +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.8.10 -> 1.8.20
+|    |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4 (*)
+|    |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4 (*)
+|    |    +--- androidx.compose.ui:ui-geometry:1.4.3 (c)
+|    |    +--- androidx.compose.ui:ui-graphics:1.4.3 (c)
+|    |    +--- androidx.compose.ui:ui-text:1.4.3 (c)
+|    |    +--- androidx.compose.ui:ui-tooling:1.4.3 (c)
+|    |    +--- androidx.compose.ui:ui-tooling-preview:1.4.3 (c)
+|    |    +--- androidx.compose.ui:ui-unit:1.4.3 (c)
+|    |    +--- androidx.compose.ui:ui-util:1.4.3 (c)
+|    |    +--- androidx.compose.foundation:foundation:1.4.3 (c)
+|    |    \--- androidx.compose.ui:ui-tooling-data:1.4.3 (c)
-|    +--- androidx.compose.ui:ui-tooling:1.0.5 -> 1.3.3
-|    |    +--- androidx.activity:activity-compose:1.3.0 -> 1.7.1
-|    |    |    +--- androidx.activity:activity-ktx:1.7.1 (*)
-|    |    |    +--- androidx.compose.runtime:runtime:1.0.1 -> 1.3.3 (*)
-|    |    |    +--- androidx.compose.runtime:runtime-saveable:1.0.1 -> 1.3.3 (*)
-|    |    |    +--- androidx.compose.ui:ui:1.0.1 -> 1.3.3 (*)
-|    |    |    +--- androidx.lifecycle:lifecycle-viewmodel:2.6.1 (*)
-|    |    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.10 -> 1.8.20 (*)
-|    |    |    +--- androidx.activity:activity:1.7.1 (c)
-|    |    |    \--- androidx.activity:activity-ktx:1.7.1 (c)
-|    |    +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
-|    |    +--- androidx.compose.animation:animation:1.3.3
-|    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
-|    |    |    +--- androidx.compose.animation:animation-core:1.3.3
-|    |    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
-|    |    |    |    +--- androidx.compose.runtime:runtime:1.1.1 -> 1.3.3 (*)
-|    |    |    |    +--- androidx.compose.ui:ui:1.2.0 -> 1.3.3 (*)
-|    |    |    |    +--- androidx.compose.ui:ui-unit:1.0.0 -> 1.3.3 (*)
-|    |    |    |    +--- androidx.compose.ui:ui-util:1.0.0 -> 1.3.3 (*)
-|    |    |    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.7.10 -> 1.8.20 (*)
-|    |    |    |    \--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4 (*)
-|    |    |    +--- androidx.compose.foundation:foundation-layout:1.0.0 -> 1.3.1
-|    |    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
-|    |    |    |    +--- androidx.compose.animation:animation-core:1.1.1 -> 1.3.3 (*)
-|    |    |    |    +--- androidx.compose.runtime:runtime:1.2.0 -> 1.3.3 (*)
-|    |    |    |    +--- androidx.compose.ui:ui:1.2.0 -> 1.3.3 (*)
-|    |    |    |    +--- androidx.compose.ui:ui-unit:1.1.1 -> 1.3.3 (*)
-|    |    |    |    +--- androidx.compose.ui:ui-util:1.0.0 -> 1.3.3 (*)
-|    |    |    |    +--- androidx.core:core:1.7.0 -> 1.10.0 (*)
-|    |    |    |    \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10 -> 1.8.20
-|    |    |    +--- androidx.compose.runtime:runtime:1.1.1 -> 1.3.3 (*)
-|    |    |    +--- androidx.compose.ui:ui:1.0.0 -> 1.3.3 (*)
-|    |    |    +--- androidx.compose.ui:ui-geometry:1.0.0 -> 1.3.3 (*)
-|    |    |    +--- androidx.compose.ui:ui-util:1.0.0 -> 1.3.3 (*)
-|    |    |    \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10 -> 1.8.20
-|    |    +--- androidx.compose.material:material:1.0.0 -> 1.3.1
-|    |    |    +--- androidx.compose.animation:animation:1.0.0 -> 1.3.3 (*)
-|    |    |    +--- androidx.compose.animation:animation-core:1.0.0 -> 1.3.3 (*)
-|    |    |    +--- androidx.compose.foundation:foundation:1.2.0 -> 1.3.1
-|    |    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
-|    |    |    |    +--- androidx.compose.animation:animation:1.1.1 -> 1.3.3 (*)
-|    |    |    |    +--- androidx.compose.foundation:foundation-layout:1.3.1 (*)
-|    |    |    |    +--- androidx.compose.runtime:runtime:1.3.1 -> 1.3.3 (*)
-|    |    |    |    +--- androidx.compose.ui:ui:1.3.1 -> 1.3.3 (*)
-|    |    |    |    +--- androidx.compose.ui:ui-graphics:1.1.1 -> 1.3.3 (*)
-|    |    |    |    +--- androidx.compose.ui:ui-text:1.0.0 -> 1.3.3 (*)
-|    |    |    |    +--- androidx.compose.ui:ui-util:1.0.0 -> 1.3.3 (*)
-|    |    |    |    \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10 -> 1.8.20
-|    |    |    +--- androidx.compose.foundation:foundation-layout:1.1.1 -> 1.3.1 (*)
-|    |    |    +--- androidx.compose.material:material-icons-core:1.3.1
-|    |    |    |    +--- androidx.compose.runtime:runtime:1.1.1 -> 1.3.3 (*)
-|    |    |    |    +--- androidx.compose.ui:ui:1.0.0 -> 1.3.3 (*)
-|    |    |    |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.7.10 -> 1.8.20 (*)
-|    |    |    +--- androidx.compose.material:material-ripple:1.3.1
-|    |    |    |    +--- androidx.compose.animation:animation:1.0.0 -> 1.3.3 (*)
-|    |    |    |    +--- androidx.compose.foundation:foundation:1.1.1 -> 1.3.1 (*)
-|    |    |    |    +--- androidx.compose.runtime:runtime:1.1.1 -> 1.3.3 (*)
-|    |    |    |    +--- androidx.compose.ui:ui-util:1.0.0 -> 1.3.3 (*)
-|    |    |    |    \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10 -> 1.8.20
-|    |    |    +--- androidx.compose.runtime:runtime:1.2.0 -> 1.3.3 (*)
-|    |    |    +--- androidx.compose.ui:ui:1.2.0 -> 1.3.3 (*)
-|    |    |    +--- androidx.compose.ui:ui-text:1.2.0 -> 1.3.3 (*)
-|    |    |    +--- androidx.compose.ui:ui-util:1.0.0 -> 1.3.3 (*)
-|    |    |    +--- androidx.lifecycle:lifecycle-runtime:2.3.0 -> 2.6.1 (*)
-|    |    |    +--- androidx.lifecycle:lifecycle-viewmodel:2.3.0 -> 2.6.1 (*)
-|    |    |    +--- androidx.savedstate:savedstate:1.1.0 -> 1.2.1 (*)
-|    |    |    \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10 -> 1.8.20
-|    |    +--- androidx.compose.runtime:runtime:1.1.1 -> 1.3.3 (*)
-|    |    +--- androidx.compose.ui:ui:1.3.3 (*)
-|    |    +--- androidx.compose.ui:ui-tooling-data:1.3.3
-|    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
-|    |    |    +--- androidx.compose.runtime:runtime:1.2.0 -> 1.3.3 (*)
-|    |    |    +--- androidx.compose.ui:ui:1.3.3 (*)
-|    |    |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.7.10 -> 1.8.20 (*)
-|    |    +--- androidx.compose.ui:ui-tooling-preview:1.3.3
-|    |    |    +--- androidx.annotation:annotation:1.2.0 -> 1.6.0 (*)
-|    |    |    +--- androidx.compose.runtime:runtime:1.1.1 -> 1.3.3 (*)
-|    |    |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.7.10 -> 1.8.20 (*)
-|    |    +--- androidx.savedstate:savedstate-ktx:1.2.0 -> 1.2.1 (*)
-|    |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.7.10 -> 1.8.20 (*)
+|    +--- androidx.compose.ui:ui-tooling:1.0.5 -> 1.4.3
+|    |    +--- androidx.activity:activity-compose:1.7.0 -> 1.7.1
+|    |    |    +--- androidx.activity:activity-ktx:1.7.1 (*)
+|    |    |    +--- androidx.compose.runtime:runtime:1.0.1 -> 1.4.3 (*)
+|    |    |    +--- androidx.compose.runtime:runtime-saveable:1.0.1 -> 1.4.3 (*)
+|    |    |    +--- androidx.compose.ui:ui:1.0.1 -> 1.4.3 (*)
+|    |    |    +--- androidx.lifecycle:lifecycle-viewmodel:2.6.1 (*)
+|    |    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.10 -> 1.8.20 (*)
+|    |    |    +--- androidx.activity:activity:1.7.1 (c)
+|    |    |    \--- androidx.activity:activity-ktx:1.7.1 (c)
+|    |    +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
+|    |    +--- androidx.compose.animation:animation:1.4.3
+|    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
+|    |    |    +--- androidx.compose.animation:animation-core:1.4.3
+|    |    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
+|    |    |    |    +--- androidx.compose.runtime:runtime:1.2.1 -> 1.4.3 (*)
+|    |    |    |    +--- androidx.compose.ui:ui:1.2.1 -> 1.4.3 (*)
+|    |    |    |    +--- androidx.compose.ui:ui-unit:1.2.1 -> 1.4.3 (*)
+|    |    |    |    +--- androidx.compose.ui:ui-util:1.2.1 -> 1.4.3 (*)
+|    |    |    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.10 -> 1.8.20 (*)
+|    |    |    |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4 (*)
+|    |    |    |    \--- androidx.compose.animation:animation:1.4.3 (c)
+|    |    |    +--- androidx.compose.foundation:foundation-layout:1.2.1 -> 1.4.3
+|    |    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
+|    |    |    |    +--- androidx.compose.animation:animation-core:1.2.1 -> 1.4.3 (*)
+|    |    |    |    +--- androidx.compose.runtime:runtime:1.2.1 -> 1.4.3 (*)
+|    |    |    |    +--- androidx.compose.ui:ui:1.2.1 -> 1.4.3 (*)
+|    |    |    |    +--- androidx.compose.ui:ui-unit:1.2.1 -> 1.4.3 (*)
+|    |    |    |    +--- androidx.compose.ui:ui-util:1.2.1 -> 1.4.3 (*)
+|    |    |    |    +--- androidx.core:core:1.7.0 -> 1.10.0 (*)
+|    |    |    |    +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.8.10 -> 1.8.20
+|    |    |    |    \--- androidx.compose.foundation:foundation:1.4.3 (c)
+|    |    |    +--- androidx.compose.runtime:runtime:1.2.1 -> 1.4.3 (*)
+|    |    |    +--- androidx.compose.ui:ui:1.2.1 -> 1.4.3 (*)
+|    |    |    +--- androidx.compose.ui:ui-geometry:1.2.1 -> 1.4.3 (*)
+|    |    |    +--- androidx.compose.ui:ui-util:1.2.1 -> 1.4.3 (*)
+|    |    |    +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.8.10 -> 1.8.20
+|    |    |    \--- androidx.compose.animation:animation-core:1.4.3 (c)
+|    |    +--- androidx.compose.material:material:1.0.0 -> 1.4.3
+|    |    |    +--- androidx.compose.animation:animation:1.2.1 -> 1.4.3 (*)
+|    |    |    +--- androidx.compose.animation:animation-core:1.2.1 -> 1.4.3 (*)
+|    |    |    +--- androidx.compose.foundation:foundation:1.4.3
+|    |    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
+|    |    |    |    +--- androidx.compose.animation:animation:1.2.1 -> 1.4.3 (*)
+|    |    |    |    +--- androidx.compose.foundation:foundation-layout:1.4.3 (*)
+|    |    |    |    +--- androidx.compose.runtime:runtime:1.4.3 (*)
+|    |    |    |    +--- androidx.compose.ui:ui:1.4.3 (*)
+|    |    |    |    +--- androidx.compose.ui:ui-graphics:1.2.1 -> 1.4.3 (*)
+|    |    |    |    +--- androidx.compose.ui:ui-text:1.2.1 -> 1.4.3 (*)
+|    |    |    |    +--- androidx.compose.ui:ui-util:1.2.1 -> 1.4.3 (*)
+|    |    |    |    +--- androidx.emoji2:emoji2:1.3.0 (*)
+|    |    |    |    +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.8.10 -> 1.8.20
+|    |    |    |    \--- androidx.compose.foundation:foundation-layout:1.4.3 (c)
+|    |    |    +--- androidx.compose.foundation:foundation-layout:1.2.1 -> 1.4.3 (*)
+|    |    |    +--- androidx.compose.material:material-icons-core:1.4.3
+|    |    |    |    +--- androidx.compose.runtime:runtime:1.2.1 -> 1.4.3 (*)
+|    |    |    |    +--- androidx.compose.ui:ui:1.2.1 -> 1.4.3 (*)
+|    |    |    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.10 -> 1.8.20 (*)
+|    |    |    |    +--- androidx.compose.material:material:1.4.3 (c)
+|    |    |    |    \--- androidx.compose.material:material-ripple:1.4.3 (c)
+|    |    |    +--- androidx.compose.material:material-ripple:1.4.3
+|    |    |    |    +--- androidx.compose.animation:animation:1.2.1 -> 1.4.3 (*)
+|    |    |    |    +--- androidx.compose.foundation:foundation:1.2.1 -> 1.4.3 (*)
+|    |    |    |    +--- androidx.compose.runtime:runtime:1.2.1 -> 1.4.3 (*)
+|    |    |    |    +--- androidx.compose.ui:ui-util:1.2.1 -> 1.4.3 (*)
+|    |    |    |    +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.8.10 -> 1.8.20
+|    |    |    |    +--- androidx.compose.material:material:1.4.3 (c)
+|    |    |    |    \--- androidx.compose.material:material-icons-core:1.4.3 (c)
+|    |    |    +--- androidx.compose.runtime:runtime:1.2.1 -> 1.4.3 (*)
+|    |    |    +--- androidx.compose.ui:ui:1.2.1 -> 1.4.3 (*)
+|    |    |    +--- androidx.compose.ui:ui-text:1.2.1 -> 1.4.3 (*)
+|    |    |    +--- androidx.compose.ui:ui-util:1.2.1 -> 1.4.3 (*)
+|    |    |    +--- androidx.lifecycle:lifecycle-runtime:2.6.1 (*)
+|    |    |    +--- androidx.lifecycle:lifecycle-viewmodel:2.6.1 (*)
+|    |    |    +--- androidx.savedstate:savedstate:1.2.1 (*)
+|    |    |    +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.8.10 -> 1.8.20
+|    |    |    +--- androidx.compose.material:material-icons-core:1.4.3 (c)
+|    |    |    \--- androidx.compose.material:material-ripple:1.4.3 (c)
+|    |    +--- androidx.compose.runtime:runtime:1.2.1 -> 1.4.3 (*)
+|    |    +--- androidx.compose.ui:ui:1.4.3 (*)
+|    |    +--- androidx.compose.ui:ui-tooling-data:1.4.3
+|    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
+|    |    |    +--- androidx.compose.runtime:runtime:1.2.1 -> 1.4.3 (*)
+|    |    |    +--- androidx.compose.ui:ui:1.4.3 (*)
+|    |    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.10 -> 1.8.20 (*)
+|    |    |    +--- androidx.compose.ui:ui:1.4.3 (c)
+|    |    |    +--- androidx.compose.ui:ui-geometry:1.4.3 (c)
+|    |    |    +--- androidx.compose.ui:ui-graphics:1.4.3 (c)
+|    |    |    +--- androidx.compose.ui:ui-text:1.4.3 (c)
+|    |    |    +--- androidx.compose.ui:ui-tooling:1.4.3 (c)
+|    |    |    +--- androidx.compose.ui:ui-tooling-preview:1.4.3 (c)
+|    |    |    +--- androidx.compose.ui:ui-unit:1.4.3 (c)
+|    |    |    \--- androidx.compose.ui:ui-util:1.4.3 (c)
+|    |    +--- androidx.compose.ui:ui-tooling-preview:1.4.3
+|    |    |    +--- androidx.annotation:annotation:1.2.0 -> 1.6.0 (*)
+|    |    |    +--- androidx.compose.runtime:runtime:1.2.1 -> 1.4.3 (*)
+|    |    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.10 -> 1.8.20 (*)
+|    |    |    +--- androidx.compose.ui:ui:1.4.3 (c)
+|    |    |    +--- androidx.compose.ui:ui-geometry:1.4.3 (c)
+|    |    |    +--- androidx.compose.ui:ui-graphics:1.4.3 (c)
+|    |    |    +--- androidx.compose.ui:ui-text:1.4.3 (c)
+|    |    |    +--- androidx.compose.ui:ui-tooling:1.4.3 (c)
+|    |    |    +--- androidx.compose.ui:ui-unit:1.4.3 (c)
+|    |    |    +--- androidx.compose.ui:ui-util:1.4.3 (c)
+|    |    |    \--- androidx.compose.ui:ui-tooling-data:1.4.3 (c)
+|    |    +--- androidx.lifecycle:lifecycle-common:2.6.1 (*)
+|    |    +--- androidx.savedstate:savedstate-ktx:1.2.1 (*)
+|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.10 -> 1.8.20 (*)
+|    |    +--- androidx.compose.ui:ui:1.4.3 (c)
+|    |    +--- androidx.compose.ui:ui-geometry:1.4.3 (c)
+|    |    +--- androidx.compose.ui:ui-graphics:1.4.3 (c)
+|    |    +--- androidx.compose.ui:ui-text:1.4.3 (c)
+|    |    +--- androidx.compose.ui:ui-tooling-data:1.4.3 (c)
+|    |    +--- androidx.compose.ui:ui-tooling-preview:1.4.3 (c)
+|    |    +--- androidx.compose.ui:ui-unit:1.4.3 (c)
+|    |    \--- androidx.compose.ui:ui-util:1.4.3 (c)
-|    +--- androidx.compose.material:material:1.0.5 -> 1.3.1 (*)
+|    +--- androidx.compose.material:material:1.0.5 -> 1.4.3 (*)
 |    +--- androidx.navigation:navigation-compose:2.4.0-beta02
-|    |    +--- androidx.compose.animation:animation:1.0.1 -> 1.3.3 (*)
+|    |    +--- androidx.compose.animation:animation:1.0.1 -> 1.4.3 (*)
-|    |    +--- androidx.compose.runtime:runtime:1.0.1 -> 1.3.3 (*)
+|    |    +--- androidx.compose.runtime:runtime:1.0.1 -> 1.4.3 (*)
-|    |    +--- androidx.compose.runtime:runtime-saveable:1.0.1 -> 1.3.3 (*)
+|    |    +--- androidx.compose.runtime:runtime-saveable:1.0.1 -> 1.4.3 (*)
-|    |    +--- androidx.compose.ui:ui:1.0.1 -> 1.3.3 (*)
+|    |    +--- androidx.compose.ui:ui:1.0.1 -> 1.4.3 (*)
 |    |    +--- androidx.lifecycle:lifecycle-viewmodel-compose:2.4.0-rc01 -> 2.6.1
-|    |    |    +--- androidx.compose.runtime:runtime:1.0.1 -> 1.3.3 (*)
+|    |    |    +--- androidx.compose.runtime:runtime:1.0.1 -> 1.4.3 (*)
-|    |    |    \--- androidx.compose.ui:ui:1.0.1 -> 1.3.3 (*)
+|    |    |    \--- androidx.compose.ui:ui:1.0.1 -> 1.4.3 (*)
-|    |    \--- androidx.compose.foundation:foundation-layout:1.0.1 -> 1.3.1 (*)
+|    |    \--- androidx.compose.foundation:foundation-layout:1.0.1 -> 1.4.3 (*)
-|    +--- androidx.compose.animation:animation:1.1.0-beta02 -> 1.3.3 (*)
+|    +--- androidx.compose.animation:animation:1.1.0-beta02 -> 1.4.3 (*)
 |    +--- com.google.accompanist:accompanist-drawablepainter:0.20.2 -> 0.25.1
-|    |    \--- androidx.compose.ui:ui:1.2.1 -> 1.3.3 (*)
+|    |    \--- androidx.compose.ui:ui:1.2.1 -> 1.4.3 (*)
 |    \--- com.google.android.material:compose-theme-adapter:1.1.1
-|         +--- androidx.compose.runtime:runtime:1.1.0-beta04 -> 1.3.3 (*)
+|         +--- androidx.compose.runtime:runtime:1.1.0-beta04 -> 1.4.3 (*)
-|         \--- androidx.compose.material:material:1.1.0-beta04 -> 1.3.1 (*)
+|         \--- androidx.compose.material:material:1.1.0-beta04 -> 1.4.3 (*)
-+--- androidx.compose:compose-bom:2023.01.00
-|    +--- androidx.compose.foundation:foundation:1.3.1 (c)
-|    +--- androidx.compose.foundation:foundation-layout:1.3.1 (c)
-|    +--- androidx.compose.material:material:1.3.1 (c)
-|    +--- androidx.compose.runtime:runtime:1.3.3 (c)
-|    +--- androidx.compose.runtime:runtime-livedata:1.3.3 (c)
-|    +--- androidx.compose.ui:ui:1.3.3 (c)
-|    +--- androidx.compose.ui:ui-graphics:1.3.3 (c)
-|    +--- androidx.compose.ui:ui-text:1.3.3 (c)
-|    +--- androidx.compose.ui:ui-tooling-preview:1.3.3 (c)
-|    +--- androidx.compose.ui:ui-unit:1.3.3 (c)
-|    +--- androidx.compose.ui:ui-tooling:1.3.3 (c)
-|    +--- androidx.compose.animation:animation:1.3.3 (c)
-|    +--- androidx.compose.ui:ui-util:1.3.3 (c)
-|    +--- androidx.compose.animation:animation-core:1.3.3 (c)
-|    +--- androidx.compose.material:material-icons-core:1.3.1 (c)
-|    +--- androidx.compose.material:material-ripple:1.3.1 (c)
-|    +--- androidx.compose.runtime:runtime-saveable:1.3.3 (c)
-|    +--- androidx.compose.ui:ui-geometry:1.3.3 (c)
-|    \--- androidx.compose.ui:ui-tooling-data:1.3.3 (c)
++--- androidx.compose:compose-bom:2023.05.00
+|    +--- androidx.compose.foundation:foundation:1.4.3 (c)
+|    +--- androidx.compose.foundation:foundation-layout:1.4.3 (c)
+|    +--- androidx.compose.material:material:1.4.3 (c)
+|    +--- androidx.compose.runtime:runtime:1.4.3 (c)
+|    +--- androidx.compose.runtime:runtime-livedata:1.4.3 (c)
+|    +--- androidx.compose.ui:ui:1.4.3 (c)
+|    +--- androidx.compose.ui:ui-graphics:1.4.3 (c)
+|    +--- androidx.compose.ui:ui-text:1.4.3 (c)
+|    +--- androidx.compose.ui:ui-tooling-preview:1.4.3 (c)
+|    +--- androidx.compose.ui:ui-unit:1.4.3 (c)
+|    +--- androidx.compose.ui:ui-tooling:1.4.3 (c)
+|    +--- androidx.compose.animation:animation:1.4.3 (c)
+|    +--- androidx.compose.ui:ui-util:1.4.3 (c)
+|    +--- androidx.compose.animation:animation-core:1.4.3 (c)
+|    +--- androidx.compose.material:material-icons-core:1.4.3 (c)
+|    +--- androidx.compose.material:material-ripple:1.4.3 (c)
+|    +--- androidx.compose.runtime:runtime-saveable:1.4.3 (c)
+|    +--- androidx.compose.ui:ui-geometry:1.4.3 (c)
+|    \--- androidx.compose.ui:ui-tooling-data:1.4.3 (c)
-+--- androidx.compose.runtime:runtime -> 1.3.3 (*)
++--- androidx.compose.runtime:runtime -> 1.4.3 (*)
-+--- androidx.compose.runtime:runtime-livedata -> 1.3.3
-|    +--- androidx.compose.runtime:runtime:1.3.3 (*)
-|    +--- androidx.compose.ui:ui:1.0.0 -> 1.3.3 (*)
-|    +--- androidx.lifecycle:lifecycle-livedata:2.2.0 -> 2.6.1 (*)
-|    \--- org.jetbrains.kotlin:kotlin-stdlib:1.7.10 -> 1.8.20 (*)
++--- androidx.compose.runtime:runtime-livedata -> 1.4.3
+|    +--- androidx.compose.runtime:runtime:1.4.3 (*)
+|    +--- androidx.compose.ui:ui:1.2.1 -> 1.4.3 (*)
+|    +--- androidx.lifecycle:lifecycle-livedata:2.6.1 (*)
+|    +--- androidx.lifecycle:lifecycle-runtime:2.6.1 (*)
+|    +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.10 -> 1.8.20 (*)
+|    +--- androidx.compose.runtime:runtime:1.4.3 (c)
+|    \--- androidx.compose.runtime:runtime-saveable:1.4.3 (c)
-+--- androidx.compose.foundation:foundation -> 1.3.1 (*)
++--- androidx.compose.foundation:foundation -> 1.4.3 (*)
-+--- androidx.compose.foundation:foundation-layout -> 1.3.1 (*)
++--- androidx.compose.foundation:foundation-layout -> 1.4.3 (*)
-+--- androidx.compose.ui:ui -> 1.3.3 (*)
++--- androidx.compose.ui:ui -> 1.4.3 (*)
-+--- androidx.compose.ui:ui-graphics -> 1.3.3 (*)
++--- androidx.compose.ui:ui-graphics -> 1.4.3 (*)
-+--- androidx.compose.ui:ui-text -> 1.3.3 (*)
++--- androidx.compose.ui:ui-text -> 1.4.3 (*)
-+--- androidx.compose.ui:ui-unit -> 1.3.3 (*)
++--- androidx.compose.ui:ui-unit -> 1.4.3 (*)
-+--- androidx.compose.ui:ui-tooling-preview -> 1.3.3 (*)
++--- androidx.compose.ui:ui-tooling-preview -> 1.4.3 (*)
-+--- androidx.compose.material:material -> 1.3.1 (*)
++--- androidx.compose.material:material -> 1.4.3 (*)
 +--- androidx.constraintlayout:constraintlayout-compose:1.0.1
-|    +--- androidx.compose.ui:ui:1.0.0 -> 1.3.3 (*)
+|    +--- androidx.compose.ui:ui:1.0.0 -> 1.4.3 (*)
-|    +--- androidx.compose.ui:ui-unit:1.0.0 -> 1.3.3 (*)
+|    +--- androidx.compose.ui:ui-unit:1.0.0 -> 1.4.3 (*)
-|    +--- androidx.compose.ui:ui-util:1.0.0 -> 1.3.3 (*)
+|    +--- androidx.compose.ui:ui-util:1.0.0 -> 1.4.3 (*)
-|    +--- androidx.compose.foundation:foundation-layout:1.0.0 -> 1.3.1 (*)
+|    +--- androidx.compose.foundation:foundation-layout:1.0.0 -> 1.4.3 (*)
-|    +--- androidx.compose.foundation:foundation:1.0.0 -> 1.3.1 (*)
+|    +--- androidx.compose.foundation:foundation:1.0.0 -> 1.4.3 (*)
-|    \--- androidx.compose.material:material:1.0.0 -> 1.3.1 (*)
+|    \--- androidx.compose.material:material:1.0.0 -> 1.4.3 (*)
 +--- io.coil-kt:coil-compose:2.2.2
 |    \--- io.coil-kt:coil-compose-base:2.2.2
-|         \--- androidx.compose.foundation:foundation:1.2.1 -> 1.3.1 (*)
+|         \--- androidx.compose.foundation:foundation:1.2.1 -> 1.4.3 (*)
 \--- com.airbnb.android:lottie-compose:5.2.0
-     +--- androidx.compose.foundation:foundation:1.1.1 -> 1.3.1 (*)
+     +--- androidx.compose.foundation:foundation:1.1.1 -> 1.4.3 (*)
-     \--- androidx.compose.ui:ui:1.1.1 -> 1.3.3 (*)
+     \--- androidx.compose.ui:ui:1.1.1 -> 1.4.3 (*)

Please review and act accordingly

@wpmobilebot
Copy link
Copy Markdown
Contributor

wpmobilebot commented May 5, 2023

WordPress📲 You can test the changes from this Pull Request in WordPress by scanning the QR code below to install the corresponding build.
App NameWordPress WordPress
FlavorJalapeno
Build TypeDebug
Versionpr18378-25aa21a
Commit25aa21a
Direct Downloadwordpress-prototype-build-pr18378-25aa21a.apk
Note: Google Login is not supported on these builds.

@wpmobilebot
Copy link
Copy Markdown
Contributor

wpmobilebot commented May 5, 2023

Jetpack📲 You can test the changes from this Pull Request in Jetpack by scanning the QR code below to install the corresponding build.
App NameJetpack Jetpack
FlavorJalapeno
Build TypeDebug
Versionpr18378-25aa21a
Commit25aa21a
Direct Downloadjetpack-prototype-build-pr18378-25aa21a.apk
Note: Google Login is not supported on these builds.

@ParaskP7 ParaskP7 changed the title [Dependency Updates] Add and Update androidxComposeBomVersion to 2023.05.00 [Dependency Updates] Update androidxComposeBomVersion to 2023.05.00 May 5, 2023
Base automatically changed from deps/main-batch-androidx-core-v2 to deps/main-batch-androidx-compose-kotlin May 8, 2023 07:59
ParaskP7 added 2 commits May 8, 2023 11:09
Release Notes: https://developer.android.com/jetpack/
androidx/releases/compose#2023.05.00
BOM Mapping: https://developer.android.com/jetpack/
compose/bom/bom-mapping

------------------------------------------------------------------------

Jetpack Compose - Android Studio
- androidx.compose.ui:ui-test-manifest          -> 1.4.3
- androidx.compose.ui:ui-tooling                -> 1.4.3

Jetpack Compose - Main
- androidx.compose.runtime:runtime              -> 1.4.3
- androidx.compose.runtime:runtime-livedata     -> 1.4.3
- androidx.compose.foundation:foundation        -> 1.4.3
- androidx.compose.foundation:foundation-layout -> 1.4.3
- androidx.compose.ui:ui                        -> 1.4.3
- androidx.compose.ui:ui-graphics               -> 1.4.3
- androidx.compose.ui:ui-text                   -> 1.4.3
- androidx.compose.ui:ui-unit                   -> 1.4.3
- androidx.compose.ui:ui-tooling-preview        -> 1.4.3
- androidx.compose.material:material            -> 1.4.3

Jetpack Compose - UI Tests
- androidx.compose.ui:ui-test-junit4            -> 1.4.3

------------------------------------------------------------------------

- Foundation Release Notes: https://developer.android.com/jetpack/
androidx/releases/compose-foundation
- Material Release Notes: https://developer.android.com/jetpack/
androidx/releases/compose-material
- Runtime Release Notes: https://developer.android.com/jetpack/
androidx/releases/compose-runtime
- UI Release Notes: https://developer.android.com/jetpack/
androidx/releases/compose-ui
Warning Message: "Composable functions with a return type should start
with a lowercase letter"

Explanation: "@composable functions without a return type should use
similar naming to classes, starting with an uppercase letter and ending
with a noun. @composable functions with a return type should be treated
as normal Kotlin functions, starting with a lowercase letter."

------------------------------------------------------------------------

Renaming the 'LoadedState(...)' composable function, that has a return
type, to the lowercase letter 'loadedState(...)' fixes this warning.
@ParaskP7 ParaskP7 force-pushed the deps/update-androidx-compose-bom-to-2023.05.00 branch from 5c36fb4 to 25aa21a Compare May 8, 2023 08:09
Copy link
Copy Markdown
Contributor

@ovitrif ovitrif left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @ParaskP7 for progressing with this PR 🥇

Works as expected and LGTM 🚀

Ps. Thanks for fixing the method naming, I still have a few to fix, my own awesome creations :trollface:

Copy link
Copy Markdown
Contributor

@ovitrif ovitrif left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @ParaskP7 for progressing with this PR 🥇

Works as expected and LGTM 🚀

Ps. Thanks for fixing the method naming, I still have a few to fix, my own awesome creations :trollface:

@ovitrif ovitrif merged commit 1ffcff7 into deps/main-batch-androidx-compose-kotlin May 8, 2023
@ovitrif ovitrif deleted the deps/update-androidx-compose-bom-to-2023.05.00 branch May 8, 2023 09:58
@ParaskP7
Copy link
Copy Markdown
Contributor Author

ParaskP7 commented May 8, 2023

Coolio, thanks for the review, testing and merging this @ovitrif ! 🙇 ❤️ 🚀

Ps. Thanks for fixing the method naming, I still have a few to fix, my own awesome creations :trollface:

:trollface:


PS: I am not sure if you noticed, but the Connected Tests seem to be consistently failing on this and this other PR. I have been trying to figure out why for a couple of hours now, but with not much success so far.

The UI tests that have been failing seems to be the below:

  • LoginTests.e2eLoginWithSiteAddress()
  • LoginTests.e2eLoginWithMagicLink()
  • LoginTests.e2eLoginWithSelfHostedAccount()

I added the "seems to be" keywords, along with the "consistently", as I am still not to 100% sure that those failures are not due to flakiness with those UI tests, or something else, which is causing that.

Thus, I am shamelessly pinging @pachlava here in case he can helps us figure this out, maybe via this parent PR, which should now start failing on Connected Tests as well. It is better we figure those failures out before we merge that parent PR to trunk.

FYI: I also noticed this UI tests related PR that was created and merged last week, maybe this is somewhat connected, maybe not, but wanted to mention that here, just in case...

UPDATE: I also noticed this other in-progress UI tests related PR, maybe it is somehow related as well...

🤷 🤔 🙏

@ovitrif
Copy link
Copy Markdown
Contributor

ovitrif commented May 8, 2023

PS: I am not sure if you noticed, but the Connected Tests seem to be consistently failing on this and this other PR. I have been trying to figure out why for a couple of hours now, but with not much success so far.

The UI tests that have been failing seems to be the below:

  • LoginTests.e2eLoginWithSiteAddress()
  • LoginTests.e2eLoginWithMagicLink()
  • LoginTests.e2eLoginWithSelfHostedAccount()

I added the "seems to be" keywords, along with the "consistently", as I am still not to 100% sure that those failures are not due to flakiness with those UI tests, or something else, which is causing that.

Thus, I am shamelessly pinging @pachlava here in case he can helps us figure this out, maybe via this parent PR, which should now start failing on Connected Tests as well. It is better we figure those failures out before we merge that parent PR to trunk.

Hopefully @pachlava will have time to look at the failing tests soon. I did notice them but I think as long as we're not merging to trunk they shouldn't be a blocker for the smaller PRs to the 'feature' branch 😃

@pachlava
Copy link
Copy Markdown
Contributor

pachlava commented May 8, 2023

@ovitrif @ParaskP7 I'm taking a look into the failing tests in #18364 now. Thank you for pinging me.

@ParaskP7
Copy link
Copy Markdown
Contributor Author

ParaskP7 commented May 8, 2023

@ovitrif @ParaskP7 I'm taking a look into the failing tests in #18364 now. Thank you for pinging me.

Thank you so much @pachlava ! 🙇 🙏 🙇

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants