From 889564d9300e007a93743c8c970fdfb28a7d2cd3 Mon Sep 17 00:00:00 2001 From: Automattic Release Bot Date: Mon, 18 Mar 2024 16:16:11 +0000 Subject: [PATCH 1/9] Bump version number --- version.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/version.properties b/version.properties index ea1f6fa20b9a..72b14604191b 100644 --- a/version.properties +++ b/version.properties @@ -1,2 +1,2 @@ -versionName=24.4 -versionCode=1416 \ No newline at end of file +versionName=24.5-rc-1 +versionCode=1417 \ No newline at end of file From fb4d64737861b9d88d4b5cbe76362c8ccc3bc3bb Mon Sep 17 00:00:00 2001 From: Automattic Release Bot Date: Mon, 18 Mar 2024 16:16:11 +0000 Subject: [PATCH 2/9] Update draft release notes for 24.5. --- WordPress/metadata/release_notes.txt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/WordPress/metadata/release_notes.txt b/WordPress/metadata/release_notes.txt index a2522385fd21..b16879e8b529 100644 --- a/WordPress/metadata/release_notes.txt +++ b/WordPress/metadata/release_notes.txt @@ -1,5 +1,4 @@ -We made a few changes to the block editor. +* [*] [internal] Block editor: Remove code associated to Story block [https://github.com/wordpress-mobile/WordPress-Android/pull/20400] +* [*] [Jetpack-only] Fixes broken links on some notifications [https://github.com/wordpress-mobile/WordPress-Android/pull/20417] +* [**] [internal] Block editor: Upgrade React Native to version 0.73.3 [#20167] -- The app won’t crash anymore when the editor auto-scrolls down to a block. -- You’ll now see an error message when a video fails to upload to media and text blocks. -- Images no longer appear partly transparent while they’re being uploaded. From 68a93b84943cd2dd51751886e2cad7435b0015c2 Mon Sep 17 00:00:00 2001 From: Automattic Release Bot Date: Mon, 18 Mar 2024 16:16:11 +0000 Subject: [PATCH 3/9] Update draft release notes for Jetpack 24.5. --- WordPress/jetpack_metadata/release_notes.txt | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/WordPress/jetpack_metadata/release_notes.txt b/WordPress/jetpack_metadata/release_notes.txt index 24855a2e2753..b16879e8b529 100644 --- a/WordPress/jetpack_metadata/release_notes.txt +++ b/WordPress/jetpack_metadata/release_notes.txt @@ -1,6 +1,4 @@ -- Added a new Traffic tab on the Stats screen -- Upgraded the Notifications design -- Introduced video block support for VideoPress v5 -- Fixed a crash caused by block editor auto-scrolling -- Provided an error message for video upload failure -- Removed image transparency during upload +* [*] [internal] Block editor: Remove code associated to Story block [https://github.com/wordpress-mobile/WordPress-Android/pull/20400] +* [*] [Jetpack-only] Fixes broken links on some notifications [https://github.com/wordpress-mobile/WordPress-Android/pull/20417] +* [**] [internal] Block editor: Upgrade React Native to version 0.73.3 [#20167] + From fc1a6e70a9254abf4a5cf0f04d76254adb295f71 Mon Sep 17 00:00:00 2001 From: Automattic Release Bot Date: Mon, 18 Mar 2024 16:16:11 +0000 Subject: [PATCH 4/9] Release Notes: add new section for next version (24.6) --- RELEASE-NOTES.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index 5a2791307788..d1172d3caa0a 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -1,5 +1,9 @@ *** PLEASE FOLLOW THIS FORMAT: [] [] +24.6 +----- + + 24.5 ----- * [*] [internal] Block editor: Remove code associated to Story block [https://github.com/wordpress-mobile/WordPress-Android/pull/20400] From b596c0a72e3fce7aa81a92e7dbd9be31b69d99d5 Mon Sep 17 00:00:00 2001 From: Oguz Kocer Date: Mon, 18 Mar 2024 12:24:14 -0400 Subject: [PATCH 5/9] Update FluxC version to 2.72.0 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index a9696d28acaf..fca80f2f1b84 100644 --- a/build.gradle +++ b/build.gradle @@ -25,7 +25,7 @@ ext { automatticTracksVersion = '3.5.0' gutenbergMobileVersion = 'v1.115.0' wordPressAztecVersion = 'v2.0' - wordPressFluxCVersion = 'trunk-b9ecc708dde74d6cc95aeab42e56fb8067640039' + wordPressFluxCVersion = '2.72.0' wordPressLoginVersion = '1.14.1' wordPressPersistentEditTextVersion = '1.0.2' wordPressUtilsVersion = 'trunk-4d6cb9a20bfda0dfe2310cf8275cbdcfb0d42ba7' From 9c47fb44a7582d3952ef46b9d550d018306cdb50 Mon Sep 17 00:00:00 2001 From: Oguz Kocer Date: Mon, 18 Mar 2024 12:26:17 -0400 Subject: [PATCH 6/9] Update wordPressUtilsVersion to 3.14.0 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index fca80f2f1b84..5dbdd2f08470 100644 --- a/build.gradle +++ b/build.gradle @@ -28,7 +28,7 @@ ext { wordPressFluxCVersion = '2.72.0' wordPressLoginVersion = '1.14.1' wordPressPersistentEditTextVersion = '1.0.2' - wordPressUtilsVersion = 'trunk-4d6cb9a20bfda0dfe2310cf8275cbdcfb0d42ba7' + wordPressUtilsVersion = '3.14.0' indexosMediaForMobileVersion = '43a9026f0973a2f0a74fa813132f6a16f7499c3a' // debug From ee2bed952e94462301f91cda5e0c48765243e824 Mon Sep 17 00:00:00 2001 From: Oguz Kocer Date: Mon, 18 Mar 2024 12:27:54 -0400 Subject: [PATCH 7/9] Remove Jetpack only release notes from WordPress 24.5 release notes --- WordPress/metadata/release_notes.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/WordPress/metadata/release_notes.txt b/WordPress/metadata/release_notes.txt index b16879e8b529..e8785f47b116 100644 --- a/WordPress/metadata/release_notes.txt +++ b/WordPress/metadata/release_notes.txt @@ -1,4 +1,3 @@ * [*] [internal] Block editor: Remove code associated to Story block [https://github.com/wordpress-mobile/WordPress-Android/pull/20400] -* [*] [Jetpack-only] Fixes broken links on some notifications [https://github.com/wordpress-mobile/WordPress-Android/pull/20417] * [**] [internal] Block editor: Upgrade React Native to version 0.73.3 [#20167] From 990b68e4a4c917739504ea916899fbfe4e8540f4 Mon Sep 17 00:00:00 2001 From: Automattic Release Bot Date: Mon, 18 Mar 2024 16:42:08 +0000 Subject: [PATCH 8/9] Merge strings from libraries for translation --- WordPress/src/main/res/values/strings.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/WordPress/src/main/res/values/strings.xml b/WordPress/src/main/res/values/strings.xml index ef4354f0bdd0..36c4a2bb7004 100644 --- a/WordPress/src/main/res/values/strings.xml +++ b/WordPress/src/main/res/values/strings.xml @@ -4796,4 +4796,12 @@ translators: %s: Select control option value e.g: "Auto, 25%". --> Edit video Video caption. Empty Video caption. %s + Button to copy error details + Button to copy post text + Copy error details + Copy post text + Tap here to copy error details + Tap here to copy post text + The editor has encountered an unexpected error + You can copy your post text in case your content is impacted. Copy error details to debug and share with support. From ef85b57eb6fdc11467df8ae48c633a163560b93f Mon Sep 17 00:00:00 2001 From: Automattic Release Bot Date: Mon, 18 Mar 2024 16:42:09 +0000 Subject: [PATCH 9/9] Freeze strings for translation --- fastlane/resources/values/strings.xml | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/fastlane/resources/values/strings.xml b/fastlane/resources/values/strings.xml index 82adbf31dd1d..36c4a2bb7004 100644 --- a/fastlane/resources/values/strings.xml +++ b/fastlane/resources/values/strings.xml @@ -1629,14 +1629,6 @@ 1 Like %d Likes Error loading like data. %s. - - <a href="">You</a> like this. - <a href="">You and 1 blogger</a> like this. - <a href="">You and %1$s bloggers</a> like this. - <a href="">1 blogger</a> likes this. - <a href="">%1$s bloggers</a> like this. Reader @@ -1720,6 +1712,8 @@ Your draft is uploading Post converted back to draft Failed to insert media.\nPlease tap to retry. + Updating post content + Failed to update post content Post settings @@ -4802,4 +4796,12 @@ translators: %s: Select control option value e.g: "Auto, 25%". --> Edit video Video caption. Empty Video caption. %s + Button to copy error details + Button to copy post text + Copy error details + Copy post text + Tap here to copy error details + Tap here to copy post text + The editor has encountered an unexpected error + You can copy your post text in case your content is impacted. Copy error details to debug and share with support.