Skip to content

Commit 50ca34b

Browse files
authored
Merge pull request #7531 from woocommerce/release/10.0
Merge 10.0 code freeze to trunk
2 parents aaac6e6 + a74f5f1 commit 50ca34b

File tree

10 files changed

+112
-52
lines changed

10 files changed

+112
-52
lines changed

CHANGELOG.md

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

5+
## 10.0
6+
We made it much easier to find everything about accepting payments in the app. Head on to the Payments section from the Menu! We also fixed an issue where you might be unnecessarily blocked from taking payments.
7+
We also made various enhancements to our login flows to help you get started quickly with the app.
8+
Lastly, we’ve made some tweaks to performance. But we’re not done. Look forward to more improvements in the future. Please keep sending your feedback!
9+
510
## 9.9
611
This release has a few improvements to your login experience, including the option to use your `wp-admin` site credentials and magic link option to login. Please continue to send us feedback – we are listening!

Gemfile.lock

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ GEM
88
i18n (>= 0.7, < 2)
99
minitest (~> 5.1)
1010
tzinfo (~> 1.1)
11-
addressable (2.8.0)
12-
public_suffix (>= 2.0.2, < 5.0)
11+
addressable (2.8.1)
12+
public_suffix (>= 2.0.2, < 6.0)
1313
algoliasearch (1.27.5)
1414
httpclient (~> 2.8, >= 2.8.3)
1515
json (>= 1.5.1)
@@ -95,7 +95,7 @@ GEM
9595
ethon (0.15.0)
9696
ffi (>= 1.15.0)
9797
excon (0.92.2)
98-
faraday (1.10.0)
98+
faraday (1.10.1)
9999
faraday-em_http (~> 1.0)
100100
faraday-em_synchrony (~> 1.0)
101101
faraday-excon (~> 1.1)
@@ -165,7 +165,7 @@ GEM
165165
xcpretty-travis-formatter (>= 0.0.3)
166166
fastlane-plugin-appcenter (1.11.1)
167167
fastlane-plugin-sentry (1.11.1)
168-
fastlane-plugin-wpmreleasetoolkit (5.3.0)
168+
fastlane-plugin-wpmreleasetoolkit (5.4.0)
169169
activesupport (~> 5)
170170
bigdecimal (~> 1.4)
171171
buildkit (~> 1.5)
@@ -185,11 +185,12 @@ GEM
185185
fourflusher (2.3.1)
186186
fuzzy_match (2.0.4)
187187
gh_inspector (1.1.3)
188-
git (1.11.0)
188+
git (1.12.0)
189+
addressable (~> 2.8)
189190
rchardet (~> 1.8)
190191
google-apis-androidpublisher_v3 (0.19.0)
191192
google-apis-core (>= 0.4, < 2.a)
192-
google-apis-core (0.4.2)
193+
google-apis-core (0.7.0)
193194
addressable (~> 2.5, >= 2.5.1)
194195
googleauth (>= 0.16.2, < 2.a)
195196
httpclient (>= 2.8.1, < 3.a)
@@ -198,27 +199,27 @@ GEM
198199
retriable (>= 2.0, < 4.a)
199200
rexml
200201
webrick
201-
google-apis-iamcredentials_v1 (0.10.0)
202-
google-apis-core (>= 0.4, < 2.a)
202+
google-apis-iamcredentials_v1 (0.13.0)
203+
google-apis-core (>= 0.7, < 2.a)
203204
google-apis-playcustomapp_v1 (0.7.0)
204205
google-apis-core (>= 0.4, < 2.a)
205-
google-apis-storage_v1 (0.13.0)
206-
google-apis-core (>= 0.4, < 2.a)
206+
google-apis-storage_v1 (0.17.0)
207+
google-apis-core (>= 0.7, < 2.a)
207208
google-cloud-core (1.6.0)
208209
google-cloud-env (~> 1.0)
209210
google-cloud-errors (~> 1.0)
210211
google-cloud-env (1.6.0)
211212
faraday (>= 0.17.3, < 3.0)
212213
google-cloud-errors (1.2.0)
213-
google-cloud-storage (1.36.2)
214+
google-cloud-storage (1.38.0)
214215
addressable (~> 2.8)
215216
digest-crc (~> 0.4)
216217
google-apis-iamcredentials_v1 (~> 0.1)
217-
google-apis-storage_v1 (~> 0.1)
218+
google-apis-storage_v1 (~> 0.17.0)
218219
google-cloud-core (~> 1.6)
219220
googleauth (>= 0.16.2, < 2.a)
220221
mini_mime (~> 1.0)
221-
googleauth (1.1.3)
222+
googleauth (1.2.0)
222223
faraday (>= 0.17.3, < 3.a)
223224
jwt (>= 1.4, < 3.0)
224225
memoist (~> 0.16)
@@ -236,12 +237,12 @@ GEM
236237
jsonlint (0.3.0)
237238
oj (~> 3)
238239
optimist (~> 3)
239-
jwt (2.3.0)
240+
jwt (2.4.1)
240241
memoist (0.16.2)
241242
mini_magick (4.11.0)
242243
mini_mime (1.1.2)
243244
mini_portile2 (2.8.0)
244-
minitest (5.16.2)
245+
minitest (5.16.3)
245246
molinillo (0.8.0)
246247
multi_json (1.15.0)
247248
multipart-post (2.0.0)
@@ -257,7 +258,7 @@ GEM
257258
octokit (4.25.1)
258259
faraday (>= 1, < 3)
259260
sawyer (~> 0.9)
260-
oj (3.13.20)
261+
oj (3.13.21)
261262
optimist (3.0.1)
262263
options (2.3.2)
263264
optparse (0.1.1)
@@ -277,7 +278,7 @@ GEM
277278
rake
278279
rchardet (1.8.0)
279280
regexp_parser (2.2.0)
280-
representable (3.1.1)
281+
representable (3.2.0)
281282
declarative (< 0.1.0)
282283
trailblazer-option (>= 0.1.1, < 0.2.0)
283284
uber (< 0.2.0)
@@ -306,9 +307,9 @@ GEM
306307
addressable (>= 2.3.5)
307308
faraday (>= 0.17.3, < 3)
308309
security (0.1.3)
309-
signet (0.16.1)
310+
signet (0.17.0)
310311
addressable (~> 2.8)
311-
faraday (>= 0.17.5, < 3.0)
312+
faraday (>= 0.17.5, < 3.a)
312313
jwt (>= 1.5, < 3.0)
313314
multi_json (~> 1.10)
314315
simctl (1.6.8)

Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ target 'WooCommerce' do
4242
pod 'Gridicons', '~> 1.2.0'
4343

4444
# To allow pod to pick up beta versions use -beta. E.g., 1.1.7-beta.1
45-
pod 'WordPressAuthenticator', '~> 2.2.1-beta.5'
45+
pod 'WordPressAuthenticator', '~> 2.3.0'
4646
# pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :commit => ''
4747
# pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :branch => ''
4848
# pod 'WordPressAuthenticator', :path => '../WordPressAuthenticator-iOS'

Podfile.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ PODS:
4242
- WordPress-Aztec-iOS (1.11.0)
4343
- WordPress-Editor-iOS (1.11.0):
4444
- WordPress-Aztec-iOS (= 1.11.0)
45-
- WordPressAuthenticator (2.2.1-beta.5):
45+
- WordPressAuthenticator (2.3.0):
4646
- Alamofire (~> 4.8)
4747
- CocoaLumberjack (~> 3.5)
4848
- GoogleSignIn (~> 6.0.1)
@@ -92,7 +92,7 @@ DEPENDENCIES:
9292
- Sourcery (~> 1.0.3)
9393
- StripeTerminal (~> 2.7)
9494
- WordPress-Editor-iOS (~> 1.11.0)
95-
- WordPressAuthenticator (~> 2.2.1-beta.5)
95+
- WordPressAuthenticator (~> 2.3.0)
9696
- WordPressKit (~> 4.49.0)
9797
- WordPressShared (~> 1.15)
9898
- WordPressUI (~> 1.12.5)
@@ -163,7 +163,7 @@ SPEC CHECKSUMS:
163163
UIDeviceIdentifier: af4e11e25a2ea670078e2bd677bb0e8144f9f063
164164
WordPress-Aztec-iOS: 050b34d4c3adfb7c60363849049b13d60683b348
165165
WordPress-Editor-iOS: 304098424f1051cb271546c99f906aac296b1b81
166-
WordPressAuthenticator: e898a1e3a297607534b18520921e3fc9e7ccf7b4
166+
WordPressAuthenticator: df55cd04a8157fa38b2e8c7c9cb28ab0a82d00a8
167167
WordPressKit: 96deb6ba37ea5eaec4ddcaa53eca04d653246152
168168
WordPressShared: 5477f179c7fe03b5d574f91adda66f67d131827e
169169
WordPressUI: c5be816f6c7b3392224ac21de9e521e89fa108ac
@@ -179,6 +179,6 @@ SPEC CHECKSUMS:
179179
ZendeskSupportProvidersSDK: 2bdf8544f7cd0fd4c002546f5704b813845beb2a
180180
ZendeskSupportSDK: 3a8e508ab1d9dd22dc038df6c694466414e037ba
181181

182-
PODFILE CHECKSUM: fbec7c061bc562e7f807db30307607fdfdd91b2d
182+
PODFILE CHECKSUM: 8c1958091efafb7741ffe41719ea753dafe38041
183183

184184
COCOAPODS: 1.11.2

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+
10.1
4+
-----
5+
6+
37
10.0
48
-----
59
- [**] In-Person Payments and Simple Payments have been moved to a new Payments section [https://github.com/woocommerce/woocommerce-ios/pull/7473]

WooCommerce/Resources/AppStoreStrings.pot

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,11 @@ msgctxt "app_store_promo_text"
5757
msgid "Run your store from anywhere"
5858
msgstr ""
5959

60-
msgctxt "v9.9-whats-new"
60+
msgctxt "v10.0-whats-new"
6161
msgid ""
62-
"This release has a few improvements to your login experience, including the option to use your `wp-admin` site credentials and magic link option to login. Please continue to send us feedback – we are listening!\n"
62+
"We made it much easier to find everything about accepting payments in the app. Head on to the Payments section from the Menu! We also fixed an issue where you might be unnecessarily blocked from taking payments.\n"
63+
"We also made various enhancements to our login flows to help you get started quickly with the app.\n"
64+
"Lastly, we’ve made some tweaks to performance. But we’re not done. Look forward to more improvements in the future. Please keep sending your feedback!\n"
6365
msgstr ""
6466

6567
#. translators: This is a promo message that will be attached on top of a screenshot in the App Store.

0 commit comments

Comments
 (0)