wordpress-mobile · mokagio · May 13, 2025 · May 13, 2025 · Jun 26, 2025 · Jun 26, 2025
diff --git a/.buildkite/commands/run-unit-tests-for-scheme.sh b/.buildkite/commands/run-unit-tests-for-scheme.sh
@@ -0,0 +1,17 @@
+#!/bin/bash -euo pipefail
+
+SCHEME="${1:?Usage $0 SCHEME}"
+DEVICE="iPhone 16"
+OS_VERSION="18.4"
+
+if "$(dirname "${BASH_SOURCE[0]}")/should-skip-job.sh" --job-type validation; then
+  exit 0
+fi
+
+$(dirname "${BASH_SOURCE[0]}")/shared-set-up.sh
+
+xcodebuild \
+  -scheme "${SCHEME}" \
+  -destination "platform=iOS Simulator,OS=${OS_VERSION},name=${DEVICE}" \
+  test \
+  | xcbeautify
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
@@ -111,35 +111,15 @@ steps:
           - github_commit_status:
               context: "Reader Unit Tests"
       - label: "🔬 Keystone Unit Tests"
-        command: |
-          if .buildkite/commands/should-skip-job.sh --job-type validation; then
-            exit 0
-          fi
-
-          .buildkite/commands/shared-set-up.sh
-          xcodebuild \
-            -scheme Keystone \
-            -destination 'platform=iOS Simulator,OS=18.2,name=iPhone 16' \
-            test \
-            | xcbeautify
+        command: .buildkite/commands/run-unit-tests-for-scheme.sh Keystone
         plugins: [$CI_TOOLKIT_PLUGIN]
         artifact_paths:
           - "build/results/*"
         notify:
           - github_commit_status:
               context: "Unit Tests Keystone"
       - label: "🔬 WordPressData Unit Tests"
-        command: |
-          if .buildkite/commands/should-skip-job.sh --job-type validation; then
-            exit 0
-          fi
-
-          .buildkite/commands/shared-set-up.sh
-          xcodebuild \
-            -scheme WordPressData \
-            -destination 'platform=iOS Simulator,OS=18.2,name=iPhone 16' \
-            test \
-            | xcbeautify
+        command: .buildkite/commands/run-unit-tests-for-scheme.sh WordPressData
         plugins: [$CI_TOOLKIT_PLUGIN]
         artifact_paths:
           - "build/results/*"

diff --git a/WordPress/Classes/RemotePost+Metadata.swift → ...PressData/Swift/RemotePost+Metadata.swift b/WordPress/Classes/RemotePost+Metadata.swift → ...PressData/Swift/RemotePost+Metadata.swift
diff --git a/...ses/Services/PostRepository+Helpers.swift → .../RemotePostCreateParameters+Helpers.swift b/...ses/Services/PostRepository+Helpers.swift → .../RemotePostCreateParameters+Helpers.swift
@@ -52,24 +52,3 @@ private func makeTags(from tags: String) -> [String] {
         .map { $0.trimmingCharacters(in: .whitespacesAndNewlines) }
         .filter { !$0.isEmpty }
 }
-
-public extension RemotePostUpdateParameters {
-
-    var isEmpty: Bool {
-        self == RemotePostUpdateParameters()
-    }
-
-    /// Returns a diff between the original and the latest revision with the
-    /// changes applied on top.
-    static func changes(from original: AbstractPost, to latest: AbstractPost, with changes: RemotePostUpdateParameters? = nil) -> RemotePostUpdateParameters {
-        guard original !== latest else {
-            return changes ?? RemotePostUpdateParameters()
-        }
-        let parametersOriginal = RemotePostCreateParameters(post: original)
-        var parametersLatest = RemotePostCreateParameters(post: latest)
-        if let changes {
-            parametersLatest.apply(changes)
-        }
-        return parametersLatest.changes(from: parametersOriginal)
-    }
-}
diff --git a/Sources/WordPressData/Swift/RemotePostUpdateParameters+Helpers.swift b/Sources/WordPressData/Swift/RemotePostUpdateParameters+Helpers.swift
@@ -0,0 +1,22 @@
+import WordPressKit
+
+public extension RemotePostUpdateParameters {
+
+    var isEmpty: Bool {
+        self == RemotePostUpdateParameters()
+    }
+
+    /// Returns a diff between the original and the latest revision with the
+    /// changes applied on top.
+    static func changes(from original: AbstractPost, to latest: AbstractPost, with changes: RemotePostUpdateParameters? = nil) -> RemotePostUpdateParameters {
+        guard original !== latest else {
+            return changes ?? RemotePostUpdateParameters()
+        }
+        let parametersOriginal = RemotePostCreateParameters(post: original)
+        var parametersLatest = RemotePostCreateParameters(post: latest)
+        if let changes {
+            parametersLatest.apply(changes)
+        }
+        return parametersLatest.changes(from: parametersOriginal)
+    }
+}
diff --git a/...rking/WordPressOrgRestApi+WordPress.swift → ...Swift/WordPressOrgRestApi+WordPress.swift b/...rking/WordPressOrgRestApi+WordPress.swift → ...Swift/WordPressOrgRestApi+WordPress.swift
diff --git a/WordPress/Classes/Apps/Reader/ReaderTabViewController.swift b/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 {

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/Models/Gutenberg/BlockEditorSettings+GutenbergEditorSettings.swift b/WordPress/Classes/Models/Gutenberg/BlockEditorSettings+GutenbergEditorSettings.swift
@@ -1,4 +1,5 @@
 import Foundation
+import WordPressData
 import WordPressKit
 import Gutenberg
 

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+Interests.swift b/WordPress/Classes/Services/ReaderTopicService+Interests.swift
@@ -1,4 +1,5 @@
 import Foundation
+import WordPressData
 import WordPressKit
 import WordPressShared
 

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;