Skip to content

Commit 88ab33d

Browse files
authored
Merge pull request #6576 from woocommerce/merge/8.9-code-freeze-to-develop
Merge 8.9 code freeze to trunk
2 parents eeb1b13 + c2a1a47 commit 88ab33d

File tree

9 files changed

+175
-102
lines changed

9 files changed

+175
-102
lines changed

Gemfile.lock

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,17 @@ GEM
1616
artifactory (3.0.15)
1717
atomos (0.1.3)
1818
aws-eventstream (1.2.0)
19-
aws-partitions (1.553.0)
20-
aws-sdk-core (3.126.0)
19+
aws-partitions (1.573.0)
20+
aws-sdk-core (3.130.0)
2121
aws-eventstream (~> 1, >= 1.0.2)
2222
aws-partitions (~> 1, >= 1.525.0)
2323
aws-sigv4 (~> 1.1)
2424
jmespath (~> 1.0)
25-
aws-sdk-kms (1.54.0)
26-
aws-sdk-core (~> 3, >= 3.126.0)
25+
aws-sdk-kms (1.55.0)
26+
aws-sdk-core (~> 3, >= 3.127.0)
2727
aws-sigv4 (~> 1.1)
28-
aws-sdk-s3 (1.112.0)
29-
aws-sdk-core (~> 3, >= 3.126.0)
28+
aws-sdk-s3 (1.113.0)
29+
aws-sdk-core (~> 3, >= 3.127.0)
3030
aws-sdk-kms (~> 1)
3131
aws-sigv4 (~> 1.4)
3232
aws-sigv4 (1.4.0)
@@ -93,7 +93,7 @@ GEM
9393
escape (0.0.4)
9494
ethon (0.15.0)
9595
ffi (>= 1.15.0)
96-
excon (0.91.0)
96+
excon (0.92.2)
9797
faraday (1.10.0)
9898
faraday-em_http (~> 1.0)
9999
faraday-em_synchrony (~> 1.0)
@@ -123,7 +123,7 @@ GEM
123123
faraday_middleware (1.2.0)
124124
faraday (~> 1.0)
125125
fastimage (2.2.6)
126-
fastlane (2.204.2)
126+
fastlane (2.205.1)
127127
CFPropertyList (>= 2.3, < 4.0.0)
128128
addressable (>= 2.8, < 3.0.0)
129129
artifactory (~> 3.0)
@@ -184,7 +184,7 @@ GEM
184184
gh_inspector (1.1.3)
185185
git (1.10.2)
186186
rchardet (~> 1.8)
187-
google-apis-androidpublisher_v3 (0.16.0)
187+
google-apis-androidpublisher_v3 (0.18.0)
188188
google-apis-core (>= 0.4, < 2.a)
189189
google-apis-core (0.4.2)
190190
addressable (~> 2.5, >= 2.5.1)
@@ -199,24 +199,24 @@ GEM
199199
google-apis-core (>= 0.4, < 2.a)
200200
google-apis-playcustomapp_v1 (0.7.0)
201201
google-apis-core (>= 0.4, < 2.a)
202-
google-apis-storage_v1 (0.11.0)
202+
google-apis-storage_v1 (0.12.0)
203203
google-apis-core (>= 0.4, < 2.a)
204204
google-cloud-core (1.6.0)
205205
google-cloud-env (~> 1.0)
206206
google-cloud-errors (~> 1.0)
207-
google-cloud-env (1.5.0)
208-
faraday (>= 0.17.3, < 2.0)
207+
google-cloud-env (1.6.0)
208+
faraday (>= 0.17.3, < 3.0)
209209
google-cloud-errors (1.2.0)
210-
google-cloud-storage (1.36.0)
210+
google-cloud-storage (1.36.1)
211211
addressable (~> 2.8)
212212
digest-crc (~> 0.4)
213213
google-apis-iamcredentials_v1 (~> 0.1)
214214
google-apis-storage_v1 (~> 0.1)
215215
google-cloud-core (~> 1.6)
216216
googleauth (>= 0.16.2, < 2.a)
217217
mini_mime (~> 1.0)
218-
googleauth (1.1.0)
219-
faraday (>= 0.17.3, < 2.0)
218+
googleauth (1.1.2)
219+
faraday (>= 0.17.3, < 3.a)
220220
jwt (>= 1.4, < 3.0)
221221
memoist (~> 0.16)
222222
multi_json (~> 1.11)
@@ -228,7 +228,7 @@ GEM
228228
httpclient (2.8.3)
229229
i18n (1.10.0)
230230
concurrent-ruby (~> 1.0)
231-
jmespath (1.5.0)
231+
jmespath (1.6.1)
232232
json (2.6.1)
233233
jsonlint (0.3.0)
234234
oj (~> 3)
@@ -285,9 +285,9 @@ GEM
285285
addressable (>= 2.3.5)
286286
faraday (> 0.8, < 2.0)
287287
security (0.1.3)
288-
signet (0.16.0)
288+
signet (0.16.1)
289289
addressable (~> 2.8)
290-
faraday (>= 0.17.3, < 2.0)
290+
faraday (>= 0.17.5, < 3.0)
291291
jwt (>= 1.5, < 3.0)
292292
multi_json (~> 1.10)
293293
simctl (1.6.8)
@@ -309,7 +309,7 @@ GEM
309309
uber (0.1.0)
310310
unf (0.1.4)
311311
unf_ext
312-
unf_ext (0.0.8)
312+
unf_ext (0.0.8.1)
313313
unicode-display_width (1.8.0)
314314
webrick (1.7.0)
315315
word_wrap (1.0.0)

Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ target 'WooCommerce' do
4747

4848
pod 'WordPressShared', '~> 1.15'
4949

50-
pod 'WordPressUI', '~> 1.12.5-beta.1'
50+
pod 'WordPressUI', '~> 1.12.5'
5151
# pod 'WordPressUI', :git => 'https://github.com/wordpress-mobile/WordPressUI-iOS.git', :branch => ''
5252

5353
aztec

Podfile.lock

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ PODS:
6868
- WordPressShared (1.16.1):
6969
- CocoaLumberjack (~> 3.4)
7070
- FormatterKit/TimeIntervalFormatter (~> 1.8)
71-
- WordPressUI (1.12.5-beta.1)
71+
- WordPressUI (1.12.5)
7272
- Wormholy (1.6.5)
7373
- WPMediaPicker (1.8.1)
7474
- wpxmlrpc (0.9.0)
@@ -102,7 +102,7 @@ DEPENDENCIES:
102102
- WordPressAuthenticator (~> 2.0.0)
103103
- WordPressKit (~> 4.46.0)
104104
- WordPressShared (~> 1.15)
105-
- WordPressUI (~> 1.12.5-beta.1)
105+
- WordPressUI (~> 1.12.5)
106106
- Wormholy (~> 1.6.5)
107107
- WPMediaPicker (~> 1.8.1)
108108
- XLPagerTabStrip (~> 9.0)
@@ -111,7 +111,6 @@ DEPENDENCIES:
111111
SPEC REPOS:
112112
https://github.com/wordpress-mobile/cocoapods-specs.git:
113113
- WordPressAuthenticator
114-
- WordPressUI
115114
trunk:
116115
- Alamofire
117116
- AppAuth
@@ -138,6 +137,7 @@ SPEC REPOS:
138137
- WordPress-Editor-iOS
139138
- WordPressKit
140139
- WordPressShared
140+
- WordPressUI
141141
- Wormholy
142142
- WPMediaPicker
143143
- wpxmlrpc
@@ -177,7 +177,7 @@ SPEC CHECKSUMS:
177177
WordPressAuthenticator: 5163f732e4e529781f931f158f54b1a1545bc536
178178
WordPressKit: 67cc1b0bda0d114c806a631ad726027d535d28a8
179179
WordPressShared: 5477f179c7fe03b5d574f91adda66f67d131827e
180-
WordPressUI: 7d66c40df76299e1b2140363419a7e950bf68038
180+
WordPressUI: c5be816f6c7b3392224ac21de9e521e89fa108ac
181181
Wormholy: 3252bc3e55a1847ef9a0976c1377bd77bf3635fa
182182
WPMediaPicker: 9011a0ec1f468c039af7485c244576b4c9889a0f
183183
wpxmlrpc: bf55a43a7e710bd2a4fb8c02dfe83b1246f14f13
@@ -190,6 +190,6 @@ SPEC CHECKSUMS:
190190
ZendeskSupportProvidersSDK: 2bdf8544f7cd0fd4c002546f5704b813845beb2a
191191
ZendeskSupportSDK: 3a8e508ab1d9dd22dc038df6c694466414e037ba
192192

193-
PODFILE CHECKSUM: 5deeda4fca1a39746eb2d3135ba10d0f9deb5471
193+
PODFILE CHECKSUM: 11d3b662ee9876e6f8d2a67aa4d2b05b08940f5d
194194

195195
COCOAPODS: 1.11.2

RELEASE-NOTES.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
9.0
44
-----
5+
56
- [internal] Reviews lists on Products and Menu tabs are refactored to avoid duplicated code. Please quickly smoke test them to make sure that everything still works as before. [https://github.com/woocommerce/woocommerce-ios/pull/6553]
67

78
8.9

0 commit comments

Comments
 (0)