Skip to content

Commit 1687202

Browse files
authored
Merge branch 'release/21.5' into merge/release-21.4-into-release-21.5
2 parents b529903 + d45eebc commit 1687202

File tree

250 files changed

+8734
-3248
lines changed

Some content is hidden

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

250 files changed

+8734
-3248
lines changed

.buildkite/shared-pipeline-vars

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# to set up some variables that will be interpolated in the `.yml` pipeline before uploading it.
55

66
XCODE_VERSION=$(sed 's/^~> *//' .xcode-version)
7-
CI_TOOLKIT_PLUGIN_VERSION="3.7.1"
7+
CI_TOOLKIT_PLUGIN_VERSION="3.9.1"
88

99
# Note: `-v4` suffix was added to use xcode-16.1-v4 image; remember to remove that suffix during the next Xcode update
1010
export IMAGE_ID="xcode-$XCODE_VERSION-v4"

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
<!--
22
Contains editorialized release notes. Raw release notes should go into `RELEASE-NOTES.txt`.
33
-->
4+
## 21.5
5+
Get ready for a smoother WooCommerce experience! This update brings smarter AI-powered product previews, instant dashboard stats, and improved email receipts for failed payments. We’ve also fine-tuned order creation, enhanced Jetpack setups, and enabled previews for coming-soon stores. Plus, we’ve addressed navigation, database recovery, and streamlined workflows.
6+
47
## 21.4
58
This update introduces the ability to hide specific stores from the store picker, perfect for agencies managing multiple sites. We’ve also enhanced plugin info fetching to handle unexpected data types, ensuring smoother performance. Additionally, a bug on iPad causing order creation issues with custom amounts has been resolved. Enjoy a more focused and reliable experience!
69

Experiments/Experiments/DefaultFeatureFlagService.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,11 +94,11 @@ public struct DefaultFeatureFlagService: FeatureFlagService {
9494
case .sendReceiptsForPointOfSale:
9595
return true
9696
case .acceptCashForPointOfSale:
97-
return false
97+
return true
9898
case .tapToPayEducation:
9999
return true
100100
case .variableProductsInPointOfSale:
101-
return buildConfig == .localDeveloper || buildConfig == .alpha
101+
return true
102102
case .hideSitesInStorePicker:
103103
return true
104104
case .filterHistoryOnOrderAndProductLists:

Fakes/Fakes/Networking.generated.swift

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2761,6 +2761,23 @@ extension Networking.WooShippingAccountSettings {
27612761
)
27622762
}
27632763
}
2764+
extension Networking.WooShippingAddress {
2765+
/// Returns a "ready to use" type filled with fake values.
2766+
///
2767+
public static func fake() -> Networking.WooShippingAddress {
2768+
.init(
2769+
company: .fake(),
2770+
name: .fake(),
2771+
phone: .fake(),
2772+
country: .fake(),
2773+
state: .fake(),
2774+
address1: .fake(),
2775+
address2: .fake(),
2776+
city: .fake(),
2777+
postcode: .fake()
2778+
)
2779+
}
2780+
}
27642781
extension Networking.WooShippingCarrierPredefinedOptions {
27652782
/// Returns a "ready to use" type filled with fake values.
27662783
///

Gemfile.lock

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ GEM
55
base64
66
nkf
77
rexml
8-
activesupport (7.2.2)
8+
activesupport (7.2.2.1)
99
base64
1010
benchmark (>= 0.3)
1111
bigdecimal
@@ -26,25 +26,25 @@ GEM
2626
ast (2.4.2)
2727
atomos (0.1.3)
2828
aws-eventstream (1.3.0)
29-
aws-partitions (1.1011.0)
30-
aws-sdk-core (3.213.0)
29+
aws-partitions (1.1040.0)
30+
aws-sdk-core (3.216.0)
3131
aws-eventstream (~> 1, >= 1.3.0)
3232
aws-partitions (~> 1, >= 1.992.0)
3333
aws-sigv4 (~> 1.9)
3434
jmespath (~> 1, >= 1.6.1)
35-
aws-sdk-kms (1.96.0)
36-
aws-sdk-core (~> 3, >= 3.210.0)
35+
aws-sdk-kms (1.97.0)
36+
aws-sdk-core (~> 3, >= 3.216.0)
3737
aws-sigv4 (~> 1.5)
38-
aws-sdk-s3 (1.172.0)
39-
aws-sdk-core (~> 3, >= 3.210.0)
38+
aws-sdk-s3 (1.178.0)
39+
aws-sdk-core (~> 3, >= 3.216.0)
4040
aws-sdk-kms (~> 1)
4141
aws-sigv4 (~> 1.5)
42-
aws-sigv4 (1.10.1)
42+
aws-sigv4 (1.11.0)
4343
aws-eventstream (~> 1, >= 1.0.2)
4444
babosa (1.0.4)
4545
base64 (0.2.0)
4646
benchmark (0.4.0)
47-
bigdecimal (3.1.8)
47+
bigdecimal (3.1.9)
4848
buildkit (1.6.1)
4949
sawyer (>= 0.6)
5050
chroma (0.2.0)
@@ -97,8 +97,8 @@ GEM
9797
colored2 (3.1.2)
9898
commander (4.6.0)
9999
highline (~> 2.0.0)
100-
concurrent-ruby (1.3.4)
101-
connection_pool (2.4.1)
100+
concurrent-ruby (1.3.5)
101+
connection_pool (2.5.0)
102102
cork (0.3.0)
103103
colored2 (~> 3.1)
104104
danger (9.5.1)
@@ -158,17 +158,17 @@ GEM
158158
faraday-http-cache (2.5.1)
159159
faraday (>= 0.8)
160160
faraday-httpclient (1.0.1)
161-
faraday-multipart (1.0.4)
162-
multipart-post (~> 2)
161+
faraday-multipart (1.1.0)
162+
multipart-post (~> 2.0)
163163
faraday-net_http (1.0.2)
164164
faraday-net_http_persistent (1.2.0)
165165
faraday-patron (1.0.0)
166166
faraday-rack (1.0.0)
167167
faraday-retry (1.0.3)
168168
faraday_middleware (1.2.1)
169169
faraday (~> 1.0)
170-
fastimage (2.3.1)
171-
fastlane (2.225.0)
170+
fastimage (2.4.0)
171+
fastlane (2.226.0)
172172
CFPropertyList (>= 2.3, < 4.0.0)
173173
addressable (>= 2.8, < 3.0.0)
174174
artifactory (~> 3.0)
@@ -208,12 +208,12 @@ GEM
208208
tty-spinner (>= 0.8.0, < 1.0.0)
209209
word_wrap (~> 1.0.0)
210210
xcodeproj (>= 1.13.0, < 2.0.0)
211-
xcpretty (~> 0.3.0)
211+
xcpretty (~> 0.4.0)
212212
xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
213213
fastlane-plugin-appcenter (2.1.2)
214214
fastlane-plugin-sentry (1.25.1)
215215
os (~> 1.1, >= 1.1.4)
216-
fastlane-plugin-wpmreleasetoolkit (12.3.3)
216+
fastlane-plugin-wpmreleasetoolkit (12.4.0)
217217
activesupport (>= 6.1.7.1)
218218
buildkit (~> 1.5)
219219
chroma (= 0.2.0)
@@ -277,26 +277,26 @@ GEM
277277
os (>= 0.9, < 2.0)
278278
signet (>= 0.16, < 2.a)
279279
highline (2.0.3)
280-
http-cookie (1.0.7)
280+
http-cookie (1.0.8)
281281
domain_name (~> 0.5)
282282
httpclient (2.8.3)
283-
i18n (1.14.6)
283+
i18n (1.14.7)
284284
concurrent-ruby (~> 1.0)
285285
java-properties (0.3.0)
286286
jmespath (1.6.2)
287-
json (2.8.2)
288-
jwt (2.9.3)
287+
json (2.9.1)
288+
jwt (2.10.1)
289289
base64
290290
kramdown (2.5.1)
291291
rexml (>= 3.3.9)
292292
kramdown-parser-gfm (1.1.0)
293293
kramdown (~> 2.0)
294294
language_server-protocol (3.17.0.3)
295-
logger (1.6.1)
295+
logger (1.6.5)
296296
mini_magick (4.13.2)
297297
mini_mime (1.1.5)
298298
mini_portile2 (2.8.8)
299-
minitest (5.25.1)
299+
minitest (5.25.4)
300300
molinillo (0.8.0)
301301
multi_json (1.15.0)
302302
multipart-post (2.4.1)
@@ -305,10 +305,10 @@ GEM
305305
naturally (2.2.1)
306306
netrc (0.11.0)
307307
nkf (0.2.0)
308-
nokogiri (1.16.7)
308+
nokogiri (1.18.2)
309309
mini_portile2 (~> 2.8.2)
310310
racc (~> 1.4)
311-
nokogiri (1.16.7-x86_64-darwin)
311+
nokogiri (1.18.2-x86_64-darwin)
312312
racc (~> 1.4)
313313
octokit (6.1.1)
314314
faraday (>= 1, < 3)
@@ -321,7 +321,7 @@ GEM
321321
parser (3.3.6.0)
322322
ast (~> 2.4.1)
323323
racc
324-
plist (3.7.1)
324+
plist (3.7.2)
325325
progress_bar (1.3.4)
326326
highline (>= 1.6)
327327
options (~> 2.3.0)
@@ -330,18 +330,18 @@ GEM
330330
racc (1.8.1)
331331
rainbow (3.1.1)
332332
rake (12.3.3)
333-
rake-compiler (1.2.8)
333+
rake-compiler (1.2.9)
334334
rake
335-
rchardet (1.8.0)
335+
rchardet (1.9.0)
336336
regexp_parser (2.9.2)
337337
representable (3.2.0)
338338
declarative (< 0.1.0)
339339
trailblazer-option (>= 0.1.1, < 0.2.0)
340340
uber (< 0.2.0)
341341
retriable (3.1.2)
342-
rexml (3.3.9)
342+
rexml (3.4.0)
343343
rmagick (4.3.0)
344-
rouge (2.0.7)
344+
rouge (3.28.0)
345345
rubocop (1.68.0)
346346
json (~> 2.3)
347347
language_server-protocol (>= 3.17.0)
@@ -359,11 +359,11 @@ GEM
359359
ruby-macho (2.5.1)
360360
ruby-progressbar (1.13.0)
361361
ruby2_keywords (0.0.5)
362-
rubyzip (2.3.2)
362+
rubyzip (2.4.1)
363363
sawyer (0.9.2)
364364
addressable (>= 2.3.5)
365365
faraday (>= 0.17.3, < 3)
366-
securerandom (0.3.2)
366+
securerandom (0.4.1)
367367
security (0.1.5)
368368
signet (0.19.0)
369369
addressable (~> 2.8)
@@ -399,8 +399,8 @@ GEM
399399
colored2 (~> 3.1)
400400
nanaimo (~> 0.4.0)
401401
rexml (>= 3.3.6, < 4.0)
402-
xcpretty (0.3.0)
403-
rouge (~> 2.0.7)
402+
xcpretty (0.4.0)
403+
rouge (~> 3.28.0)
404404
xcpretty-travis-formatter (1.0.1)
405405
xcpretty (~> 0.2, >= 0.0.7)
406406

0 commit comments

Comments
 (0)