Skip to content

Commit 001af38

Browse files
pmusolinopmusolino
authored
Merge branch 'trunk' into issue/14004-better-application-password-disabled-note-take-2
2 parents 2c7f417 + a477857 commit 001af38

File tree

171 files changed

+2643
-1419
lines changed

Some content is hidden

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

171 files changed

+2643
-1419
lines changed

‎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.7
5+
This update brings improvements to media library and login experience. You'll find enhanced accessibility in tax-related views and clearer product image organization with cover tags to help you manage your store. Update now for a smoother WooCommerce experience!
6+
47
## 21.6
58
Experience a refreshed WooCommerce app with an updated look that aligns with our new branding! We’ve also improved payment reliability—card reader updates now handle low battery issues better, and errors during payments and refunds are managed more smoothly. Enjoy a more seamless and polished experience in every transaction.
69

‎Experiments/Experiments.xcodeproj/project.pbxproj‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
3022E2766134CE2735C73FC6 /* Pods-ExperimentsTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ExperimentsTests.debug.xcconfig"; path = "Target Support Files/Pods-ExperimentsTests/Pods-ExperimentsTests.debug.xcconfig"; sourceTree = "<group>"; };
4848
33CEC0C5283FD4C9EF8C6A3C /* Pods_Experiments.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Experiments.framework; sourceTree = BUILT_PRODUCTS_DIR; };
4949
3F9DB5FBFF7A42EFBCB746F3 /* Pods-ExperimentsTests.release-alpha.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ExperimentsTests.release-alpha.xcconfig"; path = "Target Support Files/Pods-ExperimentsTests/Pods-ExperimentsTests.release-alpha.xcconfig"; sourceTree = "<group>"; };
50+
3FA7D9FB2D547E1700CE5611 /* Experiments.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Experiments.xcconfig; sourceTree = "<group>"; };
5051
7C831644164B49828A485590 /* Pods-ExperimentsTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ExperimentsTests.release.xcconfig"; path = "Target Support Files/Pods-ExperimentsTests/Pods-ExperimentsTests.release.xcconfig"; sourceTree = "<group>"; };
5152
8CB554DFAAD3EF41D17099C4 /* Pods-Experiments.release-alpha.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Experiments.release-alpha.xcconfig"; path = "Target Support Files/Pods-Experiments/Pods-Experiments.release-alpha.xcconfig"; sourceTree = "<group>"; };
5253
AAC7C082DD376957B4676401 /* Pods_ExperimentsTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_ExperimentsTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -113,6 +114,7 @@
113114
EE2EDFDE29879331004E702B /* ABTestVariationProvider.swift */,
114115
EEC8C0EC298A92F10047B4CB /* CachedABTestVariationProvider.swift */,
115116
EEC8C0EE298A939C0047B4CB /* VariationCache.swift */,
117+
3FA7D9FB2D547E1700CE5611 /* Experiments.xcconfig */,
116118
);
117119
path = Experiments;
118120
sourceTree = "<group>";
@@ -361,6 +363,7 @@
361363
/* Begin XCBuildConfiguration section */
362364
0270C09327069A8900FC799F /* Debug */ = {
363365
isa = XCBuildConfiguration;
366+
baseConfigurationReference = 3FA7D9FB2D547E1700CE5611 /* Experiments.xcconfig */;
364367
buildSettings = {
365368
ALWAYS_SEARCH_USER_PATHS = NO;
366369
CLANG_ANALYZER_NONNULL = YES;
@@ -412,7 +415,6 @@
412415
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
413416
GCC_WARN_UNUSED_FUNCTION = YES;
414417
GCC_WARN_UNUSED_VARIABLE = YES;
415-
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
416418
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
417419
MTL_FAST_MATH = YES;
418420
ONLY_ACTIVE_ARCH = YES;
@@ -426,6 +428,7 @@
426428
};
427429
0270C09427069A8900FC799F /* Release */ = {
428430
isa = XCBuildConfiguration;
431+
baseConfigurationReference = 3FA7D9FB2D547E1700CE5611 /* Experiments.xcconfig */;
429432
buildSettings = {
430433
ALWAYS_SEARCH_USER_PATHS = NO;
431434
CLANG_ANALYZER_NONNULL = YES;
@@ -471,7 +474,6 @@
471474
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
472475
GCC_WARN_UNUSED_FUNCTION = YES;
473476
GCC_WARN_UNUSED_VARIABLE = YES;
474-
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
475477
MTL_ENABLE_DEBUG_INFO = NO;
476478
MTL_FAST_MATH = YES;
477479
SDKROOT = iphoneos;
@@ -587,6 +589,7 @@
587589
};
588590
02AB82F02706A9EA008D7334 /* Release-Alpha */ = {
589591
isa = XCBuildConfiguration;
592+
baseConfigurationReference = 3FA7D9FB2D547E1700CE5611 /* Experiments.xcconfig */;
590593
buildSettings = {
591594
ALWAYS_SEARCH_USER_PATHS = NO;
592595
CLANG_ANALYZER_NONNULL = YES;
@@ -632,7 +635,6 @@
632635
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
633636
GCC_WARN_UNUSED_FUNCTION = YES;
634637
GCC_WARN_UNUSED_VARIABLE = YES;
635-
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
636638
MTL_ENABLE_DEBUG_INFO = NO;
637639
MTL_FAST_MATH = YES;
638640
SDKROOT = iphoneos;

‎Experiments/Experiments/DefaultFeatureFlagService.swift‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,6 @@ public struct DefaultFeatureFlagService: FeatureFlagService {
9191
return true
9292
case .acceptCashForPointOfSale:
9393
return true
94-
case .variableProductsInPointOfSale:
95-
return true
9694
case .hideSitesInStorePicker:
9795
return true
9896
case .filterHistoryOnOrderAndProductLists:

‎Experiments/Experiments/Experiments.xcconfig‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "../../config/Common.xcconfig"

‎Experiments/Experiments/FeatureFlag.swift‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -197,10 +197,6 @@ public enum FeatureFlag: Int {
197197
///
198198
case acceptCashForPointOfSale
199199

200-
/// Supports variable products in POS.
201-
///
202-
case variableProductsInPointOfSale
203-
204200
/// Supports hiding sites from the store picker
205201
///
206202
case hideSitesInStorePicker

‎Fakes/Fakes.xcodeproj/project.pbxproj‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
26EEDC8C26FE1C1C00D5BA0E /* Yosemite.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Yosemite.framework; sourceTree = BUILT_PRODUCTS_DIR; };
4646
26EEDC8E26FE1C7B00D5BA0E /* Networking.generated.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Networking.generated.swift; sourceTree = "<group>"; };
4747
26EEDC8F26FE1C7B00D5BA0E /* Yosemite.generated.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Yosemite.generated.swift; sourceTree = "<group>"; };
48+
3FA7DA002D547F2600CE5611 /* Fakes.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Fakes.xcconfig; sourceTree = "<group>"; };
4849
/* End PBXFileReference section */
4950

5051
/* Begin PBXFrameworksBuildPhase section */
@@ -97,6 +98,7 @@
9798
26106B3B25FA4F5F0000DF30 /* Products */,
9899
26CA6D2425F6C87800B01F48 /* Fakes.h */,
99100
26CA6D2525F6C87800B01F48 /* Info.plist */,
101+
3FA7DA002D547F2600CE5611 /* Fakes.xcconfig */,
100102
);
101103
path = Fakes;
102104
sourceTree = "<group>";
@@ -209,6 +211,7 @@
209211
/* Begin XCBuildConfiguration section */
210212
26CA6D2725F6C87800B01F48 /* Debug */ = {
211213
isa = XCBuildConfiguration;
214+
baseConfigurationReference = 3FA7DA002D547F2600CE5611 /* Fakes.xcconfig */;
212215
buildSettings = {
213216
ALWAYS_SEARCH_USER_PATHS = NO;
214217
CLANG_ANALYZER_NONNULL = YES;
@@ -260,7 +263,6 @@
260263
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
261264
GCC_WARN_UNUSED_FUNCTION = YES;
262265
GCC_WARN_UNUSED_VARIABLE = YES;
263-
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
264266
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
265267
MTL_FAST_MATH = YES;
266268
ONLY_ACTIVE_ARCH = YES;
@@ -274,6 +276,7 @@
274276
};
275277
26CA6D2825F6C87800B01F48 /* Release */ = {
276278
isa = XCBuildConfiguration;
279+
baseConfigurationReference = 3FA7DA002D547F2600CE5611 /* Fakes.xcconfig */;
277280
buildSettings = {
278281
ALWAYS_SEARCH_USER_PATHS = NO;
279282
CLANG_ANALYZER_NONNULL = YES;
@@ -319,7 +322,6 @@
319322
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
320323
GCC_WARN_UNUSED_FUNCTION = YES;
321324
GCC_WARN_UNUSED_VARIABLE = YES;
322-
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
323325
MTL_ENABLE_DEBUG_INFO = NO;
324326
MTL_FAST_MATH = YES;
325327
SDKROOT = iphoneos;

‎Fakes/Fakes/Fakes.xcconfig‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "../../config/Common.xcconfig"

‎Fakes/Fakes/Networking.generated.swift‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2369,6 +2369,21 @@ extension Networking.StoredProductSettings {
23692369
)
23702370
}
23712371
}
2372+
extension Networking.StoredProductSettings.Setting {
2373+
/// Returns a "ready to use" type filled with fake values.
2374+
///
2375+
public static func fake() -> Networking.StoredProductSettings.Setting {
2376+
.init(
2377+
siteID: .fake(),
2378+
sort: .fake(),
2379+
stockStatusFilter: .fake(),
2380+
productStatusFilter: .fake(),
2381+
productTypeFilter: .fake(),
2382+
productCategoryFilter: .fake(),
2383+
favoriteProduct: .fake()
2384+
)
2385+
}
2386+
}
23722387
extension Networking.Subscription {
23732388
/// Returns a "ready to use" type filled with fake values.
23742389
///

‎Hardware/Hardware.xcodeproj/project.pbxproj‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,7 @@
183183
317975C1274EBC1F004357B1 /* DeclineReason+Stripe.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "DeclineReason+Stripe.swift"; sourceTree = "<group>"; };
184184
317975C3274ED591004357B1 /* DeclineReasonTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeclineReasonTests.swift; sourceTree = "<group>"; };
185185
3CF9348BADD5E0518080A61A /* Pods-Hardware.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Hardware.debug.xcconfig"; path = "Target Support Files/Pods-Hardware/Pods-Hardware.debug.xcconfig"; sourceTree = "<group>"; };
186+
3FA7D9FD2D547E6D00CE5611 /* Hardware.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Hardware.xcconfig; sourceTree = "<group>"; };
186187
47BDD50287B7B0CF8D769BFC /* Pods-PrinterPlayground.release-alpha.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PrinterPlayground.release-alpha.xcconfig"; path = "Target Support Files/Pods-PrinterPlayground/Pods-PrinterPlayground.release-alpha.xcconfig"; sourceTree = "<group>"; };
187188
55CD4BB3273E617C007686D3 /* ReceiptRendererTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReceiptRendererTest.swift; sourceTree = "<group>"; };
188189
9726331F55A9621F2F887E13 /* Pods-Hardware.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Hardware.release.xcconfig"; path = "Target Support Files/Pods-Hardware/Pods-Hardware.release.xcconfig"; sourceTree = "<group>"; };
@@ -425,6 +426,7 @@
425426
D88FDB1D25DD218800CB0DBD /* CardReader */,
426427
D88FDB0225DD216B00CB0DBD /* Hardware.h */,
427428
D88FDB0325DD216B00CB0DBD /* Info.plist */,
429+
3FA7D9FD2D547E6D00CE5611 /* Hardware.xcconfig */,
428430
);
429431
path = Hardware;
430432
sourceTree = "<group>";
@@ -967,6 +969,7 @@
967969
/* Begin XCBuildConfiguration section */
968970
D88FDB1125DD216B00CB0DBD /* Debug */ = {
969971
isa = XCBuildConfiguration;
972+
baseConfigurationReference = 3FA7D9FD2D547E6D00CE5611 /* Hardware.xcconfig */;
970973
buildSettings = {
971974
ALWAYS_SEARCH_USER_PATHS = NO;
972975
CLANG_ANALYZER_NONNULL = YES;
@@ -1018,7 +1021,6 @@
10181021
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
10191022
GCC_WARN_UNUSED_FUNCTION = YES;
10201023
GCC_WARN_UNUSED_VARIABLE = YES;
1021-
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
10221024
LD_RUNPATH_SEARCH_PATHS = "";
10231025
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
10241026
MTL_FAST_MATH = YES;
@@ -1033,6 +1035,7 @@
10331035
};
10341036
D88FDB1225DD216B00CB0DBD /* Release */ = {
10351037
isa = XCBuildConfiguration;
1038+
baseConfigurationReference = 3FA7D9FD2D547E6D00CE5611 /* Hardware.xcconfig */;
10361039
buildSettings = {
10371040
ALWAYS_SEARCH_USER_PATHS = NO;
10381041
CLANG_ANALYZER_NONNULL = YES;
@@ -1078,7 +1081,6 @@
10781081
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
10791082
GCC_WARN_UNUSED_FUNCTION = YES;
10801083
GCC_WARN_UNUSED_VARIABLE = YES;
1081-
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
10821084
LD_RUNPATH_SEARCH_PATHS = "";
10831085
MTL_ENABLE_DEBUG_INFO = NO;
10841086
MTL_FAST_MATH = YES;
@@ -1199,6 +1201,7 @@
11991201
};
12001202
D88FDBDD25DD248C00CB0DBD /* Release-Alpha */ = {
12011203
isa = XCBuildConfiguration;
1204+
baseConfigurationReference = 3FA7D9FD2D547E6D00CE5611 /* Hardware.xcconfig */;
12021205
buildSettings = {
12031206
ALWAYS_SEARCH_USER_PATHS = NO;
12041207
CLANG_ANALYZER_NONNULL = YES;
@@ -1244,7 +1247,6 @@
12441247
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
12451248
GCC_WARN_UNUSED_FUNCTION = YES;
12461249
GCC_WARN_UNUSED_VARIABLE = YES;
1247-
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
12481250
LD_RUNPATH_SEARCH_PATHS = "";
12491251
MTL_ENABLE_DEBUG_INFO = NO;
12501252
MTL_FAST_MATH = YES;

‎Hardware/Hardware/Hardware.xcconfig‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "../../config/Common.xcconfig"

0 commit comments

Comments
 (0)