Add more imports required for Keystone to build for testing

WordPress/Classes/Apps/Reader/ReaderTabViewController.swift

@@ -1,6 +1,7 @@
 import Combine
 import UIKit
 import SwiftUI
+import WordPressData
 import WordPressUI
 
 final class ReaderTabViewController: UITabBarController, UITabBarControllerDelegate {

WordPress/Classes/Models/Gutenberg/BlockEditorSettings+GutenbergEditorSettings.swift

@@ -1,4 +1,5 @@
 import Foundation
+import WordPressData
 import WordPressKit
 import Gutenberg
 

WordPress/Classes/Services/ReaderTopicService+Interests.swift

@@ -1,4 +1,5 @@
 import Foundation
+import WordPressData
 import WordPressKit
 import WordPressShared
 

WordPress/Classes/System/Root View/RootViewPresenter.swift

@@ -1,5 +1,6 @@
 import Foundation
 import WordPressData
+import WordPressKit
 import WordPressShared
 
 protocol RootViewPresenter: AnyObject {

WordPress/Classes/Utility/Notifications/PushAuthenticationManager.swift

@@ -1,4 +1,5 @@
 import UIKit
+import WordPressData
 import WordPressShared
 
 /// The purpose of this class is to handle WordPress.com Push Authentication Notifications.

WordPress/Classes/Utility/Notifications/PushNotificationsManager.swift

@@ -1,4 +1,5 @@
 import Foundation
+import WordPressData
 import WordPressShared
 import NSObject_SafeExpectations
 import UserNotifications

WordPress/Classes/Utility/Universal Links/Routes+Reader.swift

@@ -1,4 +1,5 @@
 import UIKit
+import WordPressData
 
 enum ReaderRoute {
     case root

WordPress/Classes/Utility/Universal Links/Routes+Stats.swift

@@ -1,4 +1,5 @@
 import UIKit
+import WordPressKit
 
 enum StatsRoute {
     case root

WordPress/Classes/ViewRelated/Blog/Blog Details/BlogDetailsViewController+Swift.swift

@@ -1,4 +1,6 @@
 import Foundation
+import UIKit
+import WordPressData
 import WordPressShared
 import WordPressAPI
 import WordPressCore

WordPress/Classes/ViewRelated/Blog/Site Management/SiteSettingsViewController+SiteManagement.swift

@@ -1,5 +1,6 @@
 import UIKit
 import SVProgressHUD
+import WordPressData
 import WordPressShared
 
 /// Implements site management services triggered from SiteSettingsViewController

WordPress/Classes/ViewRelated/Me/Account Settings/AccountSettingsViewController.swift

@@ -1,6 +1,7 @@
 import UIKit
 import SwiftUI
 import SVProgressHUD
+import WordPressData
 import WordPressShared
 import WordPressFlux
 import WordPressUI

WordPress/Classes/ViewRelated/Me/Domain Details/DomainDetailsWebViewController.swift

@@ -1,4 +1,5 @@
 import Foundation
+import WordPressData
 import WordPressShared
 
 final class DomainDetailsWebViewController: WebKitViewController {

WordPress/Classes/ViewRelated/Plugins/ViewModels/PluginViewModel.swift

@@ -1,4 +1,5 @@
 import Foundation
+import WordPressData
 import WordPressFlux
 import WordPressKit
 import WordPressUI

WordPress/Classes/ViewRelated/Post/Views/AuthorFilterViewController.swift

@@ -1,5 +1,6 @@
 import UIKit
 import Gridicons
+import WordPressData
 import WordPressUI
 
 /// Displays a simple table view picker list to choose between author filters

WordPress/Classes/ViewRelated/Reader/Controllers/ReaderPostActions/ReaderLikeAction.swift

@@ -1,4 +1,5 @@
 import UIKit
+import WordPressData
 
 /// Encapsulates a command to toggle a post's liked status
 final class ReaderLikeAction {

WordPress/Classes/ViewRelated/Reader/Controllers/ReaderPostActions/ReaderPostMenu.swift

@@ -1,6 +1,7 @@
 import Foundation
 import UIKit
 import SafariServices
+import WordPressData
 import WordPressShared
 
 struct ReaderPostMenu {

WordPress/Classes/ViewRelated/Reader/Controllers/ReaderStreamViewController+Sharing.swift

@@ -2,6 +2,7 @@ import UIKit
 import MobileCoreServices
 import UniformTypeIdentifiers
 import ShareExtensionCore
+import WordPressData
 
 // MARK: - Functionality related to sharing a blog via the reader.
 

WordPress/Classes/ViewRelated/Reader/Subscriptions/ReaderBlockingHelper.swift

@@ -1,4 +1,5 @@
 import Foundation
+import WordPressData
 
 struct ReaderBlockingHelper {
     func blockSite(forPost post: ReaderPost, context: NSManagedObjectContext = ContextManager.shared.mainContext) {

WordPress/Classes/ViewRelated/Reader/Subscriptions/ReaderSubscriptionCell.swift

@@ -1,4 +1,5 @@
 import SwiftUI
+import WordPressData
 import WordPressUI
 
 struct ReaderSubscriptionCell: View {

WordPress/Classes/ViewRelated/Reader/Subscriptions/ReaderSubscriptionNotificationSettingsButton.swift

@@ -1,4 +1,5 @@
 import SwiftUI
+import WordPressData
 import WordPressUI
 
 struct ReaderSubscriptionNotificationSettingsButton: View {

WordPress/Classes/ViewRelated/Reader/Subscriptions/ReaderSubscriptionsView.swift

@@ -1,4 +1,5 @@
 import SwiftUI
+import WordPressData
 import WordPressUI
 import WordPressShared
 

WordPress/Classes/ViewRelated/Stats/Extensions/StatsViewController+JetpackSettings.swift

@@ -1,5 +1,6 @@
 import Foundation
 import UIKit
+import WordPressData
 
 extension StatsViewController {
 

WordPress/Classes/ViewRelated/Stats/Helpers/SiteStatsImmuTableRows.swift

@@ -1,4 +1,5 @@
 import Foundation
+import WordPressKit
 
 /// Helper class to encapsulate ImmuTableRows creation
 /// Stats Revamp results in the same ImmuTableRows created in different screens

WordPress/Classes/ViewRelated/Stats/Insights/Posting Activity/PostingActivityCell.swift

@@ -1,4 +1,5 @@
 import UIKit
+import WordPressKit
 import WordPressShared
 
 class PostingActivityCell: StatsBaseCell, NibLoadable, Accessible {

WordPress/Classes/ViewRelated/Stats/Insights/Posting Activity/PostingActivityCollectionViewCell.swift

@@ -1,4 +1,5 @@
 import UIKit
+import WordPressKit
 
 class PostingActivityCollectionViewCell: UICollectionViewCell {
 

WordPress/Classes/ViewRelated/Stats/Insights/Posting Activity/PostingActivityDay.swift

@@ -1,4 +1,5 @@
 import UIKit
+import WordPressKit
 import WordPressShared
 
 protocol PostingActivityDayDelegate: AnyObject {

WordPress/Classes/ViewRelated/Stats/Insights/SiteStatsInsightsTableViewController.swift

@@ -1,5 +1,6 @@
 import UIKit
 import WordPressData
+import WordPressKit
 import WordPressFlux
 import WordPressUI
 

WordPress/Classes/ViewRelated/Stats/Insights/SiteStatsInsightsViewModel.swift

@@ -1,4 +1,6 @@
 import Foundation
+import WordPressData
+import WordPressKit
 import WordPressFlux
 import WordPressShared
 

WordPress/Classes/ViewRelated/Stats/Insights/ViewsVisitors/ViewsVisitorsLineChartCell.swift

@@ -1,5 +1,6 @@
 import UIKit
 import WordPressData
+import WordPressKit
 import WordPressShared
 
 struct StatsSegmentedControlData: Equatable {

WordPress/Classes/ViewRelated/Stats/Period Stats/SiteStatsPeriodTableViewController.swift

@@ -1,6 +1,7 @@
 import UIKit
 import WordPressData
 import WordPressFlux
+import WordPressKit
 import WordPressUI
 import Combine
 

WordPress/Classes/ViewRelated/Stats/Period Stats/SiteStatsPeriodViewModel.swift

@@ -1,4 +1,5 @@
 import Foundation
+import WordPressKit
 import WordPressFlux
 import WordPressShared
 

WordPress/Classes/ViewRelated/Stats/Shared Views/Stats Detail/SiteStatsDetailTableViewController.swift

@@ -1,6 +1,7 @@
 import UIKit
 import WordPressData
 import WordPressFlux
+import WordPressKit
 import WordPressUI
 
 @objc protocol SiteStatsDetailsDelegate {

WordPress/Classes/ViewRelated/Stats/Shared Views/Stats Detail/SiteStatsInsightsDetailsTableViewController.swift

@@ -1,5 +1,6 @@
 import UIKit
 import WordPressData
+import WordPressKit
 import WordPressFlux
 import WordPressUI
 

WordPress/Classes/ViewRelated/Stats/Shared Views/Stats Detail/SiteStatsInsightsDetailsViewModel.swift

@@ -1,6 +1,7 @@
 import Foundation
 import UIKit
 import WordPressFlux
+import WordPressKit
 import WordPressShared
 
 /// The view model used by SiteStatsDetailTableViewController to show

WordPress/Classes/ViewRelated/Stats/SiteStatsDashboardViewController.swift

@@ -1,4 +1,5 @@
 import UIKit
+import WordPressKit
 import WordPressShared
 
 enum StatsTabType: Int, FilterTabBarItem, CaseIterable {

WordPress/Classes/ViewRelated/Suggestions/SuggestionsTableView.m

@@ -5,6 +5,9 @@
 #else
 #import "WordPress-Swift.h"
 #endif
+// For some reason, the modular import does not work.
+// @import WordPressData;
+#import <WordPressData/WordPressData.h>
 
 CGFloat const STVDefaultMinHeaderHeight = 0.f;
 NSString * const CellIdentifier = @"SuggestionsTableViewCell";

WordPress/Classes/ViewRelated/Support/SupportTableViewControllerConfiguration.swift

@@ -1,4 +1,5 @@
 import Foundation
+import WordPressData
 
 struct SupportTableViewControllerConfiguration {
 

WordPress/Classes/ViewRelated/System/WPTabBarController.m

@@ -10,6 +10,9 @@
 #else
 #import "WordPress-Swift.h"
 #endif
+// For some reason, the modular import does not work.
+// @import WordPressData;
+#import <WordPressData/WordPressData.h>
 
 @import Gridicons;
 @import WordPressData;