Skip to content

Commit 9292f9d

Browse files
AliSoftwareAliSoftware
authored
Merge pull request #17017 from wordpress-mobile/release/20.5
Merge release/20.5 after code freeze (20.5-rc-1)
2 parents 727865b + 052440d commit 9292f9d

7 files changed

Lines changed: 26 additions & 21 deletions

File tree

‎RELEASE-NOTES.txt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
*** PLEASE FOLLOW THIS FORMAT: [<priority indicator, more stars = higher priority>] <description> [<PR URL>]
22

3+
20.6
4+
-----
5+
6+
37
20.5
48
-----
59
* [*] Use larger thumbnail previews for recommended themes during site creation [https://github.com/wordpress-mobile/WordPress-Android/pull/16848]

‎WordPress/jetpack_metadata/release_notes.txt‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
- Gallery/Image block performance improvements in the Block Editor.
2-
- Properly displayed Video blocks (both web and app) for VideoPress-enabled sites.
3-
- Block inserter allows block types to be better organized in collections.
4-
- Alt text footnote spacing adjustment in Image blocks.
1+
* [*] Use larger thumbnail previews for recommended themes during site creation [https://github.com/wordpress-mobile/WordPress-Android/pull/16848]
2+
* [***] [internal] Block Editor: List block: Adds support for V2 behind a feature flag [https://github.com/WordPress/gutenberg/pull/42702]
3+
* [*] Use the Jetpack green color for the skip buttons text in site creation [https://github.com/wordpress-mobile/WordPress-Android/pull/16994]
4+
* [**] App Settings: Show a label with the current language of the app under "Interface Language". [https://github.com/wordpress-mobile/WordPress-Android/pull/17004]
5+

‎WordPress/metadata/release_notes.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
- Gallery/Image block performance improvements in the Block Editor.
2-
- Properly displayed Video blocks (both web and app) for VideoPress-enabled sites.
3-
- Block inserter allows block types to be better organized in collections.
4-
- Alt text footnote spacing adjustment in Image blocks.
1+
* [*] Use larger thumbnail previews for recommended themes during site creation [https://github.com/wordpress-mobile/WordPress-Android/pull/16848]
2+
* [***] [internal] Block Editor: List block: Adds support for V2 behind a feature flag [https://github.com/WordPress/gutenberg/pull/42702]
3+
* [**] App Settings: Show a label with the current language of the app under "Interface Language". [https://github.com/wordpress-mobile/WordPress-Android/pull/17004]
4+

‎build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ plugins {
88
}
99

1010
ext {
11-
wordPressUtilsVersion = 'trunk-68e2995962a5134770e6f9e5b9f258a339e123b2'
11+
wordPressUtilsVersion = '2.7.0'
1212
wordPressLoginVersion = '0.15.0'
1313
gutenbergMobileVersion = 'v1.81.0'
1414
storiesVersion = '1.4.0'
@@ -21,7 +21,7 @@ ext {
2121
coroutinesVersion = '1.5.2'
2222
androidxWorkVersion = "2.7.0"
2323

24-
fluxCVersion = 'trunk-b176f89d8db39be3ef5f2f5f29a21dd9fb3a4ecf'
24+
fluxCVersion = '1.49.0'
2525

2626
appCompatVersion = '1.0.2'
2727
androidxCoreVersion = '1.3.2'

‎fastlane/jetpack_resources/values/strings.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,7 @@
2626

2727
<!-- About button in Me -->
2828
<string name="me_btn_about">About Jetpack</string>
29+
30+
<!-- My Site Initial Tab Default value -->
31+
<string name="initial_screen_entry_value_default_key" translatable="false">@string/initial_screen_entry_value_home</string>
2932
</resources>

‎fastlane/resources/values/strings.xml‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1376,10 +1376,6 @@
13761376

13771377
<!-- Stats Revamp v2 Feature Introduction -->
13781378
<string name="stats_revamp_v2_intro_header_title">Insights update</string>
1379-
<string name="stats_revamp_v2_intro_content">Insights help you understand how your content is performing and what\'s resonating with your audience.</string>
1380-
<string name="stats_revamp_v2_intro_content_note">Learn more in My Site &gt; Stats &gt; Insights</string>
1381-
<string name="stats_revamp_v2_intro_primary_button_text">Try it now</string>
1382-
<string name="stats_revamp_v2_intro_secondary_button_text">Remind me later</string>
13831379
<string name="stats_revamp_v2_update_alert_message">Updated to New Insights to help you understand how your content is performing and what\'s resonating with your audience.</string>
13841380

13851381
<!-- Stats refreshed widgets -->
@@ -4207,11 +4203,12 @@ translators: %s: Select control option value e.g: "Auto, 25%". -->
42074203

42084204
<!-- Jetpack awareness in WordPress App -->
42094205
<string name="wp_jetpack_powered">Jetpack powered</string>
4210-
<string name="wp_jetpack_powered_features">Stats, Reader, Notifications, and other features are powered by Jetpack.</string>
4206+
<string name="wp_jetpack_powered_better_with_jetpack">WordPress is better with Jetpack</string>
4207+
<string name="wp_jetpack_powered_features">The new Jetpack app has Stats, Reader, Notifications, and more that make your WordPress better.</string>
42114208
<string name="wp_jetpack_get_new_jetpack_app">Get the new Jetpack app</string>
42124209
<string name="wp_jetpack_continue_to_reader">Continue to Reader</string>
4213-
<string name="wp_jetpack_continue_to_stats" tools:ignore="UnusedResources">Continue to Stats</string>
4214-
<string name="wp_jetpack_continue_to_notifications" tools:ignore="UnusedResources">Continue to Notifications</string>
4210+
<string name="wp_jetpack_continue_to_stats">Continue to Stats</string>
4211+
<string name="wp_jetpack_continue_to_notifications">Continue to Notifications</string>
42154212
<string name="gutenberg_native_problem_displaying_block_tap_to_attempt_block_recovery" tools:ignore="UnusedResources" a8c-src-lib="gutenberg">Problem displaying block. \nTap to attempt block recovery.</string>
42164213
<string name="gutenberg_native_gradient" tools:ignore="UnusedResources" a8c-src-lib="gutenberg">Gradient</string>
42174214
<string name="gutenberg_native_invalid_url" tools:ignore="UnusedResources" a8c-src-lib="gutenberg">Invalid URL.</string>

‎version.properties‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#Mon, 30 Aug 2021 11:48:28 +0200
22

33
# Version Information for Vanilla / Release builds
4-
versionName=20.4
5-
versionCode=1258
4+
versionName=20.5-rc-1
5+
versionCode=1259
66

77
# Version Information for other flavors: zalpha, wasabi, jalapeno
8-
alpha.versionName=alpha-379
9-
alpha.versionCode=1257
8+
alpha.versionName=alpha-380
9+
alpha.versionCode=1260

0 commit comments

Comments
 (0)