wordpress-mobile · crazytonyli · Jul 3, 2025 · Jun 26, 2025 · Jun 26, 2025 · Jun 26, 2025
diff --git a/WordPress/Classes/Categories/Media+Extensions.m b/WordPress/Classes/Categories/Media+Extensions.m
@@ -2,12 +2,7 @@
 #import "MediaService.h"
 @import WordPressData;
 @import WordPressShared;
-#ifdef KEYSTONE
-#import "Keystone-Swift.h"
-#else
 #import "WordPress-Swift.h"
-#endif
-
 @implementation Media (Extensions)
 
 - (NSError *)errorWithMessage:(NSString *)errorMessage {

diff --git a/WordPress/Classes/Services/AccountService.h b/WordPress/Classes/Services/AccountService.h
@@ -1,11 +1,11 @@
 #import <Foundation/Foundation.h>
 #import <CoreData/CoreData.h>
-@import WordPressData;
 
 NS_ASSUME_NONNULL_BEGIN
 
 @class WPAccount;
 @class RemoteUser;
+@protocol CoreDataStack;
 
 extern NSNotificationName const WPAccountEmailAndDefaultBlogUpdatedNotification;
 

diff --git a/WordPress/Classes/Services/AccountService.m b/WordPress/Classes/Services/AccountService.m
@@ -5,12 +5,7 @@
 @import WordPressKit;
 @import WordPressShared;
 
-#ifdef KEYSTONE
-#import "Keystone-Swift.h"
-#else
 #import "WordPress-Swift.h"
-#endif
-
 NSString * const WPAccountEmailAndDefaultBlogUpdatedNotification = @"WPAccountEmailAndDefaultBlogUpdatedNotification";
 
 @implementation AccountService

diff --git a/WordPress/Classes/Services/BlogService.h b/WordPress/Classes/Services/BlogService.h
@@ -1,14 +1,15 @@
 #import <Foundation/Foundation.h>
-@import WordPressData;
 
 NS_ASSUME_NONNULL_BEGIN
 
 extern NSString *const WordPressMinimumVersion;
 extern NSString *const WPBlogUpdatedNotification;
 extern NSString *const WPBlogSettingsUpdatedNotification;
 
+@class Blog;
 @class WPAccount;
 @class SiteInfo;
+@protocol CoreDataStack;
 
 @interface BlogService : NSObject
 

diff --git a/WordPress/Classes/Services/BlogService.m b/WordPress/Classes/Services/BlogService.m
@@ -3,11 +3,7 @@
 #import "WPError.h"
 #import "PostCategoryService.h"
 #import "CommentService.h"
-#ifdef KEYSTONE
-#import "Keystone-Swift.h"
-#else
 #import "WordPress-Swift.h"
-#endif
 @import WordPressData;
 @import WordPressKit;
 @import WordPressShared;

diff --git a/WordPress/Classes/Services/CommentService.h b/WordPress/Classes/Services/CommentService.h
@@ -1,6 +1,5 @@
 #import <Foundation/Foundation.h>
 #import <WordPressKit/WordPressKit.h>
-@import WordPressData;
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -12,6 +11,7 @@ extern NSUInteger const WPTopLevelHierarchicalCommentsPerPage;
 @class BasePost;
 @class RemoteUser;
 @class CommentServiceRemoteFactory;
+@protocol CoreDataStack;
 
 @interface CommentService : NSObject
 

diff --git a/WordPress/Classes/Services/CommentService.m b/WordPress/Classes/Services/CommentService.m
@@ -1,10 +1,6 @@
 #import "CommentService.h"
 #import "AccountService.h"
-#ifdef KEYSTONE
-#import "Keystone-Swift.h"
-#else
 #import "WordPress-Swift.h"
-#endif
 @import WordPressData;
 
 @import WordPressShared;

diff --git a/WordPress/Classes/Services/Facades/BlogSyncFacade.m b/WordPress/Classes/Services/Facades/BlogSyncFacade.m
@@ -2,14 +2,8 @@
 #import "BlogService.h"
 #import "AccountService.h"
 #import "WPAppAnalytics.h"
-#ifdef KEYSTONE
-#import "Keystone-Swift.h"
-#else
 #import "WordPress-Swift.h"
-#endif
-// For some reason, the modular import does not work.
-// @import WordPressData;
-#import <WordPressData/WordPressData.h>
+@import WordPressData;
 
 @import WordPressShared;
 @import NSObject_SafeExpectations;

diff --git a/WordPress/Classes/Services/MediaService.h b/WordPress/Classes/Services/MediaService.h
@@ -4,8 +4,6 @@
 
 @class Media;
 @class RemoteVideoPressVideo;
-@class Blog;
-@class AbstractPost;
 @protocol ExportableAsset;
 
 extern NSErrorDomain _Nonnull const MediaServiceErrorDomain;

diff --git a/WordPress/Classes/Services/MediaService.m b/WordPress/Classes/Services/MediaService.m
@@ -1,11 +1,6 @@
 #import "MediaService.h"
 #import <MobileCoreServices/MobileCoreServices.h>
-#ifdef KEYSTONE
-#import "Keystone-Swift.h"
-#else
 #import "WordPress-Swift.h"
-#endif
-
 @import WordPressData;
 @import WordPressKit;
 @import WordPressUI;

diff --git a/WordPress/Classes/Services/MenusService.h b/WordPress/Classes/Services/MenusService.h
@@ -3,11 +3,6 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@class Blog;
-@class Menu;
-@class MenuLocation;
-@class MenuItem;
-
 typedef void(^MenusServiceSuccessBlock)(void);
 typedef void(^MenusServiceCreateOrUpdateMenuRequestSuccessBlock)(void);
 typedef void(^MenusServiceMenusRequestSuccessBlock)(NSArray<Menu *> * _Nullable menus);

diff --git a/WordPress/Classes/Services/MenusService.m b/WordPress/Classes/Services/MenusService.m
@@ -1,9 +1,5 @@
 #import "MenusService.h"
-#ifdef KEYSTONE
-#import "Keystone-Swift.h"
-#else
 #import "WordPress-Swift.h"
-#endif
 @import WordPressData;
 @import WordPressKit;
 

diff --git a/WordPress/Classes/Services/PostCategoryService.h b/WordPress/Classes/Services/PostCategoryService.h
@@ -1,10 +1,11 @@
+@import CoreData;
 #import <Foundation/Foundation.h>
-@import WordPressData;
 
 NS_ASSUME_NONNULL_BEGIN
 
 @class Blog;
 @class PostCategory;
+@protocol CoreDataStack;
 
 typedef NS_ENUM(NSInteger, PostCategoryServiceErrors) {
     PostCategoryServiceErrorsBlogNotFound

diff --git a/WordPress/Classes/Services/PostCategoryService.m b/WordPress/Classes/Services/PostCategoryService.m
@@ -1,9 +1,5 @@
 #import "PostCategoryService.h"
-#ifdef KEYSTONE
-#import "Keystone-Swift.h"
-#else
 #import "WordPress-Swift.h"
-#endif
 @import WordPressData;
 @import WordPressKit;
 

diff --git a/WordPress/Classes/Services/PostTagService.h b/WordPress/Classes/Services/PostTagService.h
@@ -2,9 +2,6 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@class Blog;
-@class PostTag;
-
 @interface PostTagService : LocalCoreDataService
 
 /**

diff --git a/WordPress/Classes/Services/PostTagService.m b/WordPress/Classes/Services/PostTagService.m
@@ -1,9 +1,5 @@
 #import "PostTagService.h"
-#ifdef KEYSTONE
-#import "Keystone-Swift.h"
-#else
 #import "WordPress-Swift.h"
-#endif
 @import WordPressData;
 @import WordPressKit;
 

diff --git a/WordPress/Classes/Services/Reader Post/ReaderPostService.h b/WordPress/Classes/Services/Reader Post/ReaderPostService.h
@@ -1,12 +1,13 @@
+@import CoreData;
 #import <Foundation/Foundation.h>
-@import WordPressData;
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wnullability-completeness"
 
 @class ReaderPost;
 @class ReaderAbstractTopic;
 @class WordPressComRestApi;
+@protocol CoreDataStack;
 
 extern NSString * const ReaderPostServiceErrorDomain;
 extern NSString * const ReaderPostServiceToggleSiteFollowingState;

diff --git a/WordPress/Classes/Services/Reader Post/ReaderPostService.m b/WordPress/Classes/Services/Reader Post/ReaderPostService.m
@@ -4,12 +4,7 @@
 #import "ReaderGapMarker.h"
 #import "ReaderSiteService.h"
 #import "WPAppAnalytics.h"
-#ifdef KEYSTONE
-#import "Keystone-Swift.h"
-#else
 #import "WordPress-Swift.h"
-#endif
-
 @import WordPressData;
 @import WordPressKit;
 @import WordPressShared;

diff --git a/WordPress/Classes/Services/ReaderSiteService.h b/WordPress/Classes/Services/ReaderSiteService.h
@@ -1,5 +1,6 @@
 #import <Foundation/Foundation.h>
-@import WordPressData;
+
+@protocol CoreDataStack;
 
 NS_ASSUME_NONNULL_BEGIN
 

diff --git a/WordPress/Classes/Services/ReaderSiteService.m b/WordPress/Classes/Services/ReaderSiteService.m
@@ -2,11 +2,7 @@
 
 #import "AccountService.h"
 #import "ReaderPostService.h"
-#ifdef KEYSTONE
-#import "Keystone-Swift.h"
-#else
 #import "WordPress-Swift.h"
-#endif
 #import "WPAppAnalytics.h"
 @import WordPressData;
 @import WordPressKit;

diff --git a/WordPress/Classes/Services/ReaderTopicService.h b/WordPress/Classes/Services/ReaderTopicService.h
@@ -1,5 +1,5 @@
+@import CoreData;
 #import <Foundation/Foundation.h>
-@import WordPressData;
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -9,6 +9,7 @@ extern NSString * const ReaderTopicFreshlyPressedPathCommponent;
 @class ReaderTagTopic;
 @class ReaderSiteTopic;
 @class ReaderSearchTopic;
+@protocol CoreDataStack;
 
 @interface ReaderTopicService : NSObject
 

diff --git a/WordPress/Classes/Services/ReaderTopicService.m b/WordPress/Classes/Services/ReaderTopicService.m
@@ -1,11 +1,7 @@
 #import "ReaderTopicService.h"
 #import "AccountService.h"
 #import "ReaderPostService.h"
-#ifdef KEYSTONE
-#import "Keystone-Swift.h"
-#else
 #import "WordPress-Swift.h"
-#endif
 @import WordPressData;
 @import WordPressKit;
 @import WordPressShared;

diff --git a/WordPress/Classes/Services/ThemeService.h b/WordPress/Classes/Services/ThemeService.h
@@ -1,10 +1,9 @@
-@import WordPressData;
-
 NS_ASSUME_NONNULL_BEGIN
 
 @class Blog;
 @class Theme;
 @class WPAccount;
+@protocol CoreDataStack;
 
 typedef void(^ThemeServiceSuccessBlock)(void);
 typedef void(^ThemeServiceThemeRequestSuccessBlock)(Theme * _Nullable theme);

diff --git a/WordPress/Classes/Services/ThemeService.m b/WordPress/Classes/Services/ThemeService.m
@@ -1,10 +1,6 @@
 #import "ThemeService.h"
 
-#ifdef KEYSTONE
-#import "Keystone-Swift.h"
-#else
 #import "WordPress-Swift.h"
-#endif
 @import WordPressData;
 @import WordPressKit;
 

diff --git a/WordPress/Classes/Utility/Analytics/WPAppAnalytics.m b/WordPress/Classes/Utility/Analytics/WPAppAnalytics.m
@@ -3,11 +3,7 @@
 
 #import "WPAppAnalytics.h"
 
-#ifdef KEYSTONE
-#import "Keystone-Swift.h"
-#else
 #import "WordPress-Swift.h"
-#endif
 @import WordPressData;
 
 NSString * const WPAppAnalyticsDefaultsUserOptedOut                 = @"tracks_opt_out";

diff --git a/WordPress/Classes/Utility/Logging/WPLogger.m b/WordPress/Classes/Utility/Logging/WPLogger.m
@@ -2,12 +2,7 @@
 @import WordPressShared;
 
 #import "WPLogger.h"
-#ifdef KEYSTONE
-#import "Keystone-Swift.h"
-#else
 #import "WordPress-Swift.h"
-#endif
-
 DDLogLevel ddLogLevel = DDLogLevelInfo;
 
 void SetCocoaLumberjackObjCLogLevel(NSUInteger ddLogLevelRawValue)

diff --git a/WordPress/Classes/Utility/UIAlertControllerProxy.m b/WordPress/Classes/Utility/UIAlertControllerProxy.m
@@ -1,11 +1,7 @@
 @import WordPressShared;
 
 #import "UIAlertControllerProxy.h"
-#ifdef KEYSTONE
-#import "Keystone-Swift.h"
-#else
 #import "WordPress-Swift.h"
-#endif
 @import WordPressShared;
 
 @implementation UIAlertControllerProxy

diff --git a/WordPress/Classes/Utility/WPError.m b/WordPress/Classes/Utility/WPError.m
@@ -1,10 +1,5 @@
 #import "WPError.h"
-#ifdef KEYSTONE
-#import "Keystone-Swift.h"
-#else
 #import "WordPress-Swift.h"
-#endif
-
 @import WordPressData;
 @import WordPressShared;
 @import WordPressKit;

diff --git a/WordPress/Classes/ViewRelated/Blog/Blog Details/BlogDetailsViewController.m b/WordPress/Classes/ViewRelated/Blog/Blog Details/BlogDetailsViewController.m
@@ -7,11 +7,7 @@
 #import "SharingViewController.h"
 #import "StatsViewController.h"
 #import "WPAppAnalytics.h"
-#ifdef KEYSTONE
-#import "Keystone-Swift.h"
-#else
 #import "WordPress-Swift.h"
-#endif
 #import "MenusViewController.h"
 
 @import Gridicons;

diff --git a/WordPress/Classes/ViewRelated/Blog/Sharing/SharingAuthorizationHelper.m b/WordPress/Classes/ViewRelated/Blog/Sharing/SharingAuthorizationHelper.m
@@ -3,11 +3,7 @@
 #import "SharingAuthorizationHelper.h"
 #import "BlogService.h"
 
-#ifdef KEYSTONE
-#import "Keystone-Swift.h"
-#else
 #import "WordPress-Swift.h"
-#endif
 @import WordPressData;
 
 

diff --git a/WordPress/Classes/ViewRelated/Blog/Sharing/SharingConnectionsViewController.m b/WordPress/Classes/ViewRelated/Blog/Sharing/SharingConnectionsViewController.m
@@ -3,12 +3,7 @@
 #import "BlogService.h"
 #import "SharingDetailViewController.h"
 #import "SharingAuthorizationHelper.h"
-#ifdef KEYSTONE
-#import "Keystone-Swift.h"
-#else
 #import "WordPress-Swift.h"
-#endif
-
 @import WordPressData;
 @import WordPressShared;
 

diff --git a/WordPress/Classes/ViewRelated/Blog/Sharing/SharingDetailViewController.m b/WordPress/Classes/ViewRelated/Blog/Sharing/SharingDetailViewController.m
@@ -1,12 +1,7 @@
 #import "SharingDetailViewController.h"
 #import "BlogService.h"
 #import "SharingAuthorizationHelper.h"
-#ifdef KEYSTONE
-#import "Keystone-Swift.h"
-#else
 #import "WordPress-Swift.h"
-#endif
-
 @import WordPressData;
 @import WordPressShared;