Skip to content

Commit d3dccae

Browse files
committed
Merge branch 'develop' into feature/stripe-sdk-2
2 parents 9716fc9 + b0d603e commit d3dccae

File tree

9 files changed

+119
-52
lines changed

9 files changed

+119
-52
lines changed

Gemfile.lock

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ GEM
1616
artifactory (3.0.15)
1717
atomos (0.1.3)
1818
aws-eventstream (1.2.0)
19-
aws-partitions (1.516.0)
20-
aws-sdk-core (3.121.2)
19+
aws-partitions (1.522.0)
20+
aws-sdk-core (3.121.5)
2121
aws-eventstream (~> 1, >= 1.0.2)
22-
aws-partitions (~> 1, >= 1.239.0)
22+
aws-partitions (~> 1, >= 1.520.1)
2323
aws-sigv4 (~> 1.1)
2424
jmespath (~> 1.0)
2525
aws-sdk-kms (1.50.0)
@@ -89,7 +89,7 @@ GEM
8989
escape (0.0.4)
9090
ethon (0.14.0)
9191
ffi (>= 1.15.0)
92-
excon (0.87.0)
92+
excon (0.88.0)
9393
faraday (1.8.0)
9494
faraday-em_http (~> 1.0)
9595
faraday-em_synchrony (~> 1.0)
@@ -115,7 +115,7 @@ GEM
115115
faraday_middleware (1.2.0)
116116
faraday (~> 1.0)
117117
fastimage (2.2.5)
118-
fastlane (2.196.0)
118+
fastlane (2.197.0)
119119
CFPropertyList (>= 2.3, < 4.0.0)
120120
addressable (>= 2.8, < 3.0.0)
121121
artifactory (~> 3.0)
@@ -165,7 +165,7 @@ GEM
165165
xctest_list (>= 1.2.1)
166166
fastlane-plugin-trainer (0.4.1)
167167
trainer (>= 0.7.0)
168-
fastlane-plugin-wpmreleasetoolkit (1.4.0)
168+
fastlane-plugin-wpmreleasetoolkit (2.1.0)
169169
activesupport (~> 5)
170170
bigdecimal (~> 1.4)
171171
chroma (= 0.2.0)
@@ -176,15 +176,15 @@ GEM
176176
octokit (~> 4.18)
177177
parallel (~> 1.14)
178178
progress_bar (~> 1.3)
179-
rake (~> 12.3)
179+
rake (>= 12.3, < 14.0)
180180
rake-compiler (~> 1.0)
181181
ffi (1.15.4)
182182
fourflusher (2.3.1)
183183
fuzzy_match (2.0.4)
184184
gh_inspector (1.1.3)
185185
git (1.9.1)
186186
rchardet (~> 1.8)
187-
google-apis-androidpublisher_v3 (0.12.0)
187+
google-apis-androidpublisher_v3 (0.13.0)
188188
google-apis-core (>= 0.4, < 2.a)
189189
google-apis-core (0.4.1)
190190
addressable (~> 2.5, >= 2.5.1)
@@ -195,11 +195,11 @@ GEM
195195
retriable (>= 2.0, < 4.a)
196196
rexml
197197
webrick
198-
google-apis-iamcredentials_v1 (0.7.0)
198+
google-apis-iamcredentials_v1 (0.8.0)
199199
google-apis-core (>= 0.4, < 2.a)
200-
google-apis-playcustomapp_v1 (0.5.0)
200+
google-apis-playcustomapp_v1 (0.6.0)
201201
google-apis-core (>= 0.4, < 2.a)
202-
google-apis-storage_v1 (0.8.0)
202+
google-apis-storage_v1 (0.9.0)
203203
google-apis-core (>= 0.4, < 2.a)
204204
google-cloud-core (1.6.0)
205205
google-cloud-env (~> 1.0)
@@ -215,7 +215,7 @@ GEM
215215
google-cloud-core (~> 1.6)
216216
googleauth (>= 0.16.2, < 2.a)
217217
mini_mime (~> 1.0)
218-
googleauth (1.0.0)
218+
googleauth (1.1.0)
219219
faraday (>= 0.17.3, < 2.0)
220220
jwt (>= 1.4, < 3.0)
221221
memoist (~> 0.16)
@@ -229,7 +229,7 @@ GEM
229229
i18n (1.8.10)
230230
concurrent-ruby (~> 1.0)
231231
jmespath (1.4.0)
232-
json (2.6.0)
232+
json (2.6.1)
233233
jsonlint (0.3.0)
234234
oj (~> 3)
235235
optimist (~> 3)
@@ -246,26 +246,26 @@ GEM
246246
nap (1.1.0)
247247
naturally (2.2.1)
248248
netrc (0.11.0)
249-
nokogiri (1.12.2)
249+
nokogiri (1.12.5)
250250
mini_portile2 (~> 2.6.1)
251251
racc (~> 1.4)
252-
nokogiri (1.12.2-x86_64-darwin)
252+
nokogiri (1.12.5-x86_64-darwin)
253253
racc (~> 1.4)
254254
octokit (4.21.0)
255255
faraday (>= 0.9)
256256
sawyer (~> 0.8.0, >= 0.5.3)
257-
oj (3.13.0)
257+
oj (3.13.9)
258258
optimist (3.0.1)
259259
options (2.3.2)
260260
optparse (0.1.1)
261261
os (1.1.1)
262-
parallel (1.20.1)
262+
parallel (1.21.0)
263263
plist (3.6.0)
264264
progress_bar (1.3.3)
265265
highline (>= 1.6, < 3)
266266
options (~> 2.3.0)
267267
public_suffix (4.0.6)
268-
racc (1.5.2)
268+
racc (1.6.0)
269269
rake (12.3.3)
270270
rake-compiler (1.1.1)
271271
rake
@@ -346,7 +346,7 @@ DEPENDENCIES
346346
fastlane-plugin-sentry (~> 1.0)
347347
fastlane-plugin-test_center (~> 3.0)
348348
fastlane-plugin-trainer (~> 0.4.1)
349-
fastlane-plugin-wpmreleasetoolkit (~> 1.4)
349+
fastlane-plugin-wpmreleasetoolkit (~> 2.0)
350350
rake (~> 12.3)
351351
rmagick (~> 3.2.0)
352352
xcode-install

Podfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ PODS:
4545
- Sourcery (1.0.3)
4646
- StripeTerminal (2.3.0)
4747
- SVProgressHUD (2.2.5)
48-
- UIDeviceIdentifier (1.6.0)
48+
- UIDeviceIdentifier (1.7.1)
4949
- WordPress-Aztec-iOS (1.11.0)
5050
- WordPress-Editor-iOS (1.11.0):
5151
- WordPress-Aztec-iOS (= 1.11.0)
@@ -178,7 +178,7 @@ SPEC CHECKSUMS:
178178
Sourcery: 70a6048014bd4f37ea80e6bd4354d47bf3b760e1
179179
StripeTerminal: c53f6bc71c11b11867992478b1806a7c6ec16c0f
180180
SVProgressHUD: 1428aafac632c1f86f62aa4243ec12008d7a51d6
181-
UIDeviceIdentifier: f4bf3b343581a1beacdbf5fb1a8825bd5f05a4a4
181+
UIDeviceIdentifier: d0fee204f467dacf8808b7ac14ce43affeb271a5
182182
WordPress-Aztec-iOS: 050b34d4c3adfb7c60363849049b13d60683b348
183183
WordPress-Editor-iOS: 304098424f1051cb271546c99f906aac296b1b81
184184
WordPressAuthenticator: 06278534519c741ecea346f504ad8d08082bfb0d

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+
8.0
4+
-----
5+
6+
37
7.9
48
-----
59
- [*] Fix: after disconnecting a site or connecting to a new site, the sites in site picker (Settings > Switch Store) should be updated accordingly. The only exception is when the newly disconnected site is the currently selected site. [https://github.com/woocommerce/woocommerce-ios/pull/5241]

0 commit comments

Comments
 (0)