Skip to content

Commit 4eaa141

Browse files
authored
Merge pull request #6005 from woocommerce/issue/2454-fix-gridicons-crash
Fix: Gridicons crash on startup
2 parents 44eb006 + 6e10701 commit 4eaa141

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ target 'WooCommerce' do
3535
#pod 'Automattic-Tracks-iOS', :git => 'https://github.com/Automattic/Automattic-Tracks-iOS.git', :branch => 'add/build-configuration'
3636
pod 'Automattic-Tracks-iOS', '~> 0.9.1'
3737

38-
pod 'Gridicons', '~> 1.0'
38+
pod 'Gridicons', '~> 1.2.0'
3939

4040
# To allow pod to pick up beta versions use -beta. E.g., 1.1.7-beta.1
4141
pod 'WordPressAuthenticator', '~> 1.42.0'

Podfile.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ PODS:
2727
- AppAuth (~> 1.4)
2828
- GTMAppAuth (~> 1.0)
2929
- GTMSessionFetcher/Core (~> 1.1)
30-
- Gridicons (1.0)
30+
- Gridicons (1.2.0)
3131
- GTMAppAuth (1.2.2):
3232
- AppAuth/Core (~> 1.4)
3333
- GTMSessionFetcher/Core (~> 1.5)
@@ -96,7 +96,7 @@ DEPENDENCIES:
9696
- Charts (~> 3.6.0)
9797
- CocoaLumberjack (~> 3.5)
9898
- CocoaLumberjack/Swift (~> 3.5)
99-
- Gridicons (~> 1.0)
99+
- Gridicons (~> 1.2.0)
100100
- KeychainAccess (~> 3.2)
101101
- Kingfisher (~> 6.0.0)
102102
- Sourcery (~> 1.0.3)
@@ -164,7 +164,7 @@ SPEC CHECKSUMS:
164164
CocoaLumberjack: 2f44e60eb91c176d471fdba43b9e3eae6a721947
165165
FormatterKit: 184db51bf120b633693a73624a4cede89ec51a41
166166
GoogleSignIn: fd381840dbe7c1137aa6dc30849a5c3e070c034a
167-
Gridicons: f032dbc3350f8648e0fabe3e531b72cf97d428a9
167+
Gridicons: 4455b9f366960121430e45997e32112ae49ffe1d
168168
GTMAppAuth: ad5c2b70b9a8689e1a04033c9369c4915bfcbe89
169169
GTMSessionFetcher: 36689134877faeb055b27dfa4ccc9ceaa42e029e
170170
KeychainAccess: d5470352939ced6d6f7fb51cb2e67aae51fc294f
@@ -197,6 +197,6 @@ SPEC CHECKSUMS:
197197
ZendeskSupportProvidersSDK: 2bdf8544f7cd0fd4c002546f5704b813845beb2a
198198
ZendeskSupportSDK: 3a8e508ab1d9dd22dc038df6c694466414e037ba
199199

200-
PODFILE CHECKSUM: 16b1ff41117e33746b502037c890c8799fc18c21
200+
PODFILE CHECKSUM: b5364cc82ccfcea6d4ee524c9a7b817bdc327562
201201

202202
COCOAPODS: 1.11.2

RELEASE-NOTES.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
-----
55
- [*] In-Person Payments: Inform the user when a card reader battery is so low that it needs to be charged before the reader can be connected. [https://github.com/woocommerce/woocommerce-ios/pull/5998]
66
- [***] The My store tab is having a new look with new conversion stats and shows up to 5 top performing products now (used to be 3). [https://github.com/woocommerce/woocommerce-ios/pull/5991]
7+
- [**] Fixed a crash at the startup of the app, related to Gridicons. [https://github.com/woocommerce/woocommerce-ios/pull/6005]
78

89
8.4
910
-----

0 commit comments

Comments
 (0)