Merge 22.5 code freeze (#20750)

Author: mokagio

Gemfile.lock

@@ -188,7 +188,7 @@ GEM
       xcpretty-travis-formatter (>= 0.0.3)
     fastlane-plugin-appcenter (1.11.1)
     fastlane-plugin-sentry (1.11.0)
-    fastlane-plugin-wpmreleasetoolkit (8.0.1)
+    fastlane-plugin-wpmreleasetoolkit (8.1.0)
       activesupport (>= 6.1.7.1)
       bigdecimal (~> 1.4)
       buildkit (~> 1.5)
@@ -274,8 +274,8 @@ GEM
     naturally (2.2.1)
     netrc (0.11.0)
     no_proxy_fix (0.1.2)
-    nokogiri (1.14.4)
-      mini_portile2 (~> 2.8.0)
+    nokogiri (1.15.2)
+      mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     octokit (5.6.1)
       faraday (>= 1, < 3)
@@ -295,7 +295,7 @@ GEM
     racc (1.6.2)
     rainbow (3.1.1)
     rake (13.0.6)
-    rake-compiler (1.2.1)
+    rake-compiler (1.2.2)
       rake
     rchardet (1.8.0)
     regexp_parser (2.8.0)

Podfile

@@ -49,7 +49,7 @@ def wordpress_ui
 end
 
 def wordpress_kit
-  pod 'WordPressKit', '~> 8.2.0-beta.1'
+  pod 'WordPressKit', '~> 8.2-beta'
   # pod 'WordPressKit', git: 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', branch: ''
   # pod 'WordPressKit', git: 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', tag: ''
   # pod 'WordPressKit', git: 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', commit: ''
@@ -141,7 +141,7 @@ abstract_target 'Apps' do
 
   pod 'NSURL+IDN', '~> 0.4'
 
-  pod 'WPMediaPicker', '~> 1.8.8-beta.1'
+  pod 'WPMediaPicker', '~> 1.8-beta'
   ## while PR is in review:
   # pod 'WPMediaPicker', git: 'https://github.com/wordpress-mobile/MediaPicker-iOS.git', branch: ''
   # pod 'WPMediaPicker', path: '../MediaPicker-iOS'

Podfile.lock

@@ -512,7 +512,7 @@ PODS:
     - WordPressKit (~> 8.0-beta)
     - WordPressShared (~> 2.1-beta)
     - WordPressUI (~> 1.7-beta)
-  - WordPressKit (8.2.0-beta.1):
+  - WordPressKit (8.2.0):
     - Alamofire (~> 4.8.0)
     - NSObject-SafeExpectations (~> 0.0.4)
     - UIDeviceIdentifier (~> 2.0)
@@ -612,18 +612,17 @@ DEPENDENCIES:
   - SwiftLint (~> 0.50)
   - WordPress-Editor-iOS (~> 1.19.8)
   - WordPressAuthenticator (~> 6.1-beta)
-  - WordPressKit (~> 8.2.0-beta.1)
+  - WordPressKit (~> 8.2-beta)
   - WordPressShared (from `https://github.com/wordpress-mobile/WordPress-iOS-Shared.git`, branch `trunk`)
   - WordPressUI (~> 1.12.5)
-  - WPMediaPicker (~> 1.8.8-beta.1)
+  - WPMediaPicker (~> 1.8-beta)
   - Yoga (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.96.0/third-party-podspecs/Yoga.podspec.json`)
   - ZendeskSupportSDK (= 5.3.0)
   - ZIPFoundation (~> 0.9.8)
 
 SPEC REPOS:
   https://github.com/wordpress-mobile/cocoapods-specs.git:
     - WordPressAuthenticator
-    - WordPressKit
   trunk:
     - Alamofire
     - AlamofireImage
@@ -662,6 +661,7 @@ SPEC REPOS:
     - UIDeviceIdentifier
     - WordPress-Aztec-iOS
     - WordPress-Editor-iOS
+    - WordPressKit
     - WordPressUI
     - WPMediaPicker
     - wpxmlrpc
@@ -885,7 +885,7 @@ SPEC CHECKSUMS:
   WordPress-Aztec-iOS: 7d11d598f14c82c727c08b56bd35fbeb7dafb504
   WordPress-Editor-iOS: 9eb9f12f21a5209cb837908d81ffe1e31cb27345
   WordPressAuthenticator: b0b900696de5129a215adcd1e9ae6eb89da36ac8
-  WordPressKit: c5edb76919bd4c20ec3e3a7e16694edefedeb058
+  WordPressKit: d9015b097a58096033775dd8fc026d7d42005ae2
   WordPressShared: 87f3ee89b0a3e83106106f13a8b71605fb8eb6d2
   WordPressUI: c5be816f6c7b3392224ac21de9e521e89fa108ac
   WPMediaPicker: 0d40b8d66b6dfdaa2d6a41e3be51249ff5898775
@@ -900,6 +900,6 @@ SPEC CHECKSUMS:
   ZendeskSupportSDK: 3a8e508ab1d9dd22dc038df6c694466414e037ba
   ZIPFoundation: ae5b4b813d216d3bf0a148773267fff14bd51d37
 
-PODFILE CHECKSUM: 6a75813f75f63e26b524f5df1c763147e269d7f8
+PODFILE CHECKSUM: 8f3801df87501615cc7418c5a128cd9136848813
 
 COCOAPODS: 1.11.3

RELEASE-NOTES.txt

@@ -1,3 +1,7 @@
+22.6
+-----
+
+
 22.5
 -----
 * [*] [Jetpack-only] Reader: Fix the display of the followed topics in the filter sheet when they're written in non-latin languages. [#20702]

WordPress/Jetpack/Resources/release_notes.txt

@@ -1,9 +1,7 @@
-We added cards to your dashboard. The Activity Log card shows your three most recent activities, and the Pages card shows the last three pages you modified.
-
-We also made some important changes in the block editor. To prevent an app crash, deleted and undefined reusable blocks can no longer be converted to regular blocks.
-
-When you tap on a nested text block, you can immediately edit content in that block—no more tapping through every nesting level to get where you want to go. (Our fingers were getting tired, too.)
-
-Speaking of reusable blocks—we updated the “editing not supported” message to remove the mention of WordPress. We know what app we’re using, we promise.
-
-Finally, we fixed a bug where the app would crash if you tried to upload media to a classic block without giving WordPress access to your device’s media library. Instead, you’ll see a prompt asking for media access. Easy peasy, lemon squeezy.
+* [*] Reader: Fix the display of the followed topics in the filter sheet when they're written in non-latin languages. [#20702]
+* [*] Reader: Fixed an issue that was causing the Report and Block actions to be missing from Post Menu actions sheet. [#20705]
+* [***] Enables editing of the site homepage for sites using block-based themes directly from the pages list. [#20713]
+* [*] Block editor: Add disabled style to `Cell` component [https://github.com/WordPress/gutenberg/pull/50665]
+* [**] Block editor: Fix undo/redo history when inserting a link configured to open in a new tab [https://github.com/WordPress/gutenberg/pull/50460]
+* [**] Block editor: Disable details settings for not belonged VideoPress videos [https://github.com/wordpress-mobile/gutenberg-mobile/pull/5782]
+* [*] Block editor: [List block] Fix an issue when merging a list item into a Paragraph would remove its nested list items [https://github.com/wordpress-mobile/gutenberg-mobile/pull/5785]

WordPress/Resources/en.lproj/Localizable.strings

@@ -245,6 +245,9 @@
 /* translators: %s: social link name e.g: \"Instagram\". */
 "%s has URL set" = "%s has URL set";
 
+/* translators: %s: embed block variant's label e.g: \"Twitter\". */
+"%s link" = "%s link";
+
 /* translators: %s: embed block variant's label e.g: \"Twitter\". */
 "%s previews not yet available" = "%s previews not yet available";
 
@@ -1221,6 +1224,9 @@
 /* Popup title about why this post is being opened in block editor */
 "Block editor enabled" = "Block editor enabled";
 
+/* translators: displayed right after the block is grouped */
+"Block grouped" = "Block grouped";
+
 /* Jetpack Settings: Block malicious login attempts */
 "Block malicious login attempts" = "Block malicious login attempts";
 
@@ -1240,6 +1246,9 @@
 /* The title of a button that triggers blocking a site from the user's reader. */
 "Block this site" = "Block this site";
 
+/* translators: displayed right after the block is ungrouped. */
+"Block ungrouped" = "Block ungrouped";
+
 /* Notice title when blocking a site succeeds. */
 "Blocked site" = "Blocked site";
 
@@ -3585,6 +3594,15 @@
 /* Explanatory text for clearing device media cache. */
 "Free up storage space on this device by deleting temporary media files. This will not affect the media on your site." = "Free up storage space on this device by deleting temporary media files. This will not affect the media on your site.";
 
+/* Description for the Free to Paid plans dashboard card. */
+"freeToPaidPlans.dashboard.card.description" = "Get a free domain for the first year, remove ads on your site, and increase your storage.";
+
+/* Title for a menu action in the context menu on the Free to Paid plans dashboard card. */
+"freeToPaidPlans.dashboard.card.menu.hide" = "Hide this";
+
+/* Title for the Free to Paid plans dashboard card. */
+"freeToPaidPlans.dashboard.card.shortTitle" = "Free domain with an annual plan";
+
 /* Title of section that contains plugins' FAQ */
 "Frequently Asked Questions" = "Frequently Asked Questions";
 
@@ -6135,6 +6153,12 @@ Please install the %3$@ to use the app with this site.";
 /* Promote the page with Blaze. */
 "pages.blaze.actionTitle" = "Promote with Blaze";
 
+/* Subtitle of the theme template homepage cell */
+"pages.template.subtitle" = "Your homepage is using a Theme template and will open in the web editor.";
+
+/* Title of the theme template homepage cell */
+"pages.template.title" = "Homepage";
+
 /* Comments Paging
    Discussion Settings
    Settings: Comments Paging preferences */
@@ -6573,6 +6597,9 @@ Please install the %3$@ to use the app with this site.";
 /* Title for action sheet with featured media options. */
 "postSettings.featuredImageUploadActionSheet.title" = "Featured Image Options";
 
+/* Section title for the disabled Twitter service in the Post Settings screen */
+"postSettings.section.disabledTwitter.header" = "Twitter Auto-Sharing Is No Longer Available";
+
 /* Subtitle for placeholder in Tenor picker. `The company name 'Tenor' should always be written as it is. */
 "Powered by Tenor" = "Powered by Tenor";
 
@@ -6813,6 +6840,12 @@ Please install the %3$@ to use the app with this site.";
 /* Title of the screen that allows the user to change the Reader CSS URL for debug builds */
 "Reader CSS URL" = "Reader CSS URL";
 
+/* Reader search button accessibility label. */
+"reader.navigation.search.button.label" = "Search";
+
+/* Reader settings button accessibility label. */
+"reader.navigation.settings.button.label" = "Reader Settings";
+
 /* A default value used to fill in the site name when the followed site somehow has missing site name or URL.
 Example: given a notice format "Following %@" and empty site name, this will be "Following this site". */
 "reader.notice.follow.site.unknown" = "this site";
@@ -7947,6 +7980,15 @@ Example: given a notice format "Following %@" and empty site name, this will be
 /* Title of a Quick Start Tour */
 "Social sharing" = "Social sharing";
 
+/* Section title for the disabled Twitter service in the Social screen */
+"social.section.disabledTwitter.header" = "Twitter Auto-Sharing Is No Longer Available";
+
+/* Text for a hyperlink that allows the user to learn more about the Twitter deprecation. */
+"social.twitterDeprecation.link" = "Find out more";
+
+/* A smallprint that hints the reason behind why Twitter is deprecated. */
+"social.twitterDeprecation.text" = "Twitter auto-sharing is no longer available due to Twitter's changes in terms and pricing.";
+
 /* No comment provided by engineer. */
 "Some blocks have additional settings. Tap the settings icon on the bottom right of the block to view more options." = "Some blocks have additional settings. Tap the settings icon on the bottom right of the block to view more options.";
 

WordPress/Resources/release_notes.txt

@@ -1,3 +1,5 @@
-When you tap on a nested text block, you can immediately edit content in that block—no more tapping through every nesting level to get where you want to go. (Our fingers were getting tired, too.)
+* [***] Enables editing of the site homepage for sites using block-based themes directly from the pages list. [#20713]
+* [*] Block editor: Add disabled style to `Cell` component [https://github.com/WordPress/gutenberg/pull/50665]
+* [**] Block editor: Fix undo/redo history when inserting a link configured to open in a new tab [https://github.com/WordPress/gutenberg/pull/50460]
+* [*] Block editor: [List block] Fix an issue when merging a list item into a Paragraph would remove its nested list items [https://github.com/wordpress-mobile/gutenberg-mobile/pull/5785]
 
-We also fixed a bug where the app would crash if you tried to upload media to a classic block without giving WordPress access to your device’s media library. Instead, you’ll see a prompt asking for media access. Easy peasy, lemon squeezy.

config/Version.internal.xcconfig

@@ -1,4 +1,4 @@
-VERSION_SHORT=22.4
+VERSION_SHORT=22.5
 
 // Internal long version example: VERSION_LONG=9.9.0.20180423
-VERSION_LONG=22.4.0.20230526
+VERSION_LONG=22.5.0.20230529

config/Version.public.xcconfig

@@ -1,4 +1,4 @@
-VERSION_SHORT=22.4
+VERSION_SHORT=22.5
 
 // Public long version example: VERSION_LONG=9.9.0.0
-VERSION_LONG=22.4.0.2
+VERSION_LONG=22.5.0.0