Skip to content

Commit 94575c6

Browse files
committed
Merge branch 'trunk' into feat/3157-search-products-by-sku-storage
* trunk: (41 commits) Update fastlane to 2.210 Remove CURRENT_PROJECT_VERSION override in extension settings Update release notes Remove Widgets Feature Flag Adds comments explaining currency setting storage Capitalize As of Update copy for the widget title and description Updated release notes for 10.4 Update test case name to reflect the correct app state. Upgrade CocoaPods to version 1.11.3 Upgrade project to Xcode 14.0 stable recommended settings Update release notes. Use the Woo blue color instead of the native blue. Refactor entry setup to dedicated methods Remove specific deployment target for widgets extension Update copy Provide formatted updated time when dispatching an entry Update UI for the last refreshed label Mock an action response to prevent the test case sending HTTP request Build WooFoundation framework using app extension safe APIs ...
2 parents e17f2a3 + 7318cfa commit 94575c6

File tree

48 files changed

+520
-85
lines changed

Some content is hidden

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

48 files changed

+520
-85
lines changed

.buildkite/pipeline.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ common_params:
88
repo: "woocommerce/woocommerce-ios/"
99
# Common environment values to use with the `env` key.
1010
- &common_env
11-
IMAGE_ID: xcode-13.4.1
11+
IMAGE_ID: xcode-14
1212

1313
# This is the default pipeline – it will build and test the app
1414
steps:
@@ -68,7 +68,7 @@ steps:
6868
# UI Tests
6969
#################
7070
- label: "🔬 UI Tests (iPhone)"
71-
command: .buildkite/commands/run-ui-tests.sh UITests 'iPhone 11'
71+
command: .buildkite/commands/run-ui-tests.sh UITests 'iPhone 14'
7272
depends_on: "build"
7373
env: *common_env
7474
plugins: *common_plugins

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
Contains editorialized release notes. Raw release notes should go into `RELEASE-NOTES.txt`.
33
-->
44

5+
## 10.4
6+
7+
This release contains a handful of minor improvements to make your experience smoother. It's now possible to set up the Jetpack connection between your self-hosted site and your WP.com account. We continue to make small tweaks and enhancements to the in person payments feature. We hope you notice the love we put into our software.
8+
59
## 10.3
610

711
More love for In-Person Payments and Analytics this time around. We fixed a bug which could prevent you from collecting payments in the app. Card reader connections are more stable. And we fixed an issue where your store's analytics are sometimes not updated.

Experiments/Experiments.xcodeproj/project.pbxproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -463,6 +463,7 @@
463463
isa = XCBuildConfiguration;
464464
baseConfigurationReference = 2B7FCE683D4058A7A16F7946 /* Pods-Experiments.debug.xcconfig */;
465465
buildSettings = {
466+
APPLICATION_EXTENSION_API_ONLY = YES;
466467
CLANG_ENABLE_MODULES = YES;
467468
CODE_SIGN_STYLE = Automatic;
468469
DEFINES_MODULE = YES;
@@ -489,6 +490,7 @@
489490
isa = XCBuildConfiguration;
490491
baseConfigurationReference = AF72D9DB7771E7A5105C88B0 /* Pods-Experiments.release.xcconfig */;
491492
buildSettings = {
493+
APPLICATION_EXTENSION_API_ONLY = YES;
492494
CLANG_ENABLE_MODULES = YES;
493495
CODE_SIGN_STYLE = Automatic;
494496
DEFINES_MODULE = YES;
@@ -611,6 +613,7 @@
611613
isa = XCBuildConfiguration;
612614
baseConfigurationReference = 8CB554DFAAD3EF41D17099C4 /* Pods-Experiments.release-alpha.xcconfig */;
613615
buildSettings = {
616+
APPLICATION_EXTENSION_API_ONLY = YES;
614617
CLANG_ENABLE_MODULES = YES;
615618
CODE_SIGN_STYLE = Automatic;
616619
DEFINES_MODULE = YES;

Experiments/Experiments/DefaultFeatureFlagService.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@ public struct DefaultFeatureFlagService: FeatureFlagService {
3333
return true
3434
case .promptToEnableCodInIppOnboarding:
3535
return true
36-
case .storeWidgets:
37-
return buildConfig == .localDeveloper || buildConfig == .alpha
3836
default:
3937
return true
4038
}

Experiments/Experiments/FeatureFlag.swift

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,4 @@ public enum FeatureFlag: Int {
6969
/// Whether to include the Cash on Delivery enable step in In-Person Payment onboarding
7070
///
7171
case promptToEnableCodInIppOnboarding
72-
73-
/// Enables home screen store widgets.
74-
///
75-
case storeWidgets
7672
}

Gemfile.lock

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ GEM
1717
ast (2.4.2)
1818
atomos (0.1.3)
1919
aws-eventstream (1.2.0)
20-
aws-partitions (1.621.0)
21-
aws-sdk-core (3.134.0)
20+
aws-partitions (1.631.0)
21+
aws-sdk-core (3.148.0)
2222
aws-eventstream (~> 1, >= 1.0.2)
2323
aws-partitions (~> 1, >= 1.525.0)
2424
aws-sigv4 (~> 1.1)
@@ -38,10 +38,10 @@ GEM
3838
sawyer (>= 0.6)
3939
chroma (0.2.0)
4040
claide (1.0.3)
41-
cocoapods (1.11.2)
41+
cocoapods (1.11.3)
4242
addressable (~> 2.8)
4343
claide (>= 1.0.2, < 2.0)
44-
cocoapods-core (= 1.11.2)
44+
cocoapods-core (= 1.11.3)
4545
cocoapods-deintegrate (>= 1.0.3, < 2.0)
4646
cocoapods-downloader (>= 1.4.0, < 2.0)
4747
cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -59,7 +59,7 @@ GEM
5959
cocoapods-catalyst-support (0.1.3)
6060
cocoapods (~> 1.9)
6161
colored2 (~> 3.1)
62-
cocoapods-core (1.11.2)
62+
cocoapods-core (1.11.3)
6363
activesupport (>= 5.0, < 7)
6464
addressable (~> 2.8)
6565
algoliasearch (~> 1.0)
@@ -70,7 +70,7 @@ GEM
7070
public_suffix (~> 4.0)
7171
typhoeus (~> 1.0)
7272
cocoapods-deintegrate (1.0.5)
73-
cocoapods-downloader (1.5.1)
73+
cocoapods-downloader (1.6.3)
7474
cocoapods-plugins (1.0.0)
7575
nap
7676
cocoapods-search (1.0.1)
@@ -124,7 +124,7 @@ GEM
124124
faraday_middleware (1.2.0)
125125
faraday (~> 1.0)
126126
fastimage (2.2.6)
127-
fastlane (2.209.1)
127+
fastlane (2.210.0)
128128
CFPropertyList (>= 2.3, < 4.0.0)
129129
addressable (>= 2.8, < 3.0.0)
130130
artifactory (~> 3.0)
@@ -181,16 +181,16 @@ GEM
181181
progress_bar (~> 1.3)
182182
rake (>= 12.3, < 14.0)
183183
rake-compiler (~> 1.0)
184-
ffi (1.15.4)
184+
ffi (1.15.5)
185185
fourflusher (2.3.1)
186186
fuzzy_match (2.0.4)
187187
gh_inspector (1.1.3)
188188
git (1.12.0)
189189
addressable (~> 2.8)
190190
rchardet (~> 1.8)
191-
google-apis-androidpublisher_v3 (0.25.0)
191+
google-apis-androidpublisher_v3 (0.26.0)
192192
google-apis-core (>= 0.7, < 2.a)
193-
google-apis-core (0.7.0)
193+
google-apis-core (0.7.2)
194194
addressable (~> 2.5, >= 2.5.1)
195195
googleauth (>= 0.16.2, < 2.a)
196196
httpclient (>= 2.8.1, < 3.a)
@@ -210,8 +210,8 @@ GEM
210210
google-cloud-errors (~> 1.0)
211211
google-cloud-env (1.6.0)
212212
faraday (>= 0.17.3, < 3.0)
213-
google-cloud-errors (1.2.0)
214-
google-cloud-storage (1.38.0)
213+
google-cloud-errors (1.3.0)
214+
google-cloud-storage (1.40.0)
215215
addressable (~> 2.8)
216216
digest-crc (~> 0.4)
217217
google-apis-iamcredentials_v1 (~> 0.1)
@@ -237,7 +237,7 @@ GEM
237237
jsonlint (0.3.0)
238238
oj (~> 3)
239239
optimist (~> 3)
240-
jwt (2.4.1)
240+
jwt (2.5.0)
241241
memoist (0.16.2)
242242
mini_magick (4.11.0)
243243
mini_mime (1.1.2)
@@ -371,4 +371,4 @@ DEPENDENCIES
371371
xcpretty-travis-formatter
372372

373373
BUNDLED WITH
374-
2.3.20
374+
2.3.22

Networking/Networking.xcodeproj/project.pbxproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3293,6 +3293,7 @@
32933293
isa = XCBuildConfiguration;
32943294
baseConfigurationReference = 9BD9C6C44CAC220B3C3B90B7 /* Pods-Networking.release-alpha.xcconfig */;
32953295
buildSettings = {
3296+
APPLICATION_EXTENSION_API_ONLY = YES;
32963297
CLANG_ENABLE_MODULES = YES;
32973298
CODE_SIGN_IDENTITY = "";
32983299
CODE_SIGN_STYLE = Automatic;
@@ -3466,6 +3467,7 @@
34663467
isa = XCBuildConfiguration;
34673468
baseConfigurationReference = 753D6504FF01F09F6A33B73E /* Pods-Networking.debug.xcconfig */;
34683469
buildSettings = {
3470+
APPLICATION_EXTENSION_API_ONLY = YES;
34693471
CLANG_ENABLE_MODULES = YES;
34703472
CODE_SIGN_IDENTITY = "";
34713473
CODE_SIGN_STYLE = Automatic;
@@ -3495,6 +3497,7 @@
34953497
isa = XCBuildConfiguration;
34963498
baseConfigurationReference = C8F9A8CC6F90A8C9B5EF2EE2 /* Pods-Networking.release.xcconfig */;
34973499
buildSettings = {
3500+
APPLICATION_EXTENSION_API_ONLY = YES;
34983501
CLANG_ENABLE_MODULES = YES;
34993502
CODE_SIGN_IDENTITY = "";
35003503
CODE_SIGN_STYLE = Automatic;

Networking/Networking.xcodeproj/xcshareddata/xcschemes/Networking.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1210"
3+
LastUpgradeVersion = "1400"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

Podfile

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -360,5 +360,14 @@ post_install do |installer|
360360
config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] ||= ['$(inherited)', 'ALPHA=1']
361361
end
362362
end
363+
364+
# Fix a code signing issue in Xcode 14 beta.
365+
# This solution is suggested here: https://github.com/CocoaPods/CocoaPods/issues/11402#issuecomment-1189861270
366+
# ====================================
367+
installer.pods_project.targets.each do |target|
368+
target.build_configurations.each do |config|
369+
config.build_settings['CODE_SIGN_IDENTITY'] = ''
370+
end
371+
end
363372
# rubocop:enable Style/CombinableLoops
364373
end

Podfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,6 @@ SPEC CHECKSUMS:
179179
ZendeskSupportProvidersSDK: 2bdf8544f7cd0fd4c002546f5704b813845beb2a
180180
ZendeskSupportSDK: 3a8e508ab1d9dd22dc038df6c694466414e037ba
181181

182-
PODFILE CHECKSUM: 0b413ca49ed0793630b6cffce7d1dabbaf0d2886
182+
PODFILE CHECKSUM: 3e746ecbe69d5cf22e0377beba8d803003558dd6
183183

184-
COCOAPODS: 1.11.2
184+
COCOAPODS: 1.11.3

0 commit comments

Comments
 (0)