Merge release/19.6 (rc-2) #16285

AliSoftware · 2022-04-08T15:13:39Z

Merging the release branch after doing a new beta.

The new beta includes:

Gutenberg Mobile 1.73.1 — Integrate gutenberg-mobile release 1.73.1 #16275
- Which fixes Spacer block - Crashes when changing the height value using the text input WordPress/gutenberg#40045
Latest strings.xml from GlotPress
Version bump in version.properties
🔧 A tooling fix (tools:ignore="UnusedResources") for some linter errors that started to appear on my machine
- See p1649360354245279-slack-C011BKNU1V5

Conflicts Resolution

The conflicts were due to the changes made to fix the tooling and the linter errors on UnusedResources for strings merged from WordPressEditor, while some new strings were introduced in trunk in the meantime:

1st conflict: notification_channel_* entries moved

<<<<<<< merge/release-19.6-rc-2
    <string name="notification_channel_general_title" tools:ignore="UnusedResources">General</string>
    <string name="notification_channel_important_title" tools:ignore="UnusedResources">Important</string>
    <string name="notification_channel_transient_title" tools:ignore="UnusedResources">Transient</string>
    <string name="notification_channel_reminder_title" tools:ignore="UnusedResources">Reminder</string>
    <string name="notification_channel_weekly_roundup_title">Weekly Roundup</string>

    <string name="notification_channel_normal_id" translatable="false">wpandroid_notification_normal_channel_id</string>
    <string name="notification_channel_important_id" translatable="false" tools:ignore="UnusedResources">wpandroid_notification_important_channel_id</string>
    <string name="notification_channel_transient_id" translatable="false">wpandroid_notification_transient_channel_id</string>
    <string name="notification_channel_reminder_id" translatable="false" tools:ignore="UnusedResources">wpandroid_notification_reminder_channel_id</string>
=======




    <string name="notification_channel_weekly_roundup_title">Weekly Roundup</string>

    <string name="notification_channel_normal_id" translatable="false">wpandroid_notification_normal_channel_id</string>

    <string name="notification_channel_transient_id" translatable="false">wpandroid_notification_transient_channel_id</string>

>>>>>>> trunk

2nd conflict: tools:ignore vs new Initial Screen strings

<<<<<<< merge/release-19.6-rc-2
    <!-- WordPressEditor module -->
    <string name="post_content" tools:ignore="UnusedResources">Content</string>
    <string name="uploading" tools:ignore="UnusedResources">Uploading…</string>
    <string name="uploading_gallery_placeholder" tools:ignore="UnusedResources">Uploading gallery…</string>
    <string name="alert_insert_image_html_mode" tools:ignore="UnusedResources">Can\'t insert media directly in HTML mode. Please switch back to visual mode.</string>
    <string name="alert_action_while_uploading" tools:ignore="UnusedResources">You are currently uploading media. Please wait until this completes.</string>
    <string name="alert_error_adding_media" tools:ignore="UnusedResources">An error occurred while inserting media</string>
    <string name="stop_save_dialog_title" tools:ignore="UnusedResources">Files saving</string>
    <string name="stop_save_dialog_message" tools:ignore="UnusedResources">Please wait until all files have been saved</string>
    <string name="stop_save_dialog_ok_button" tools:ignore="UnusedResources">OK</string>
    <string name="create_a_link" tools:ignore="UnusedResources">Create a link</string>
    <string name="width" tools:ignore="UnusedResources">Width</string>
    <string name="featured" tools:ignore="UnusedResources">Use as featured image</string>
    <string name="featured_in_post" tools:ignore="UnusedResources">Include image in post content</string>
    <string name="horizontal_alignment" tools:ignore="UnusedResources">Horizontal alignment</string>
    <string name="caption" tools:ignore="UnusedResources">Caption (optional)</string>
    <string name="pixel_suffix" tools:ignore="UnusedResources">%dpx</string>
    <string name="image_alt_text" tools:ignore="UnusedResources">Alt text</string>
    <string name="media_bar_description_camera" tools:ignore="UnusedResources">Take Photo or Video with camera</string>
    <string name="media_bar_description_gallery" tools:ignore="UnusedResources">Pick a media from gallery</string>
    <string name="media_bar_description_library" tools:ignore="UnusedResources">Pick a media from WordPress media library</string>
    <string name="visual_editor" tools:ignore="UnusedResources">Visual editor</string>
    <string name="image_thumbnail" tools:ignore="UnusedResources">Image thumbnail</string>
    <string name="editor_failed_to_insert_media_tap_for_options" tools:ignore="UnusedResources">Failed to insert media.\nPlease tap for options.</string>
    <string name="dialog_content_info_title" tools:ignore="UnusedResources">Content structure</string>
    <string name="dialog_content_info_body" tools:ignore="UnusedResources">Blocks: %1$d\nWords: %2$d\nCharacters: %3$d</string>
    <string name="toast_content_info_failed" tools:ignore="UnusedResources">Failed to get content structure</string>
    <string name="toast_content_info_editor_not_ready" tools:ignore="UnusedResources">Editor is still loading</string>
    <string name="editor_title_beta" tools:ignore="UnusedResources">Beta</string>
    <string name="dialog_title" tools:ignore="UnusedResources">Insert link</string>
    <string name="dialog_edit_hint" tools:ignore="UnusedResources">http(s)://</string>
    <string name="dialog_button_ok" tools:ignore="UnusedResources">OK</string>
    <string name="dialog_button_cancel" tools:ignore="UnusedResources">Cancel</string>
    <string name="media_insert_unimplemented" tools:ignore="UnusedResources">Apologies! Feature not implemented yet :(</string>
    <string name="stop_upload_dialog_button_yes" tools:ignore="UnusedResources">Yes</string>
    <string name="stop_upload_dialog_button_no" tools:ignore="UnusedResources">No</string>
    <string name="retry_failed_upload_title" tools:ignore="UnusedResources">Couldn\'t upload file</string>
    <string name="retry_failed_upload_yes" tools:ignore="UnusedResources">Retry</string>
    <string name="retry_failed_upload_remove" tools:ignore="UnusedResources">Remove upload</string>
    <string name="retry_failed_upload_retry_all" tools:ignore="UnusedResources">Retry all</string>
    <string name="long_post_dlg_saving" tools:ignore="UnusedResources">Saving</string>
    <string name="menu_toolbar_title" tools:ignore="UnusedResources">Edit %s block</string>
    <string name="pref_key_seen_classic_editor_deprecation_notice" tools:ignore="UnusedResources" translatable="false">wp_pref_seen_classic_editor_deprecation_notice</string>
    <string name="dialog_title_try_block_editor" tools:ignore="UnusedResources" translatable="true">Try the new Block Editor</string>
    <string name="dialog_body_try_block_editor" tools:ignore="UnusedResources" translatable="true">We’ll be removing the classic editor for new posts soon, but this won’t affect editing any of your existing posts or pages. Get a head start by enabling the Block Editor now in site settings.</string>
    <string name="dialog_dismiss_try_block_editor" tools:ignore="UnusedResources" translatable="true">Dismiss</string>
    <string name="featured_image_replace_dialog_title" tools:ignore="UnusedResources">Replace current featured image?</string>
    <string name="featured_image_replace_dialog_description" tools:ignore="UnusedResources">You already have a featured image set. Do you want to replace it with the new image?</string>
    <string name="featured_image_replace_dialog_confirm" tools:ignore="UnusedResources">Replace featured image</string>
    <string name="featured_image_replace_dialog_cancel" tools:ignore="UnusedResources">Keep current</string>
    <string name="featured_image_confirmation_notice" tools:ignore="UnusedResources">Set as featured image</string>
    <string name="featured_image_removed_notice" tools:ignore="UnusedResources">Removed as featured image</string>
=======
    <!-- Initial Screen -->
    <string name="initial_screen">Initial Screen</string>
    <string name="initial_screen_home" translatable="false">@string/my_site_dashboard_tab_title</string>
    <string name="initial_screen_site_menu" translatable="false">@string/my_site_menu_tab_title</string>
    <string name="initial_screen_entry_value_home" translatable="false">home</string>
    <string name="initial_screen_entry_value_site_menu" translatable="false">site_menu</string>
    <string name="initial_screen_entry_value_default_key" translatable="false">@string/initial_screen_entry_value_site_menu</string>
    <string-array name="initial_screen_entries" translatable="false" tools:ignore="InconsistentArrays">
        <item>@string/initial_screen_home</item>
        <item>@string/initial_screen_site_menu</item>
    </string-array>
    <string-array name="initial_screen_entry_values" translatable="false" tools:ignore="InconsistentArrays">
        <item>@string/initial_screen_entry_value_home</item>
        <item>@string/initial_screen_entry_value_site_menu</item>
    </string-array>

    <string name="post_content">Content</string>
    <string name="uploading">Uploading…</string>
    <string name="uploading_gallery_placeholder">Uploading gallery…</string>
    <string name="alert_insert_image_html_mode">Can\'t insert media directly in HTML mode. Please switch back to visual mode.</string>
    <string name="alert_action_while_uploading">You are currently uploading media. Please wait until this completes.</string>
    <string name="alert_error_adding_media">An error occurred while inserting media</string>
    <string name="stop_save_dialog_title">Files saving</string>
    <string name="stop_save_dialog_message">Please wait until all files have been saved</string>
    <string name="stop_save_dialog_ok_button">OK</string>
    <string name="create_a_link">Create a link</string>
    <string name="width">Width</string>
    <string name="featured">Use as featured image</string>
    <string name="featured_in_post">Include image in post content</string>
    <string name="horizontal_alignment">Horizontal alignment</string>
    <string name="caption">Caption (optional)</string>
    <string name="pixel_suffix">%dpx</string>
    <string name="image_alt_text">Alt text</string>
    <string name="media_bar_description_camera">Take Photo or Video with camera</string>
    <string name="media_bar_description_gallery">Pick a media from gallery</string>
    <string name="media_bar_description_library">Pick a media from WordPress media library</string>
    <string name="visual_editor">Visual editor</string>
    <string name="image_thumbnail">Image thumbnail</string>
    <string name="editor_failed_to_insert_media_tap_for_options">Failed to insert media.\nPlease tap for options.</string>
    <string name="dialog_content_info_title">Content structure</string>
    <string name="dialog_content_info_body">Blocks: %1$d\nWords: %2$d\nCharacters: %3$d</string>
    <string name="toast_content_info_failed">Failed to get content structure</string>
    <string name="toast_content_info_editor_not_ready">Editor is still loading</string>
    <string name="editor_title_beta">Beta</string>
    <string name="dialog_title">Insert link</string>
    <string name="dialog_edit_hint">http(s)://</string>
    <string name="dialog_button_ok">OK</string>
    <string name="dialog_button_cancel">Cancel</string>
    <string name="media_insert_unimplemented">Apologies! Feature not implemented yet :(</string>
    <string name="stop_upload_dialog_button_yes">Yes</string>
    <string name="stop_upload_dialog_button_no">No</string>
    <string name="retry_failed_upload_title">Couldn\'t upload file</string>
    <string name="retry_failed_upload_yes">Retry</string>
    <string name="retry_failed_upload_remove">Remove upload</string>
    <string name="retry_failed_upload_retry_all">Retry all</string>
    <string name="long_post_dlg_saving">Saving</string>
    <string name="menu_toolbar_title">Edit %s block</string>
    <string name="pref_key_seen_classic_editor_deprecation_notice" translatable="false">wp_pref_seen_classic_editor_deprecation_notice</string>
    <string name="dialog_title_try_block_editor" translatable="true">Try the new Block Editor</string>
    <string name="dialog_body_try_block_editor" translatable="true">We’ll be removing the classic editor for new posts soon, but this won’t affect editing any of your existing posts or pages. Get a head start by enabling the Block Editor now in site settings.</string>
    <string name="dialog_dismiss_try_block_editor" translatable="true">Dismiss</string>
    <string name="featured_image_replace_dialog_title">Replace current featured image?</string>
    <string name="featured_image_replace_dialog_description">You already have a featured image set. Do you want to replace it with the new image?</string>
    <string name="featured_image_replace_dialog_confirm">Replace featured image</string>
    <string name="featured_image_replace_dialog_cancel">Keep current</string>
    <string name="featured_image_confirmation_notice">Set as featured image</string>
    <string name="featured_image_removed_notice">Removed as featured image</string>
    <string name="notification_channel_general_title" tools:ignore="UnusedResources">General</string>
    <string name="notification_channel_important_title" tools:ignore="UnusedResources">Important</string>
    <string name="notification_channel_transient_title" tools:ignore="UnusedResources">Transient</string>
    <string name="notification_channel_reminder_title" tools:ignore="UnusedResources">Reminder</string>
    <string name="notification_channel_important_id" translatable="false" tools:ignore="UnusedResources">wpandroid_notification_important_channel_id</string>
    <string name="notification_channel_reminder_id" translatable="false" tools:ignore="UnusedResources">wpandroid_notification_reminder_channel_id</string>
>>>>>>> trunk

I solved them by:

Keeping the changes from release/19.6 for the notification_channel_* strings on the first conflict, since those were made in this branch to fix the glitch from recent lib merge during code freeze.
- See Merge release/19.6 (code freeze) #16251 (comment)
- The reason that this change on release/19.6 resulted in a conflict with trunk is because of a tab-vs-space change (likely done automatically by some devs' editors) in trunk
Keeping the new strings from the  section
- Those were introduced in trunk by @zwarm during My Site Dashboard: Initial Screen App Setting #16252
- So we obviously need to still keep those new strings after the merge of that PR into trunk
Keeping the rest of the changes in that second conflict from release/19.6 which added the tools:ignore="UnusedResources" attributes to the WordPressEditor module' strings
- Since those were the made during b9f6662 to fix the linter issue I had in the first place

…elease_1.73.1 Integrate gutenberg-mobile release 1.73.1

1. Moved the `notification_channel_*` strings back where they initially were in the `strings.xml` file (and thus under the appropriate `` XML comment providing context about them). - The reason why they were moved around during merge in #16251 is because those strings, which come from the `stories-android` lib, were updated in the `stories-android` repo itself to have `tools:ignore="UnusedResources"` manually added to them - As a result, our tooling merging lib's `strings.xml` files saw those had different XML attributes and thus removed the old XML node then re-added the lib XML node at the end, as opposed to just update its text content (as it'd have otherwise just done were there no new attributes) - See Automattic/stories-android@d397e19 for where that was changed in `stories-android` 2. Manually added `tools:ignore="UnusedResources"` to all the strings that were added from the WordPressEditor module - We add that attribute to strings that come from being merged from libs, because the linter is not capable of detecting when those are used by a library vs the app. - Note that some of those might genuinely be unused (neither by the app… nor by the WordPressEditor module… nor by any of its transitive dependencies for which having those redefined here would be for the intent of overriding the ones from those transitive dependencies…), while others might be false positives (actually used… but it's just the linter failing to detect it) - In practice, we'd have expected that `checkDependencies = true` in `WordPress/build.gradle` would still allow lint to detect which of those strings from `WordPressEditor` might be used in that submodule even if not used by the app, and I think it actually does (because only 18 of those 51 strings from WPEditor generate an "UnusedResources" error) so we could have instead decided to only add the ignore attribute for those 18 ones but consider that `checkDependencies = true` is supposed to detect the rest. But we preferred to keep it simple and unblock ourselves (as this prevented me from building the app) and be consistent with how we do it for other libs rather than cherry-pick which ones to tag. We plan to revisit and audit all the strings to find the unused one at a later date as a cleanup project anyway. 3. Changed the exclusion regex from `values-.*/strings\.xml` to `values-.*/.*\.xml`, so that it not only ignores the `strings.xml` files from translated or variant resources (i.e. the ones ones other than `values/`), but also include other ones like `colors.xml`, because 2 of the Aztec colors were now detected as unused in the app (while they're likely used by the Aztec lib and we're just overriding them in the app)

peril-wordpress-mobile · 2022-04-08T15:13:45Z

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

peril-wordpress-mobile · 2022-04-08T15:29:10Z

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

WordPress-pr-16285-build-121175.apk

Jetpack-pr-16285-build-121175.apk

wpmobilebot · 2022-04-08T15:36:46Z

Found 1 violations:

The PR caused the following dependency changes:

 \--- project :libs:editor:WordPressEditor
-     \--- org.wordpress-mobile.gutenberg-mobile:react-native-gutenberg-bridge:v1.73.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 (*)
-          +--- 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
-          |    +--- 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: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-1
-          +--- 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 (*)
-          +--- org.wordpress-mobile.gutenberg-mobile:react-native-aztec:v1.73.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.4 (*)
-          |    +--- org.wordpress.aztec:wordpress-shortcodes:v1.5.4 (*)
-          |    +--- org.wordpress.aztec:wordpress-comments:v1.5.4 (*)
-          |    +--- org.wordpress.aztec:glide-loader:v1.5.4
-          |    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.20 -> 1.6.10 (*)
-          |    |    +--- org.wordpress:aztec:v1.5.4 (*)
-          |    |    \--- com.github.bumptech.glide:glide:4.10.0 -> 4.11.0 (*)
-          |    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.32 (*)
-          +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.32 (*)
-          \--- org.wordpress-mobile:hermes-release-mirror:0.66.2
+     \--- org.wordpress-mobile.gutenberg-mobile:react-native-gutenberg-bridge:v1.73.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 (*)
+          +--- 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
+          |    +--- 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: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-1
+          +--- 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 (*)
+          +--- org.wordpress-mobile.gutenberg-mobile:react-native-aztec:v1.73.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.4 (*)
+          |    +--- org.wordpress.aztec:wordpress-shortcodes:v1.5.4 (*)
+          |    +--- org.wordpress.aztec:wordpress-comments:v1.5.4 (*)
+          |    +--- org.wordpress.aztec:glide-loader:v1.5.4
+          |    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.20 -> 1.6.10 (*)
+          |    |    +--- org.wordpress:aztec:v1.5.4 (*)
+          |    |    \--- com.github.bumptech.glide:glide:4.10.0 -> 4.11.0 (*)
+          |    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.32 (*)
+          +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.32 (*)
+          \--- org.wordpress-mobile:hermes-release-mirror:0.66.2

Please review and act accordingly

AliSoftware · 2022-04-08T15:44:49Z

fastlane/resources/values/strings.xml

-    <string name="notification_channel_reminder_id" translatable="false" tools:ignore="UnusedResources">wpandroid_notification_reminder_channel_id</string>
+
+    <!-- WordPressEditor module -->
+    <string name="post_content" tools:ignore="UnusedResources">Content</string>


This one and all the ones below are because we fixed the linter error by adding tools:ignore="UnusedResources" in the original WordPress/src/main/res/values/strings.xml, so since that strings.xml changed, we is why that frozen fastlane/resources/values/strings.xml got then updated accordingly to apply the same changes made during release/19.6 to the frozen ones.

That should not impact the GlotPress import, since that change in the frozen strings is only about moving some nodes around, and adding the tools:ignore attribute, but didn't change their name nor value/text; so I don't thing GlotPress will see when re-importing the file next time around

AliSoftware · 2022-04-08T15:46:44Z

WordPress/src/main/res/values/strings.xml

@@ -4010,6 +4010,59 @@ translators: %s: Select control option value e.g: "Auto, 25%". -->
    <string name="blogging_prompts_onboarding_remind_me">Remind me</string>
    <string name="blogging_prompts_onboarding_card_prompt">Cast the movie of your life.</string>

+    <!-- WordPressEditor module -->


Adding the tools:ignore="UnusedResources" here (as well as that comment) to all the entries that got previously merged from the WordPressEditor module, so that the linter doesn't error on those strings (not realizing they might not be used by the main/src/ code but might still be used by the subproject)

oguzkocer · 2022-04-08T16:55:36Z

config/lint.xml

@@ -81,7 +81,7 @@
        <ignore path="**/WordPressEditor/**" />
        <ignore path="**/.gradle/caches/**" />
        <ignore path="**/generated/**" />
-        <ignore regexp=".*\/values\-([a-z]|[A-Z]|\-){2,6}\/strings\.xml$"/>
+        <ignore regexp=".*\/values\-([a-z]|[A-Z]|\-){2,6}\/.*\.xml$"/>


I think this is fine, but I would have preferred to be more verbose and add each file separately - assuming it's less than 5 or so files of course. My slight worry is that we'll miss something due to this catch all file name pattern. However, I can't find a concrete example where it'll be an issue, so I am just leaving this as a note.

Good point, addressed in #16293

By annotating the 2 problematic color resources individually, instead of adjusting the exception rule with a too-broad regexp See https://github.com/wordpress-mobile/WordPress-Android/pull/16285\#discussion_r846318394

Siobhan and others added 8 commits April 7, 2022 09:34

Release script: Update build.gradle gutenbergMobileVersion to ref

1526cf5

Update reference to Gutenberg Mobile

c1e56ab

Update reference to Gutenberg Mobile

dbbd662

Merge pull request #16275 from wordpress-mobile/gutenberg/integrate_r…

a7dce12

…elease_1.73.1 Integrate gutenberg-mobile release 1.73.1

Freeze strings for translation

e01bc7f

Update translations

c19f573

Bump version number

7733ca6

AliSoftware added the Releases Label related to managing releases label Apr 8, 2022

AliSoftware added this to the 19.6 ❄️ milestone Apr 8, 2022

AliSoftware self-assigned this Apr 8, 2022

Merge branch 'trunk' into merge/release-19.6-rc-2

3721b5e

AliSoftware commented Apr 8, 2022

View reviewed changes

AliSoftware marked this pull request as ready for review April 8, 2022 15:47

AliSoftware requested a review from a team April 8, 2022 15:47

AliSoftware enabled auto-merge April 8, 2022 15:48

oguzkocer approved these changes Apr 8, 2022

View reviewed changes

AliSoftware merged commit bb4a091 into trunk Apr 8, 2022

AliSoftware deleted the merge/release-19.6-rc-2 branch April 8, 2022 16:55

AliSoftware mentioned this pull request Apr 11, 2022

[Tooling] Ignore values-night/colors_aztec.xml linter errors properly this time #16293

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge release/19.6 (rc-2) #16285

Merge release/19.6 (rc-2) #16285

AliSoftware commented Apr 8, 2022 •

edited

Loading

peril-wordpress-mobile bot commented Apr 8, 2022 •

edited

Loading

peril-wordpress-mobile bot commented Apr 8, 2022 •

edited

Loading

wpmobilebot commented Apr 8, 2022

AliSoftware Apr 8, 2022

AliSoftware Apr 8, 2022

oguzkocer Apr 8, 2022

AliSoftware Apr 11, 2022

Merge release/19.6 (rc-2) #16285

Merge release/19.6 (rc-2) #16285

Conversation

AliSoftware commented Apr 8, 2022 • edited Loading

Conflicts Resolution

peril-wordpress-mobile bot commented Apr 8, 2022 • edited Loading

peril-wordpress-mobile bot commented Apr 8, 2022 • edited Loading

wpmobilebot commented Apr 8, 2022

The PR caused the following dependency changes:

AliSoftware Apr 8, 2022

Choose a reason for hiding this comment

AliSoftware Apr 8, 2022

Choose a reason for hiding this comment

oguzkocer Apr 8, 2022

Choose a reason for hiding this comment

AliSoftware Apr 11, 2022

Choose a reason for hiding this comment

AliSoftware commented Apr 8, 2022 •

edited

Loading

peril-wordpress-mobile bot commented Apr 8, 2022 •

edited

Loading

peril-wordpress-mobile bot commented Apr 8, 2022 •

edited

Loading