Skip to content

Commit 72e3aa6

Browse files
authored
Merge pull request #8305 from woocommerce/release/11.5
Merge 11.5 code freeze to trunk
2 parents 52b0534 + d9b7b70 commit 72e3aa6

File tree

9 files changed

+85
-74
lines changed

9 files changed

+85
-74
lines changed

Gemfile.lock

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -166,15 +166,14 @@ GEM
166166
fastlane-plugin-appcenter (1.11.1)
167167
fastlane-plugin-sentry (1.14.0)
168168
os (~> 1.1, >= 1.1.4)
169-
fastlane-plugin-wpmreleasetoolkit (6.0.0)
169+
fastlane-plugin-wpmreleasetoolkit (6.1.0)
170170
activesupport (~> 5)
171171
bigdecimal (~> 1.4)
172172
buildkit (~> 1.5)
173173
chroma (= 0.2.0)
174174
diffy (~> 3.3)
175175
git (~> 1.3)
176176
google-cloud-storage (~> 1.31)
177-
jsonlint (~> 0.3)
178177
nokogiri (~> 1.11)
179178
octokit (~> 4.18)
180179
parallel (~> 1.14)
@@ -200,8 +199,8 @@ GEM
200199
retriable (>= 2.0, < 4.a)
201200
rexml
202201
webrick
203-
google-apis-iamcredentials_v1 (0.15.0)
204-
google-apis-core (>= 0.9.0, < 2.a)
202+
google-apis-iamcredentials_v1 (0.16.0)
203+
google-apis-core (>= 0.9.1, < 2.a)
205204
google-apis-playcustomapp_v1 (0.12.0)
206205
google-apis-core (>= 0.9.1, < 2.a)
207206
google-apis-storage_v1 (0.19.0)
@@ -212,7 +211,7 @@ GEM
212211
google-cloud-env (1.6.0)
213212
faraday (>= 0.17.3, < 3.0)
214213
google-cloud-errors (1.3.0)
215-
google-cloud-storage (1.43.0)
214+
google-cloud-storage (1.44.0)
216215
addressable (~> 2.8)
217216
digest-crc (~> 0.4)
218217
google-apis-iamcredentials_v1 (~> 0.1)
@@ -235,9 +234,6 @@ GEM
235234
concurrent-ruby (~> 1.0)
236235
jmespath (1.6.1)
237236
json (2.6.2)
238-
jsonlint (0.3.0)
239-
oj (~> 3)
240-
optimist (~> 3)
241237
jwt (2.5.0)
242238
memoist (0.16.2)
243239
mini_magick (4.11.0)
@@ -259,8 +255,6 @@ GEM
259255
octokit (4.25.1)
260256
faraday (>= 1, < 3)
261257
sawyer (~> 0.9)
262-
oj (3.13.23)
263-
optimist (3.0.1)
264258
options (2.3.2)
265259
optparse (0.1.1)
266260
os (1.1.4)

Podfile

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

7373
# To allow pod to pick up beta versions use -beta. E.g., 1.1.7-beta.1
74-
pod 'WordPressAuthenticator', '~> 4.3.0-beta.1'
74+
pod 'WordPressAuthenticator', '~> 4.3.0'
7575
# pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :commit => ''
7676
# pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :branch => ''
7777
# 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 (4.3.0-beta.1):
45+
- WordPressAuthenticator (4.3.0):
4646
- CocoaLumberjack (~> 3.5)
4747
- GoogleSignIn (~> 6.0.1)
4848
- Gridicons (~> 1.0)
@@ -91,7 +91,7 @@ DEPENDENCIES:
9191
- Sourcery (~> 1.0.3)
9292
- StripeTerminal (~> 2.14)
9393
- WordPress-Editor-iOS (~> 1.11.0)
94-
- WordPressAuthenticator (~> 4.3.0-beta.1)
94+
- WordPressAuthenticator (~> 4.3.0)
9595
- WordPressKit (~> 4.49.0)
9696
- WordPressShared (~> 1.15)
9797
- WordPressUI (~> 1.12.5)
@@ -162,7 +162,7 @@ SPEC CHECKSUMS:
162162
UIDeviceIdentifier: af4e11e25a2ea670078e2bd677bb0e8144f9f063
163163
WordPress-Aztec-iOS: 050b34d4c3adfb7c60363849049b13d60683b348
164164
WordPress-Editor-iOS: 304098424f1051cb271546c99f906aac296b1b81
165-
WordPressAuthenticator: f886178b7202cfb8adfd834fb6391b7970d18871
165+
WordPressAuthenticator: fd1084278edc077c48026c9080a1d9b0ca9c2304
166166
WordPressKit: 96deb6ba37ea5eaec4ddcaa53eca04d653246152
167167
WordPressShared: 5477f179c7fe03b5d574f91adda66f67d131827e
168168
WordPressUI: c5be816f6c7b3392224ac21de9e521e89fa108ac
@@ -178,6 +178,6 @@ SPEC CHECKSUMS:
178178
ZendeskSupportProvidersSDK: 2bdf8544f7cd0fd4c002546f5704b813845beb2a
179179
ZendeskSupportSDK: 3a8e508ab1d9dd22dc038df6c694466414e037ba
180180

181-
PODFILE CHECKSUM: b5975e437e8925c28bb2d91af5f3e557e82ae34a
181+
PODFILE CHECKSUM: d57f522b14409f38c9fb733afac389ebebdb3ffd
182182

183183
COCOAPODS: 1.11.3

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+
11.6
4+
-----
5+
6+
37
11.5
48
-----
59
- [*] Account deletion is now supported for all users in settings or in the empty stores screen (in the ellipsis menu). [https://github.com/woocommerce/woocommerce-ios/pull/8179, https://github.com/woocommerce/woocommerce-ios/pull/8272]

WooCommerce/Resources/AppStoreStrings.pot

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

60-
msgctxt "v11.4-whats-new"
60+
msgctxt "v11.5-whats-new"
6161
msgid ""
62-
"We focused on some stability and performance issues to make your experience smoother. Please keep sharing feedback. We read every one of them.\n"
63-
"\n"
62+
"This release includes a few bug fixes and improvements to make your experience smoother. Stay tuned for exciting updates in the coming weeks!\n"
6463
msgstr ""
6564

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

0 commit comments

Comments
 (0)