[Dependency Updates] Update zendeskVersion to 5.1.1
#18090
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
It is generally recommended that transitively used dependencies should be declared directly. ------------------------------------------------------------------------ Actually, updating 'Zendesk', which was the dependency that was providing this transitively used 'Retrofit' dependency to the project, was causing a compilation failure. This is due to the fact that the [TenorGifClient] is directly using this dependency, but could no longer resolve it. PS: This is (most probably) due to the fact that this 'Retrofit' dependency was no longer available on newer 'Zendesk' versions.
It is generally recommended that transitively used dependencies should be declared directly. ------------------------------------------------------------------------ Actually, updating 'Zendesk', which was the dependency that was providing this transitively used 'Flexbox' dependency to the project, was causing a compilation failure. This is due to the fact that the [BloggingPromptsOnboardingDialogFragment], [BloggingPromptCardViewHolder] and [WPEditTextWithChipsOutlined] classes are directly using this dependency, but could no longer resolve it. PS: This is (most probably) due to the fact that this 'Flexbox' dependency was no longer available on newer 'Zendesk' versions.
Release Notes: https://developer.zendesk.com/documentation/ classic-web-widget-sdks/support-sdk/android/release_notes/#511
This 'exclude' related configuration was added due to 'Jetifier' related requirements (076817a). However, and as part of 'Zendesk' version '5.0.9', an migration to AndroidX occurred, which refactored the internal Suas library that was adding this 'support-annotations' dependency, but no longer does. As such, this 'exclude' related configuration is no longer necessary and can be safely removed. Zendesk 5.0.9: https://developer.zendesk.com/documentation/ classic-web-widget-sdks/support-sdk/android/release_notes/#509
This 'exclude' related configuration was added back in Jun 13, 2018 while migrating 'Zendesk' to v2 of 'Zendesk' SDK, or else replacing 'Helpshift' with 'Zendesk' (a13b646). Back then, it was probably necessary to exclude 'Dagger' to have the project compile (due to duplicate classpath error or otherwise). However, it seems that it is no longer necessary to have such a configuration where 'Dagger' is excluded. As such, this change is reverted. As long as the project compiles and 'Zendesk' works as expected, this change can be consider safe.
There is no need to have such a verbose 'group', 'name' and 'version' dependency configuration. Also, no other dependency is using this pattern and it is better to have them all consistent with each other.
3 tasks
|
Found 1 violations: The PR caused the following dependency changes: +--- project :libs:analytics
| \--- com.automattic:Automattic-Tracks-Android:2.2.0
| \--- io.sentry:sentry-android -> 5.4.3
| \--- io.sentry:sentry-android-core:5.4.3
| \--- io.sentry:sentry:5.4.3
-| \--- com.google.code.gson:gson:2.8.5
+| \--- com.google.code.gson:gson:2.8.5 -> 2.8.9
+--- project :libs:editor
-| \--- com.google.code.gson:gson:2.6.2 -> 2.8.5
+| \--- com.google.code.gson:gson:2.6.2 -> 2.8.9
+--- org.wordpress:fluxc:{strictly 2.17.0} -> 2.17.0
-| \--- com.google.code.gson:gson:2.8.5
+| \--- com.google.code.gson:gson:2.8.5 -> 2.8.9
-+--- com.google.code.gson:gson:2.6.2 -> 2.8.5
++--- com.google.code.gson:gson:2.6.2 -> 2.8.9
++--- com.google.android.flexbox:flexbox:3.0.0
+| \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 -> 1.6.21 (*)
++--- com.squareup.retrofit2:retrofit:2.9.0
+| \--- com.squareup.okhttp3:okhttp:3.14.9 -> 4.9.2 (*)
-\--- com.zendesk:support:5.0.2
- +--- com.zendesk:support-providers:5.0.2
- | +--- com.zendesk:core:4.0.2
- | | +--- com.zendesk:java-common:1.14
- | | +--- com.squareup.retrofit2:retrofit:2.3.0
- | | | \--- com.squareup.okhttp3:okhttp:3.8.0 -> 4.9.2 (*)
- | | +--- com.squareup.retrofit2:converter-gson:2.3.0
- | | | +--- com.squareup.retrofit2:retrofit:2.3.0 (*)
- | | | \--- com.google.code.gson:gson:2.7 -> 2.8.5
- | | +--- com.squareup.okhttp3:logging-interceptor:3.12.1 -> 4.9.2
- | | | +--- com.squareup.okhttp3:okhttp:4.9.2 (*)
- | | | \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.10 -> 1.6.21 (*)
- | | +--- com.squareup.okhttp3:okhttp:3.12.1 -> 4.9.2 (*)
- | | +--- androidx.annotation:annotation:1.0.0 -> 1.3.0
- | | \--- com.jakewharton:disklrucache:2.0.2
- | +--- com.zendesk:guide-providers:1.0.1
- | | +--- com.zendesk:core:4.0.0 -> 4.0.2 (*)
- | | +--- androidx.annotation:annotation:1.0.0 -> 1.3.0
- | | +--- com.squareup.retrofit2:retrofit:2.3.0 (*)
- | | \--- com.google.code.gson:gson:2.8.2 -> 2.8.5
- | +--- androidx.annotation:annotation:1.0.0 -> 1.3.0
- | +--- com.squareup.retrofit2:retrofit:2.3.0 (*)
- | \--- com.google.code.gson:gson:2.8.2 -> 2.8.5
- +--- com.zendesk:guide:1.0.1
- | +--- com.zendesk:guide-providers:1.0.1 (*)
- | +--- com.zendesk:sdk-configurations:2.0.0
- | | +--- com.zendesk:java-common:1.14
- | | \--- androidx.annotation:annotation:1.0.0 -> 1.3.0
- | +--- com.zendesk:messaging-api:5.0.1
- | | +--- com.zendesk:sdk-configurations:2.0.0 (*)
- | | +--- com.zendesk:java-common:1.14
- | | \--- androidx.annotation:annotation:1.0.0 -> 1.3.0
- | +--- com.zendesk:messaging:5.1.0
- | | +--- com.zendesk:messaging-api:5.0.1 (*)
- | | +--- com.zendesk:common-ui:4.0.1
- | | | +--- com.zendesk:java-common:1.14
- | | | +--- com.zendesk.belvedere2:belvedere:3.0.0-RC
- | | | | +--- com.zendesk.belvedere2:belvedere-core:3.0.0-RC
- | | | | | +--- androidx.annotation:annotation:1.1.0 -> 1.3.0
- | | | | | +--- androidx.core:core:1.3.1 -> 1.8.0 (*)
- | | | | | \--- androidx.fragment:fragment:1.2.5 -> 1.5.5 (*)
- | | | | +--- androidx.annotation:annotation:1.1.0 -> 1.3.0
- | | | | +--- androidx.core:core:1.3.1 -> 1.8.0 (*)
- | | | | +--- androidx.fragment:fragment:1.2.5 -> 1.5.5 (*)
- | | | | +--- com.google.android.material:material:1.2.0 -> 1.6.0-alpha01 (*)
- | | | | \--- com.squareup.picasso:picasso:2.8
- | | | | +--- com.squareup.okhttp3:okhttp:3.10.0 -> 4.9.2 (*)
- | | | | +--- androidx.annotation:annotation:1.0.0 -> 1.3.0
- | | | | \--- androidx.exifinterface:exifinterface:1.0.0 -> 1.3.3 (*)
- | | | +--- androidx.appcompat:appcompat:1.0.0 -> 1.4.2 (*)
- | | | +--- com.google.android.material:material:1.0.0 -> 1.6.0-alpha01 (*)
- | | | +--- androidx.cardview:cardview:1.0.0 (*)
- | | | \--- com.squareup.picasso:picasso:2.8 (*)
- | | +--- com.zendesk.belvedere2:belvedere:3.0.0-RC (*)
- | | +--- androidx.appcompat:appcompat:1.0.0 -> 1.4.2 (*)
- | | +--- com.google.android.material:material:1.0.0 -> 1.6.0-alpha01 (*)
- | | +--- com.google.android:flexbox:2.0.1
- | | \--- com.squareup.picasso:picasso:2.8 (*)
- | +--- androidx.legacy:legacy-support-v4:1.0.0 (*)
- | +--- androidx.appcompat:appcompat -> 1.4.2 (*)
- | +--- androidx.recyclerview:recyclerview -> 1.2.1 (*)
- | +--- com.google.android.material:material:1.0.0 -> 1.6.0-alpha01 (*)
- | +--- androidx.cardview:cardview:1.0.0 (*)
- | +--- com.squareup.okhttp3:okhttp:3.12.1 -> 4.9.2 (*)
- | \--- com.google.code.gson:gson:2.8.2 -> 2.8.5
- +--- com.zendesk:sdk-configurations:2.0.0 (*)
- +--- com.zendesk:messaging-api:5.0.1 (*)
- +--- com.zendesk:messaging:5.1.0 (*)
- +--- androidx.legacy:legacy-support-v4:1.0.0 (*)
- +--- androidx.appcompat:appcompat:1.0.0 -> 1.4.2 (*)
- +--- androidx.recyclerview:recyclerview -> 1.2.1 (*)
- +--- com.google.android.material:material:1.0.0 -> 1.6.0-alpha01 (*)
- +--- androidx.cardview:cardview -> 1.0.0 (*)
- +--- com.jakewharton:disklrucache:2.0.2
- +--- com.squareup.picasso:picasso:2.8 (*)
- +--- com.zendesk.belvedere2:belvedere:3.0.0-RC (*)
- +--- com.zendesk.suas:suas:1.2.0
- \--- com.google.code.gson:gson:2.8.2 -> 2.8.5
+\--- com.zendesk:support:5.1.1
+ +--- com.zendesk:support-providers:5.1.1
+ | +--- com.zendesk:core:4.0.9
+ | | +--- com.zendesk:java-common:2.0.0
+ | | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 -> 1.6.21 (*)
+ | | +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.10 -> 1.6.21 (*)
+ | | +--- com.google.dagger:dagger:2.42 (*)
+ | | +--- com.squareup.retrofit2:retrofit:2.9.0 (*)
+ | | +--- com.squareup.retrofit2:converter-gson:2.9.0
+ | | | +--- com.squareup.retrofit2:retrofit:2.9.0 (*)
+ | | | \--- com.google.code.gson:gson:2.8.5 -> 2.8.9
+ | | +--- com.squareup.okhttp3:logging-interceptor:4.9.2
+ | | | +--- com.squareup.okhttp3:okhttp:4.9.2 (*)
+ | | | \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.10 -> 1.6.21 (*)
+ | | +--- com.squareup.okhttp3:okhttp:4.9.2 (*)
+ | | +--- androidx.annotation:annotation:1.3.0
+ | | \--- com.jakewharton:disklrucache:2.0.2
+ | +--- com.zendesk:guide-providers:1.0.9
+ | | +--- com.zendesk:core:4.0.8 -> 4.0.9 (*)
+ | | +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.10 -> 1.6.21 (*)
+ | | +--- com.google.dagger:dagger:2.42 (*)
+ | | +--- androidx.annotation:annotation:1.3.0
+ | | +--- com.squareup.retrofit2:retrofit:2.9.0 (*)
+ | | \--- com.google.code.gson:gson:2.8.9
+ | +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.10 -> 1.6.21 (*)
+ | +--- com.google.dagger:dagger:2.42 (*)
+ | +--- androidx.annotation:annotation:1.3.0
+ | +--- com.squareup.retrofit2:retrofit:2.9.0 (*)
+ | \--- com.google.code.gson:gson:2.8.9
+ +--- com.zendesk:guide:1.0.9
+ | +--- com.zendesk:guide-providers:1.0.9 (*)
+ | +--- com.zendesk:sdk-configurations:2.0.3
+ | | +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.10 -> 1.6.21 (*)
+ | | +--- com.zendesk:java-common:2.0.0 (*)
+ | | \--- androidx.annotation:annotation:1.3.0
+ | +--- com.zendesk:messaging-api:5.2.5
+ | | +--- com.zendesk:sdk-configurations:2.0.3 (*)
+ | | +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.10 -> 1.6.21 (*)
+ | | +--- com.zendesk:java-common:2.0.0 (*)
+ | | \--- androidx.annotation:annotation:1.3.0
+ | +--- com.zendesk:messaging:5.2.5
+ | | +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.10 -> 1.6.21 (*)
+ | | +--- com.zendesk:messaging-api:5.2.5 (*)
+ | | +--- com.zendesk:common-ui:4.0.5
+ | | | +--- com.zendesk:java-common:2.0.0 (*)
+ | | | +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.10 -> 1.6.21 (*)
+ | | | +--- com.zendesk.belvedere2:belvedere:3.0.5
+ | | | | +--- com.zendesk.belvedere2:belvedere-core:3.0.5
+ | | | | | +--- androidx.annotation:annotation:1.1.0 -> 1.3.0
+ | | | | | +--- androidx.core:core:1.3.1 -> 1.8.0 (*)
+ | | | | | \--- androidx.fragment:fragment:1.2.5 -> 1.5.5 (*)
+ | | | | +--- androidx.annotation:annotation:1.1.0 -> 1.3.0
+ | | | | +--- androidx.core:core:1.3.1 -> 1.8.0 (*)
+ | | | | +--- androidx.fragment:fragment:1.2.5 -> 1.5.5 (*)
+ | | | | +--- com.google.android.material:material:1.2.0 -> 1.6.0-alpha01 (*)
+ | | | | \--- com.squareup.picasso:picasso:2.8
+ | | | | +--- com.squareup.okhttp3:okhttp:3.10.0 -> 4.9.2 (*)
+ | | | | +--- androidx.annotation:annotation:1.0.0 -> 1.3.0
+ | | | | \--- androidx.exifinterface:exifinterface:1.0.0 -> 1.3.3 (*)
+ | | | +--- androidx.appcompat:appcompat:1.0.0 -> 1.4.2 (*)
+ | | | +--- com.google.android.material:material:1.4.0 -> 1.6.0-alpha01 (*)
+ | | | +--- androidx.cardview:cardview:1.0.0 (*)
+ | | | \--- com.squareup.picasso:picasso:2.8 (*)
+ | | +--- com.google.dagger:dagger:2.42 (*)
+ | | +--- com.zendesk.belvedere2:belvedere:3.0.5 (*)
+ | | +--- androidx.appcompat:appcompat:1.0.0 -> 1.4.2 (*)
+ | | +--- com.google.android.material:material:1.4.0 -> 1.6.0-alpha01 (*)
+ | | +--- com.google.android.flexbox:flexbox:3.0.0 (*)
+ | | \--- com.squareup.picasso:picasso:2.8 (*)
+ | +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.10 -> 1.6.21 (*)
+ | +--- com.google.dagger:dagger-android:2.42 (*)
+ | +--- androidx.legacy:legacy-support-v4:1.0.0 (*)
+ | +--- androidx.appcompat:appcompat -> 1.4.2 (*)
+ | +--- androidx.recyclerview:recyclerview -> 1.2.1 (*)
+ | +--- com.google.android.material:material:1.4.0 -> 1.6.0-alpha01 (*)
+ | +--- androidx.cardview:cardview:1.0.0 (*)
+ | +--- com.squareup.okhttp3:okhttp:4.9.2 (*)
+ | \--- com.google.code.gson:gson:2.8.9
+ +--- com.zendesk:sdk-configurations:2.0.3 (*)
+ +--- com.zendesk:messaging-api:5.2.5 (*)
+ +--- com.zendesk:messaging:5.2.5 (*)
+ +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.10 -> 1.6.21 (*)
+ +--- com.google.dagger:dagger-android:2.42 (*)
+ +--- androidx.multidex:multidex:2.0.0
+ +--- androidx.legacy:legacy-support-v4:1.0.0 (*)
+ +--- androidx.appcompat:appcompat:1.0.0 -> 1.4.2 (*)
+ +--- androidx.recyclerview:recyclerview -> 1.2.1 (*)
+ +--- com.google.android.material:material:1.4.0 -> 1.6.0-alpha01 (*)
+ +--- androidx.cardview:cardview -> 1.0.0 (*)
+ +--- com.jakewharton:disklrucache:2.0.2
+ +--- com.squareup.picasso:picasso:2.8 (*)
+ +--- com.zendesk.belvedere2:belvedere:3.0.5 (*)
+ \--- com.google.code.gson:gson:2.8.9
Please review and act accordingly
|
|
 |
App Name |  WordPress |
| Flavor | Jalapeno | |
| Build Type | Debug | |
| Version | pr18090-57a705b | |
| Commit | 57a705b | |
| Direct Download | wordpress-prototype-build-pr18090-57a705b.apk |
|
 |
App Name |  Jetpack |
| Flavor | Jalapeno | |
| Build Type | Debug | |
| Version | pr18090-57a705b | |
| Commit | 57a705b | |
| Direct Download | jetpack-prototype-build-pr18090-57a705b.apk |
… into deps/update-zendesk-to-5.1.1 � Conflicts: � build.gradle
The legacy [androidx.legacy.widget.Space] can no longer be found in the project or the libraries, via transitive dependencies or otherwise, and thus it is being replaced with plain [Space]. ------------------------------------------------------------------------ WordPress/src/main/res/layout/zs_activity_request_list_scene_empty.xml :14: Error: Class referenced in the layout file, androidx.legacy.widget .Space, was not found in the project or the libraries [MissingClass] ------------------------------------------------------------------------
Warning Messages: - "'constructor JsonParser()' is deprecated. Deprecated in Java" - "'parse(String!): JsonElement!' is deprecated. Deprecated in Java" Explanation: "No need to instantiate this class, use the static methods instead." ------------------------------------------------------------------------ FYI: This new deprecation warnings started appearing because the transitive to 'Zendesk' dependency, the 'com.google.code.gson:gson', got update from '2.8.5' to '2.8.9'.
|
Awesome, thank you so much for the review, testing and merging this @ovitrif ! 🙇♂️ ❤️ 🚀 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Parent #17569
This PR updates
zendeskVersionto 5.1.1, plus a small dependency configuration refactor (d9ccdf4).Also, as part of this update the below transitive dependencies were added:
WordPressmodule:com.squareup.retrofit2:retrofit(8978997)com.google.android.flexbox:flexbox(8a7dc7e)Additionally, the below exclusions got removed from the
com.zendesk:supportdependency:com.android.support:support-annotations(4a099b8)com.google.dagger(37cacda)Finally, the below issues got resolved:
PS: @ovitrif I added you as the main reviewer, randomly, 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.
To test:
1. Zendesk Update [Tickets & Contact Support]
ℹ️ This test only works when testing with a normal, non-a8c user account.
Mescreen ->Help->Tickets.My ticketsZendesk related screen opens and that it lists all of your tickets (or non if you don't have any yet).Helpsettings screen and then click onContact Support.Contact SupportZendesk related opens and that you are prompt toWrite a message.Testing Zendesk 5.1.1 update, please ignore and thank you! 🙏 🌟 🍀and then send your message.Helpsettings screen and then click onTicketsagain.Thank you for contacting the WordPress.com support team! (#1234567)email.Deliveredalong with a predefined automatedmobile supportresponse message.2. Retrofit Update [TenorGifClient.kt]
Mediascreen and add a newGIFvia theChoose from Tenoroption (top right).somethingand choose 3 GIFs from the resulting grid list, then click on the check option (top right) and wait for the GIFs to be uploaded.ALLmedia.File Detailsand that it is being previewed as moving there too.2. Flexbox Layout Update [BloggingPromptsOnboardingDialogFragment.kt]
ℹ️ This test only works when testing with the Jetpack app.
HOMEsub-tab of the mainMy Sitetab.Regression Notes
Potential unintended areas of impact
What I did to test those areas of impact (or what existing automated tests I relied on)
To testsection above.What automated tests I added (or what prevented me from doing so)
PR submission checklist:
RELEASE-NOTES.txtif necessary.