Merge pull request #17797 from wordpress-mobile/issue/update_feature_struct

Feature Announcement: add icons property to Feature struct

Author: ScoutHarris

Podfile

@@ -47,7 +47,7 @@ def wordpress_ui
 end
 
 def wordpress_kit
-    pod 'WordPressKit', '~> 4.46.0-beta.1'
+    pod 'WordPressKit', '~> 4.46.0-beta'
     # pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :tag => ''
     # pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :branch => ''
     # pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :commit => ''

Podfile.lock

@@ -465,7 +465,7 @@ PODS:
     - WordPressKit (~> 4.18-beta)
     - WordPressShared (~> 1.12-beta)
     - WordPressUI (~> 1.7-beta)
-  - WordPressKit (4.46.0-beta.1):
+  - WordPressKit (4.46.0-beta.2):
     - Alamofire (~> 4.8.0)
     - CocoaLumberjack (~> 3.4)
     - NSObject-SafeExpectations (= 0.0.4)
@@ -569,7 +569,7 @@ DEPENDENCIES:
   - SVProgressHUD (= 2.2.5)
   - WordPress-Editor-iOS (~> 1.19.7)
   - WordPressAuthenticator (~> 1.43.0-beta.2)
-  - WordPressKit (~> 4.46.0-beta.1)
+  - WordPressKit (~> 4.46.0-beta)
   - WordPressMocks (~> 0.0.15)
   - WordPressShared (~> 1.17.0)
   - WordPressUI (~> 1.12.3)
@@ -581,6 +581,7 @@ DEPENDENCIES:
 SPEC REPOS:
   https://github.com/wordpress-mobile/cocoapods-specs.git:
     - WordPressAuthenticator
+    - WordPressKit
   trunk:
     - Alamofire
     - AlamofireImage
@@ -619,7 +620,6 @@ SPEC REPOS:
     - UIDeviceIdentifier
     - WordPress-Aztec-iOS
     - WordPress-Editor-iOS
-    - WordPressKit
     - WordPressMocks
     - WordPressShared
     - WordPressUI
@@ -833,7 +833,7 @@ SPEC CHECKSUMS:
   WordPress-Aztec-iOS: 144f124148079084860368dfd27cb96e0952853e
   WordPress-Editor-iOS: 20551d5a5e51f29832064f08faaaae8e1da7e1e2
   WordPressAuthenticator: 0b3423546d92a976e3ce627d2e5a0350716b1f5b
-  WordPressKit: 52329b519bd0da6533cd4c79070424d0672ed7ee
+  WordPressKit: e623ffb39b2b9d7730a9be63e26fa77929e6e43b
   WordPressMocks: 6b52b0764d9939408151367dd9c6e8a910877f4d
   WordPressShared: a4b0308a6345d4dda20c8f7ad9317df4246b4a00
   WordPressUI: 45591178e843ecb82e65e868ec766148befe9f9f
@@ -849,6 +849,6 @@ SPEC CHECKSUMS:
   ZendeskSupportSDK: 3a8e508ab1d9dd22dc038df6c694466414e037ba
   ZIPFoundation: e27423c004a5a1410c15933407747374e7c6cb6e
 
-PODFILE CHECKSUM: cf4b842b6fd0d700b0f0ded040967877822e8daa
+PODFILE CHECKSUM: ebdcdd2b30dd680be23e92f8167141254e055594
 
 COCOAPODS: 1.11.2

WordPress/WordPressTest/What's New/Data store/AnnouncementsDataStoreTests.swift

@@ -11,21 +11,23 @@ struct MockAnnouncementsCache: AnnouncementsCache {
     var date: Date?
 
     private let localAnnouncements = [Announcement(appVersionName: "0.0",
-                                           minimumAppVersion: "1.0",
-                                           maximumAppVersion: "3.0",
-                                           appVersionTargets: [],
-                                           detailsUrl: "http://wordpress.org",
-                                           announcementVersion: "1.0",
-                                           isLocalized: false,
-                                           responseLocale: "",
-                                           features: [WordPressKit.Feature(title: "first cached feature",
-                                                                           subtitle: "this is a mock cached feature",
-                                                                           iconUrl: "https://s0.wordpress.com/i/store/mobile/plans-personal.png",
-                                                                           iconBase64: nil),
-                                                      WordPressKit.Feature(title: "second cached feature",
-                                                                           subtitle: "this is a mock cached feature",
-                                                                           iconUrl: "https://s0.wordpress.com/i/store/mobile/plans-personal.png",
-                                                                           iconBase64: nil)])]
+                                                   minimumAppVersion: "1.0",
+                                                   maximumAppVersion: "3.0",
+                                                   appVersionTargets: [],
+                                                   detailsUrl: "http://wordpress.org",
+                                                   announcementVersion: "1.0",
+                                                   isLocalized: false,
+                                                   responseLocale: "",
+                                                   features: [WordPressKit.Feature(title: "first cached feature",
+                                                                                   subtitle: "this is a mock cached feature",
+                                                                                   icons: nil,
+                                                                                   iconUrl: "https://s0.wordpress.com/i/store/mobile/plans-personal.png",
+                                                                                   iconBase64: nil),
+                                                              WordPressKit.Feature(title: "second cached feature",
+                                                                                   subtitle: "this is a mock cached feature",
+                                                                                   icons: nil,
+                                                                                   iconUrl: "https://s0.wordpress.com/i/store/mobile/plans-personal.png",
+                                                                                   iconBase64: nil)])]
 
     init(localCacheIsValid: Bool = true) {
         self.announcements = localCacheIsValid ? localAnnouncements : nil
@@ -47,6 +49,7 @@ class MockAnnouncementsService: AnnouncementServiceRemote {
                                                                                       responseLocale: "",
                                                                                       features: [WordPressKit.Feature(title: "mock feature",
                                                                                                                       subtitle: "this is a mock feature",
+                                                                                                                      icons: nil,
                                                                                                                       iconUrl: "https://s0.wordpress.com/i/store/mobile/plans-personal.png",
                                                                                                                       iconBase64: nil)])])