Merge release/25.5 into trunk (#23872)

* Bump version number

* Update draft release notes for 25.5.

* Update draft release notes for 25.5.

* Release Notes: add new section for next version (25.6)

* Remove Jetpack-only entries from WordPress 25.5 raw release notes

* Update strings for localization

* Add beta app description to Testflight builds

* Remove trailing commas from beta_app_description_path

* Manually bump version number

---------

Co-authored-by: Oguz Kocer <[email protected]>

Author: wpmobilebot

RELEASE-NOTES.txt

@@ -1,3 +1,7 @@
+25.6
+-----
+
+
 25.6
 -----
 * [*] [internal] Update Gravatar SDK to 3.0.0 [#23701]

WordPress/Jetpack/Resources/beta_app_description.txt

@@ -0,0 +1 @@
+Thanks for using the Jetpack TestFlight build – please feel free to send us any feedback you might have!

WordPress/Jetpack/Resources/release_notes.txt

@@ -1,5 +1,4 @@
-Three things this month:
-1. We've updated the UI for iPadOS 18 – no more tab bar, everything is navigation-based, which should be a better use of the larger screen size.
-2. Some iOS 18 improvements – a few color tweaks, some bugfixes, and most importantly – tintable icons!
-3. We've been hard at work on an experimental new block editor. It's not ready for full-time use, but we'd love your feedback! Check it out in Me > App Settings > Experimental Features.
-If you have feedback on any of these features, we'd love to hear it – reach out to us at [email protected]!
+* [***] Use web-based sign-in flow (hidden under a feature flag) [#23675]
+* [*] Enable navigating to an individual post's stats from within the "view more" screen for author stats. [#23761]
+* [*] [Jetpack-only] Enable pubishing to non-Jetpack sites when sharing content to the Jetpack app. [#23778]
+

WordPress/Resources/beta_app_description.txt

@@ -0,0 +1 @@
+Thanks for using the WordPress TestFlight build – please feel free to send us any feedback you might have!

WordPress/Resources/en.lproj/Localizable.strings

@@ -1,5 +1,3 @@
-Three things this month:
-1. We've updated the UI for iPadOS 18 – no more tab bar, everything is navigation-based, which should be a better use of the larger screen size.
-2. Some iOS 18 improvements – a few color tweaks, some bugfixes, and most importantly – tintable icons!
-3. We've been hard at work on an experimental new block editor. It's not ready for full-time use, but we'd love your feedback! Check it out in Me > App Settings > Experimental Features.
-If you have feedback on any of these features, we'd love to hear it – reach out to us at [email protected]!
+* [***] Use web-based sign-in flow (hidden under a feature flag) [#23675]
+* [*] Enable navigating to an individual post's stats from within the "view more" screen for author stats. [#23761]
+

WordPress/Resources/release_notes.txt

@@ -1,2 +1,2 @@
-VERSION_LONG = 25.4.2.0
-VERSION_SHORT = 25.4.2
+VERSION_LONG = 25.5.0.1
+VERSION_SHORT = 25.5

config/Version.public.xcconfig

@@ -18,6 +18,8 @@ DERIVED_DATA_PATH = File.join(PROJECT_ROOT_FOLDER, 'DerivedData')
 BUILD_PRODUCTS_PATH = File.join(PROJECT_ROOT_FOLDER, 'Artifacts')
 WORDPRESS_RELEASE_NOTES_PATH = File.join(PROJECT_ROOT_FOLDER, 'WordPress', 'Resources', 'release_notes.txt')
 JETPACK_RELEASE_NOTES_PATH = File.join(PROJECT_ROOT_FOLDER, 'WordPress', 'Jetpack', 'Resources', 'release_notes.txt')
+WORDPRESS_BETA_APP_DESCRIPTION_PATH = File.join(PROJECT_ROOT_FOLDER, 'WordPress', 'Resources', 'beta_app_description.txt')
+JETPACK_BETA_APP_DESCRIPTION_PATH = File.join(PROJECT_ROOT_FOLDER, 'WordPress', 'Jetpack', 'Resources', 'beta_app_description.txt')
 
 # Env file paths to load
 ENV_FILE_NAME = '.wpios-env.default'

fastlane/Fastfile

@@ -183,7 +183,8 @@
 
     upload_build_to_testflight(
       whats_new_path: WORDPRESS_RELEASE_NOTES_PATH,
-      distribution_groups: ['Internal a8c Testers', 'Public Beta Testers']
+      distribution_groups: ['Internal a8c Testers', 'Public Beta Testers'],
+      beta_app_description_path: WORDPRESS_BETA_APP_DESCRIPTION_PATH
     )
 
     sentry_upload_dsym(
@@ -248,7 +249,8 @@
 
     upload_build_to_testflight(
       whats_new_path: JETPACK_RELEASE_NOTES_PATH,
-      distribution_groups: ['Beta Testers']
+      distribution_groups: ['Beta Testers'],
+      beta_app_description_path: JETPACK_BETA_APP_DESCRIPTION_PATH
     )
 
     sentry_upload_dsym(
@@ -462,10 +464,11 @@ def buildkite_ci?
     ENV.fetch('BUILDKITE', false)
   end
 
-  def upload_build_to_testflight(whats_new_path:, distribution_groups:)
+  def upload_build_to_testflight(whats_new_path:, distribution_groups:, beta_app_description_path:)
     upload_to_testflight(
       team_id: get_required_env('FASTLANE_ITC_TEAM_ID'),
       api_key_path: APP_STORE_CONNECT_KEY_PATH,
+      beta_app_description: File.read(beta_app_description_path),
       changelog: File.read(whats_new_path),
       distribute_external: true,
       groups: distribution_groups,