Skip to content

Commit 2bbb123

Browse files
committed
Merge branch 'trunk' into issue-15480/email_encoding_rfc_3986
# Conflicts: # build.gradle
2 parents 0f69d9b + 9292f9d commit 2bbb123

368 files changed

Lines changed: 1451 additions & 1556 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.buildkite/commands/instrumented-tests.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ echo "--- :closed_lock_with_key: Installing Secrets"
77
bundle exec fastlane run configure_apply
88

99
echo "--- 🧪 Testing"
10-
bundle exec fastlane build_and_instrumented_test
10+
bundle exec fastlane build_and_run_instrumented_test

.buildkite/pipeline.yml

Lines changed: 64 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -5,31 +5,36 @@ common_params:
55
- automattic/bash-cache#2.1.0
66

77
steps:
8-
- label: "checkstyle"
9-
command: |
10-
cp gradle.properties-example gradle.properties
11-
./gradlew checkstyle
12-
plugins: *common_plugins
13-
artifact_paths:
14-
- "**/build/reports/checkstyle/checkstyle.*"
8+
#################
9+
# Linters
10+
#################
11+
- group: "🕵️‍♂️ Linters"
12+
steps:
13+
- label: "checkstyle"
14+
command: |
15+
cp gradle.properties-example gradle.properties
16+
./gradlew checkstyle
17+
plugins: *common_plugins
18+
artifact_paths:
19+
- "**/build/reports/checkstyle/checkstyle.*"
1520

16-
- label: "detekt"
17-
command: |
18-
cp gradle.properties-example gradle.properties
19-
./gradlew detekt
20-
plugins: *common_plugins
21-
artifact_paths:
22-
- "**/build/reports/detekt/detekt.html"
21+
- label: "detekt"
22+
command: |
23+
cp gradle.properties-example gradle.properties
24+
./gradlew detekt
25+
plugins: *common_plugins
26+
artifact_paths:
27+
- "**/build/reports/detekt/detekt.html"
2328

24-
- label: "Lint WordPress"
25-
command: ".buildkite/commands/lint.sh wordpress"
26-
artifact_paths:
27-
- "**/build/reports/lint-results*.*"
29+
- label: "Lint WordPress"
30+
command: ".buildkite/commands/lint.sh wordpress"
31+
artifact_paths:
32+
- "**/build/reports/lint-results*.*"
2833

29-
# - label: "Lint Jetpack"
30-
# command: ".buildkite/commands/lint.sh jetpack"
31-
# artifact_paths:
32-
# - "**/build/reports/lint-results*.*"
34+
# - label: "Lint Jetpack"
35+
# command: ".buildkite/commands/lint.sh jetpack"
36+
# artifact_paths:
37+
# - "**/build/reports/lint-results*.*"
3338

3439
- label: "Dependency Tree Diff"
3540
command: |
@@ -38,36 +43,49 @@ steps:
3843
if: build.pull_request.id != null
3944
plugins: *common_plugins
4045

41-
- label: "Test WordPress"
42-
command: |
43-
cp gradle.properties-example gradle.properties
44-
./gradlew testWordpressVanillaRelease
45-
plugins: *common_plugins
46+
#################
47+
# Unit Tests
48+
#################
49+
- group: "🔬 Unit Tests"
50+
steps:
51+
- label: "Test WordPress"
52+
command: |
53+
cp gradle.properties-example gradle.properties
54+
./gradlew testWordpressVanillaRelease
55+
plugins: *common_plugins
4656

47-
- label: "Test Processors"
48-
command: |
49-
cp gradle.properties-example gradle.properties
50-
./gradlew :libs:processors:test
51-
plugins: *common_plugins
57+
- label: "Test Processors"
58+
command: |
59+
cp gradle.properties-example gradle.properties
60+
./gradlew :libs:processors:test
61+
plugins: *common_plugins
5262

53-
- label: "Test Image Editor"
54-
command: |
55-
cp gradle.properties-example gradle.properties
56-
./gradlew :libs:image-editor:test
57-
plugins: *common_plugins
63+
- label: "Test Image Editor"
64+
command: |
65+
cp gradle.properties-example gradle.properties
66+
./gradlew :libs:image-editor:test
67+
plugins: *common_plugins
5868

59-
- label: "Instrumented tests"
69+
#################
70+
# Instrumented (aka UI) Tests
71+
#################
72+
- label: "🔬 Instrumented tests"
6073
command: ".buildkite/commands/instrumented-tests.sh"
6174
plugins: *common_plugins
6275
artifact_paths:
6376
- "**/build/instrumented-tests/**/*"
6477

65-
- label: "🛠 WordPress Installable Build"
66-
command: ".buildkite/commands/installable-build.sh wordpress"
67-
if: build.pull_request.id != null
68-
plugins: *common_plugins
78+
#################
79+
# Create Installable Builds for WP and JP
80+
#################
81+
- group: "🛠 Installable Builds"
82+
steps:
83+
- label: "🛠 WordPress Installable Build"
84+
command: ".buildkite/commands/installable-build.sh wordpress"
85+
if: build.pull_request.id != null
86+
plugins: *common_plugins
6987

70-
- label: "🛠 Jetpack Installable Build"
71-
command: ".buildkite/commands/installable-build.sh jetpack"
72-
if: build.pull_request.id != null
73-
plugins: *common_plugins
88+
- label: "🛠 Jetpack Installable Build"
89+
command: ".buildkite/commands/installable-build.sh jetpack"
90+
if: build.pull_request.id != null
91+
plugins: *common_plugins

CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/WordPress/src/androidTest/ @wordpress-mobile/mobile-ui-testing-squad

Gemfile.lock

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ GEM
116116
xcodeproj (>= 1.13.0, < 2.0.0)
117117
xcpretty (~> 0.3.0)
118118
xcpretty-travis-formatter (>= 0.0.3)
119-
fastlane-plugin-wpmreleasetoolkit (5.0.0)
119+
fastlane-plugin-wpmreleasetoolkit (5.2.0)
120120
activesupport (~> 5)
121121
bigdecimal (~> 1.4)
122122
buildkit (~> 1.5)
@@ -200,7 +200,7 @@ GEM
200200
octokit (4.25.1)
201201
faraday (>= 1, < 3)
202202
sawyer (~> 0.9)
203-
oj (3.13.17)
203+
oj (3.13.19)
204204
optimist (3.0.1)
205205
options (2.3.2)
206206
optparse (0.1.1)
@@ -247,7 +247,7 @@ GEM
247247
tty-screen (0.8.1)
248248
tty-spinner (0.9.3)
249249
tty-cursor (~> 0.7)
250-
tzinfo (1.2.9)
250+
tzinfo (1.2.10)
251251
thread_safe (~> 0.1)
252252
uber (0.1.0)
253253
unf (0.1.4)
@@ -273,9 +273,9 @@ PLATFORMS
273273

274274
DEPENDENCIES
275275
fastlane (~> 2)
276-
fastlane-plugin-wpmreleasetoolkit (~> 5.0)
276+
fastlane-plugin-wpmreleasetoolkit (~> 5.2)
277277
nokogiri
278278
rmagick (~> 4.1)
279279

280280
BUNDLED WITH
281-
2.3.9
281+
2.3.16

RELEASE-NOTES.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,17 @@
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]
610
* [*] Login: Fix an issue preventing some users to log-in in with email addresses containing a single quote [https://github.com/wordpress-mobile/WordPress-Android/pull/15526]
711

12+
* [***] [internal] Block Editor: List block: Adds support for V2 behind a feature flag [https://github.com/WordPress/gutenberg/pull/42702]
13+
* [*] Jetpack App: Use the Jetpack green color for the skip buttons text in site creation [https://github.com/wordpress-mobile/WordPress-Android/pull/16994]
14+
* [**] App Settings: Show a label with the current language of the app under "Interface Language". [https://github.com/wordpress-mobile/WordPress-Android/pull/17004]
815

916
20.4
1017
-----

WordPress/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,6 @@ android {
109109
buildConfigField "boolean", "SITE_NAME", "false"
110110
buildConfigField "boolean", "LAND_ON_THE_EDITOR", "false"
111111
buildConfigField "boolean", "BLOGGING_PROMPTS", "false"
112-
buildConfigField "boolean", "STATS_REVAMP_V2", "false"
113112
buildConfigField "boolean", "QUICK_START_EXISTING_USERS_V2", "false"
114113
buildConfigField "boolean", "QRCODE_AUTH_FLOW", "false"
115114
buildConfigField "boolean", "BETA_SITE_DESIGNS", "false"

WordPress/jetpack_metadata/PlayStoreStrings.po

Lines changed: 51 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,29 +28,66 @@ msgid ""
2828
"- Use the block recovery option to bring back unexpected or invalid content in a block.\n"
2929
msgstr ""
3030

31-
#. translators: Shorter Release notes for this version to be displayed in the Play Store. Limit to 500 characters including spaces and commas!
31+
#. translators: Title to be displayed in the Play Store. Limit to 30 characters including spaces and commas!
32+
msgctxt "play_store_app_title"
33+
msgid "Jetpack – Website Builder"
34+
msgstr ""
35+
3236
#. translators: Short description of the Jetpack app to be displayed in the Play Store. Limit to 80 characters including spaces and commas!
33-
msgctxt "short-description"
34-
msgid "Powerful WordPress security and performance tools."
37+
msgctxt "play_store_promo"
38+
msgid "Build your WordPress website & blog; create posts, add photos & track analytics!"
3539
msgstr ""
3640

3741
#. translators: Multi-paragraph text used to display in the Play Store. Limit to 4000 characters including spaces and commas!
38-
msgctxt "app-store-description"
42+
msgctxt "play_store_desc"
3943
msgid ""
40-
"Get powerful security and performance tools in your pocket with Jetpack for Android.\n"
44+
"Jetpack for WordPress\n"
4145
"\n"
42-
"Restore your site from anywhere if something goes wrong. Scan for threats and resolve them with a tap. Keep tabs on site activity to see who changed what and when. Check your stats to see what new countries today’s visitors are coming from.\n"
46+
"Put the power of web publishing in your pocket. Jetpack is a website creator and so much more!\n"
4347
"\n"
44-
"The app also supports WordPress features that you expect. Draft a spontaneous haiku from the couch. Snap and post a photo on your lunch break. Respond to your latest comments.\n"
48+
"CREATE\n"
4549
"\n"
46-
"Jetpack for Android supports WordPress sites with Jetpack enabled and an account connected to WordPress.com.\n"
50+
"Give your big ideas a home on the web. Jetpack for Android is a website builder and a blog maker powered by WordPress. Use it to create your website.\n"
51+
"Pick the right look and feel from a wide selection of WordPress themes, then customize with photos, colors, and fonts so it’s uniquely you.\n"
52+
"Built-in Quick Start tips guide you through the setup basics to set your new website up for success. (We’re not just a website creator — we’re your partner and cheering squad!)\n"
4753
"\n"
48-
"View the Privacy Notice for California Users at https://automattic.com/privacy/#california-consumer-privacy-act-ccpa.\n"
49-
msgstr ""
50-
51-
#. translators: Title to be displayed in the Play Store. Limit to 30 characters including spaces and commas!
52-
msgctxt "app-store-name"
53-
msgid "Jetpack"
54+
"ANALYTICS & INSIGHTS\n"
55+
"\n"
56+
"Check your website’s stats in real time to keep track of the activity on your site.\n"
57+
"Track which posts and pages get the most traffic over time by exploring daily, weekly, monthly, and yearly insights.\n"
58+
"Use the traffic map to see which countries your visitors come from.\n"
59+
"\n"
60+
"NOTIFICATIONS\n"
61+
"\n"
62+
"Get notifications about comments, likes, and new followers so you can see people reacting to your website as it happens.\n"
63+
"Reply to new comments as they show up to keep the conversation flowing and acknowledge your readers.\n"
64+
"\n"
65+
"PUBLISH\n"
66+
"\n"
67+
"Create updates, stories, photo essays announcements — anything! — with the editor.\n"
68+
"Bring your posts and pages to life with photos and video from your camera and albums, or find the perfect image with the in-app collection of free-to-use pro photography.\n"
69+
"Save ideas as drafts and come back to them when your muse returns, or schedule new posts for the future so your site is always fresh and engaging.\n"
70+
"Add tags and categories to help new readers discover your posts, and watch your audience grow.\n"
71+
"\n"
72+
"SECURITY & PERFORMANCE TOOLS\n"
73+
"\n"
74+
"Restore your site from anywhere if something goes wrong.\n"
75+
"Scan for threats and resolve them with a tap.\n"
76+
"Keep tabs on site activity to see who changed what and when.\n"
77+
"\n"
78+
"READER\n"
79+
"\n"
80+
"Jetpack is more than a blog maker — use it to connect with a community of writers in the WordPress.com Reader. Explore thousands of topics by tag, discover new authors and organizations, and follow the ones who pique your interest.\n"
81+
"Hang on to the posts that fascinate you with the Save for later feature.\n"
82+
"\n"
83+
"SHARE\n"
84+
"\n"
85+
"Set up automated sharing to tell your followers on social media when you publish a new post. Automatically cross-post to Facebook, Twitter, and more.\n"
86+
"Add social sharing buttons to your posts so your visitors can share them with their network, and let your fans become your ambassadors.\n"
87+
"\n"
88+
"Learn more at https://jetpack.com/mobile\n"
89+
"\n"
90+
"California users privacy notice: https://automattic.com/privacy/#california-consumer-privacy-act-ccpa\n"
5491
msgstr ""
5592

5693
#. Description for the first app store image
Lines changed: 43 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,47 @@
1-
Get powerful security and performance tools in your pocket with Jetpack for Android.
1+
Jetpack for WordPress
22

3-
Restore your site from anywhere if something goes wrong. Scan for threats and resolve them with a tap. Keep tabs on site activity to see who changed what and when. Check your stats to see what new countries today’s visitors are coming from.
3+
Put the power of web publishing in your pocket. Jetpack is a website creator and so much more!
44

5-
The app also supports WordPress features that you expect. Draft a spontaneous haiku from the couch. Snap and post a photo on your lunch break. Respond to your latest comments.
5+
CREATE
66

7-
Jetpack for Android supports WordPress sites with Jetpack enabled and an account connected to WordPress.com.
7+
Give your big ideas a home on the web. Jetpack for Android is a website builder and a blog maker powered by WordPress. Use it to create your website.
8+
Pick the right look and feel from a wide selection of WordPress themes, then customize with photos, colors, and fonts so it’s uniquely you.
9+
Built-in Quick Start tips guide you through the setup basics to set your new website up for success. (We’re not just a website creator — we’re your partner and cheering squad!)
810

9-
View the Privacy Notice for California Users at https://automattic.com/privacy/#california-consumer-privacy-act-ccpa.
11+
ANALYTICS & INSIGHTS
12+
13+
Check your website’s stats in real time to keep track of the activity on your site.
14+
Track which posts and pages get the most traffic over time by exploring daily, weekly, monthly, and yearly insights.
15+
Use the traffic map to see which countries your visitors come from.
16+
17+
NOTIFICATIONS
18+
19+
Get notifications about comments, likes, and new followers so you can see people reacting to your website as it happens.
20+
Reply to new comments as they show up to keep the conversation flowing and acknowledge your readers.
21+
22+
PUBLISH
23+
24+
Create updates, stories, photo essays announcements — anything! — with the editor.
25+
Bring your posts and pages to life with photos and video from your camera and albums, or find the perfect image with the in-app collection of free-to-use pro photography.
26+
Save ideas as drafts and come back to them when your muse returns, or schedule new posts for the future so your site is always fresh and engaging.
27+
Add tags and categories to help new readers discover your posts, and watch your audience grow.
28+
29+
SECURITY & PERFORMANCE TOOLS
30+
31+
Restore your site from anywhere if something goes wrong.
32+
Scan for threats and resolve them with a tap.
33+
Keep tabs on site activity to see who changed what and when.
34+
35+
READER
36+
37+
Jetpack is more than a blog maker — use it to connect with a community of writers in the WordPress.com Reader. Explore thousands of topics by tag, discover new authors and organizations, and follow the ones who pique your interest.
38+
Hang on to the posts that fascinate you with the Save for later feature.
39+
40+
SHARE
41+
42+
Set up automated sharing to tell your followers on social media when you publish a new post. Automatically cross-post to Facebook, Twitter, and more.
43+
Add social sharing buttons to your posts so your visitors can share them with their network, and let your fans become your ambassadors.
44+
45+
Learn more at https://jetpack.com/mobile
46+
47+
California users privacy notice: https://automattic.com/privacy/#california-consumer-privacy-act-ccpa
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+
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Powerful WordPress security and performance tools.
1+
Build your WordPress website & blog; create posts, add photos & track analytics!

0 commit comments

Comments
 (0)