wordpress-mobile · crazytonyli · Aug 31, 2025 · Aug 28, 2025 · Aug 28, 2025 · Aug 28, 2025
diff --git a/Modules/Package.resolved b/Modules/Package.resolved
diff --git a/Modules/Package.swift b/Modules/Package.swift
@@ -50,7 +50,7 @@ let package = Package(
         .package(url: "https://github.com/wordpress-mobile/NSURL-IDN", revision: "b34794c9a3f32312e1593d4a3d120572afa0d010"),
         .package(
             url: "https://github.com/wordpress-mobile/WordPressKit-iOS",
-            revision: "440d94e3a3d6f9f39035a371984e088a2fb42a32"
+            branch: "rework-spm"
         ),
         .package(url: "https://github.com/zendesk/support_sdk_ios", from: "8.0.3"),
         // We can't use wordpress-rs branches nor commits here. Only tags work.
@@ -273,6 +273,7 @@ enum XcodeSupport {
             .product(name: "ZIPFoundation", package: "ZIPFoundation"),
             .product(name: "Aztec", package: "AztecEditor-iOS"),
             .product(name: "WordPressEditor", package: "AztecEditor-iOS"),
+            .product(name: "WordPressKit", package: "WordPressKit-iOS"),
         ]
 
         let testDependencies: [Target.Dependency] = [
@@ -392,6 +393,7 @@ enum XcodeSupport {
                 .product(name: "CocoaLumberjack", package: "CocoaLumberjack"),
                 .product(name: "CocoaLumberjackSwift", package: "CocoaLumberjack"),
                 .product(name: "WordPressAPI", package: "wordpress-rs"),
+                .product(name: "WordPressKit", package: "WordPressKit-iOS"),
             ]),
             .xcodeTarget("XcodeTarget_Intents", dependencies: [
                 "BuildSettingsKit",

diff --git a/Modules/Sources/JetpackStats/Services/StatsService.swift b/Modules/Sources/JetpackStats/Services/StatsService.swift
@@ -266,8 +266,10 @@ actor StatsService: StatsServiceProtocol {
                 excludeUserIDs: nil,
                 success: { users, found in
                     let likeUsers = users.map { remoteLike in
-                        PostLikesData.PostLikeUser(
-                            id: remoteLike.userID.intValue,
+                        wpAssert(remoteLike.userID != nil, "user id must not be nil")
+
+                        return PostLikesData.PostLikeUser(
+                            id: remoteLike.userID?.intValue ?? 0,
                             name: remoteLike.displayName ?? remoteLike.username ?? "",
                             avatarURL: remoteLike.avatarURL.flatMap(URL.init)
                         )

diff --git a/Sources/WordPressAuthenticator/Helpers/LoginFacade.h b/Sources/WordPressAuthenticator/Helpers/LoginFacade.h
@@ -1,5 +1,9 @@
 #import <Foundation/Foundation.h>
 
+// This is a strange hack to make the `-[LoginFacadeDelegate needsMultifactorCodeForUserID:andNonceInfo:]`
+// available in Objective-C runtime.
+@import WordPressKit;
+
 NS_ASSUME_NONNULL_BEGIN
 
 @class LoginFields;

diff --git a/Sources/WordPressData/Objective-C/Blog.m b/Sources/WordPressData/Objective-C/Blog.m
@@ -7,6 +7,7 @@
 @import WordPressShared;
 @import NSObject_SafeExpectations;
 @import NSURL_IDN;
+@import WordPressKit;
 
 @class Comment;
 

diff --git a/Sources/WordPressData/Objective-C/PostHelper.m b/Sources/WordPressData/Objective-C/PostHelper.m
@@ -3,6 +3,7 @@
 #import "WordPressData-Swift.h"
 
 @import WordPressKit;
+@import WordPressKitModels;
 @import WordPressShared;
 @import NSObject_SafeExpectations;
 

diff --git a/Sources/WordPressData/Objective-C/ReaderPost.m b/Sources/WordPressData/Objective-C/ReaderPost.m
@@ -4,6 +4,7 @@
 #import "WordPressData-Swift.h"
 
 @import WordPressKit;
+@import WordPressKitModels;
 @import WordPressShared;
 
 // These keys are used in the getStoredComment method

diff --git a/Sources/WordPressData/Objective-C/include/Blog.h b/Sources/WordPressData/Objective-C/include/Blog.h
@@ -2,6 +2,8 @@
 #import <CommonCrypto/CommonDigest.h>
 #import <CoreData/CoreData.h>
 
+@import WordPressKit;
+
 NS_ASSUME_NONNULL_BEGIN
 
 @class AbstractPost;

diff --git a/Sources/WordPressData/Objective-C/include/PostServiceOptions.h b/Sources/WordPressData/Objective-C/include/PostServiceOptions.h
@@ -1,4 +1,4 @@
-#import <WordPressKit/WordPressKit.h>
+@import WordPressKitObjC;
 
 /**
  @class PostServiceSyncOptions

diff --git a/Sources/WordPressData/Objective-C/include/WPAccount.h b/Sources/WordPressData/Objective-C/include/WPAccount.h
@@ -1,6 +1,8 @@
 #import <Foundation/Foundation.h>
 #import <CoreData/CoreData.h>
 
+@import WordPressKit;
+
 NS_ASSUME_NONNULL_BEGIN
 
 @class Blog;

diff --git a/Sources/WordPressData/Swift/BloggingPrompt+CoreDataClass.swift b/Sources/WordPressData/Swift/BloggingPrompt+CoreDataClass.swift
@@ -1,6 +1,5 @@
 import Foundation
 import CoreData
-import WordPressKit
 
 public class BloggingPrompt: NSManagedObject {
 

diff --git a/Sources/WordPressData/Swift/PageTemplateCategory+CoreDataProperties.swift b/Sources/WordPressData/Swift/PageTemplateCategory+CoreDataProperties.swift
@@ -1,5 +1,6 @@
 import Foundation
 import CoreData
+import WordPressKit
 
 extension PageTemplateCategory {
 

diff --git a/Sources/WordPressData/Swift/PageTemplateLayout+CoreDataProperties.swift b/Sources/WordPressData/Swift/PageTemplateLayout+CoreDataProperties.swift
@@ -1,5 +1,6 @@
 import Foundation
 import CoreData
+import WordPressKit
 
 extension PageTemplateLayout {
 

diff --git a/Sources/WordPressData/Swift/PostHelper+Metadata.swift b/Sources/WordPressData/Swift/PostHelper+Metadata.swift
@@ -1,5 +1,6 @@
 import Foundation
 import WordPressShared
+import WordPressKit
 
 public extension PostHelper {
     @objc static let foreignIDKey = "wp_jp_foreign_id"

diff --git a/Sources/WordPressData/Swift/ReaderCard+CoreDataClass.swift b/Sources/WordPressData/Swift/ReaderCard+CoreDataClass.swift
@@ -1,5 +1,6 @@
 import Foundation
 import CoreData
+import WordPressKit
 
 public class ReaderCard: NSManagedObject {
     public enum CardType {

diff --git a/Sources/WordPressData/Swift/ReaderSiteInfoSubscriptions.swift b/Sources/WordPressData/Swift/ReaderSiteInfoSubscriptions.swift
@@ -1,5 +1,6 @@
 import Foundation
 import CoreData
+import WordPressKit
 
 @objc(ReaderSiteInfoSubscriptionPost)
 public class ReaderSiteInfoSubscriptionPost: NSManagedObject {

diff --git a/Sources/WordPressData/Swift/ReaderSiteTopic.swift b/Sources/WordPressData/Swift/ReaderSiteTopic.swift
@@ -1,4 +1,5 @@
 import Foundation
+import WordPressKit
 
 @objc(ReaderSiteTopic)
 open class ReaderSiteTopic: ReaderAbstractTopic {

diff --git a/Sources/WordPressData/Swift/ReaderTagTopic.swift b/Sources/WordPressData/Swift/ReaderTagTopic.swift
@@ -1,5 +1,6 @@
 import Foundation
 import WordPressShared
+import WordPressKit
 
 @objc(ReaderTagTopic)
 open class ReaderTagTopic: ReaderAbstractTopic {

diff --git a/Sources/WordPressData/Swift/RemotePost+Metadata.swift b/Sources/WordPressData/Swift/RemotePost+Metadata.swift
@@ -1,5 +1,6 @@
 import Foundation
 import WordPressShared
+import WordPressKit
 
 @objc
 public extension RemotePost {

diff --git a/Sources/WordPressData/Swift/Role.swift b/Sources/WordPressData/Swift/Role.swift
@@ -1,5 +1,6 @@
 import Foundation
 import CoreData
+import WordPressKit
 
 public class Role: NSManagedObject {
     @NSManaged public var name: String!

diff --git a/Tests/KeystoneTests/Tests/Services/PostRepositoryTests.swift b/Tests/KeystoneTests/Tests/Services/PostRepositoryTests.swift
@@ -270,11 +270,6 @@ private class PostServiceRESTMock: PostServiceRemoteREST {
 
     var autoSaveStubbedBehavior = StubbedBehavior.success(nil)
 
-    // related to fetching likes
-    var fetchLikesShouldSucceed: Bool = true
-    var remoteUsersToReturnOnGetLikes = [RemoteLikeUser]()
-    var totalLikes: NSNumber = 1
-
     var deletePostResult: Result<Void, Error> = .success(())
     var trashPostResult: Result<RemotePost, Error> = .failure(NSError.testInstance())
     var restorePostResult: Result<RemotePost, Error> = .failure(NSError.testInstance())
@@ -325,19 +320,6 @@ private class PostServiceRESTMock: PostServiceRemoteREST {
         }
     }
 
-    override func getLikesForPostID(_ postID: NSNumber,
-                                    count: NSNumber,
-                                    before: String?,
-                                    excludeUserIDs: [NSNumber]?,
-                                    success: (([RemoteLikeUser], NSNumber) -> Void)!,
-                                    failure: ((Error?) -> Void)!) {
-        if self.fetchLikesShouldSucceed {
-            success(self.remoteUsersToReturnOnGetLikes, self.totalLikes)
-        } else {
-            failure(nil)
-        }
-    }
-
     override func delete(_ post: RemotePost!, success: (() -> Void)!, failure: ((Error?) -> Void)!) {
         switch deletePostResult {
         case let .failure(error):

diff --git a/WordPress/Classes/Categories/Media+Extensions.m b/WordPress/Classes/Categories/Media+Extensions.m
@@ -2,6 +2,7 @@
 #import "MediaService.h"
 @import WordPressData;
 @import WordPressShared;
+@import WordPressKitModels;
 #import "WordPress-Swift.h"
 @implementation Media (Extensions)
 

diff --git a/WordPress/Classes/Login/WordPressDotComAuthenticator.swift b/WordPress/Classes/Login/WordPressDotComAuthenticator.swift
@@ -5,6 +5,7 @@ import UIKit
 import SVProgressHUD
 import WordPressData
 import WordPressShared
+import WordPressKit
 import BuildSettingsKit
 @preconcurrency import Combine
 
@@ -138,7 +139,7 @@ struct WordPressDotComAuthenticator {
         // Fetch WP.com account details
         let user: RemoteUser
         do {
-            let service = AccountServiceRemoteREST(wordPressComRestApi: .defaultApi(oAuthToken: token, userAgent: WPUserAgent.wordPress()))
+            let service = AccountServiceRemoteREST(wordPressComRestApi: WordPressComRestApi.defaultApi(oAuthToken: token, userAgent: WPUserAgent.wordPress()))
             user = try await withCheckedThrowingContinuation { continuation in
                 service.getAccountDetails(success: { continuation.resume(returning: $0!) }, failure: { continuation.resume(throwing: $0!) })
             }

diff --git a/WordPress/Classes/Models/Notifications/Notification+AppsTargets.swift b/WordPress/Classes/Models/Notifications/Notification+AppsTargets.swift
@@ -1,5 +1,6 @@
 import FormattableContentKit
 import WordPressData
+import WordPressKit
 
 extension WordPressData.Notification {
 

diff --git a/WordPress/Classes/Models/PublicizeConnection+Creation.swift b/WordPress/Classes/Models/PublicizeConnection+Creation.swift
@@ -1,5 +1,6 @@
 import Foundation
 import WordPressData
+import WordPressKit
 
 extension PublicizeConnection {
 

diff --git a/WordPress/Classes/Models/WPAccount+AccountSettings.swift b/WordPress/Classes/Models/WPAccount+AccountSettings.swift
@@ -1,6 +1,7 @@
 import Foundation
 import BuildSettingsKit
 import WordPressData
+import WordPressKit
 
 extension WPAccount {
     enum VerificationStatus: String {

diff --git a/WordPress/Classes/Services/AccountService.h b/WordPress/Classes/Services/AccountService.h
@@ -1,6 +1,8 @@
 #import <Foundation/Foundation.h>
 #import <CoreData/CoreData.h>
 
+@import WordPressKitModels;
+
 NS_ASSUME_NONNULL_BEGIN
 
 @class WPAccount;

diff --git a/WordPress/Classes/Services/AccountService.m b/WordPress/Classes/Services/AccountService.m
@@ -3,6 +3,7 @@
 
 @import WordPressData;
 @import WordPressKit;
+@import WordPressKitModels;
 @import WordPressShared;
 
 #import "WordPress-Swift.h"

diff --git a/WordPress/Classes/Services/BlogService+Swift.swift b/WordPress/Classes/Services/BlogService+Swift.swift
@@ -1,5 +1,6 @@
 import Foundation
 import WordPressData
+import WordPressShared
 
 extension BlogService {
     @objc public func unscheduleBloggingReminders(for blog: Blog) {
@@ -44,8 +45,13 @@ extension BlogService {
             }
 
             remoteUsers.forEach {
-                let blogAuthor = findBlogAuthor(with: $0.userID, and: blog, in: context)
-                blogAuthor.userID = $0.userID
+                guard let userID = $0.userID else {
+                    wpAssertionFailure("user id must not be nil")
+                    return
+                }
+
+                let blogAuthor = findBlogAuthor(with: userID, and: blog, in: context)
+                blogAuthor.userID = userID
                 blogAuthor.username = $0.username
                 blogAuthor.email = $0.email
                 blogAuthor.displayName = $0.displayName

diff --git a/WordPress/Classes/Services/BlogService.m b/WordPress/Classes/Services/BlogService.m
@@ -6,6 +6,7 @@
 #import "WordPress-Swift.h"
 @import WordPressData;
 @import WordPressKit;
+@import WordPressKitModels;
 @import WordPressShared;
 
 @class Comment;

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

diff --git a/WordPress/Classes/Services/CommentService.m b/WordPress/Classes/Services/CommentService.m
@@ -2,6 +2,8 @@
 #import "AccountService.h"
 #import "WordPress-Swift.h"
 @import WordPressData;
+@import WordPressKit;
+@import WordPressKitModels;
 
 @import WordPressShared;
 

diff --git a/WordPress/Classes/Services/JetpackBackupService.swift b/WordPress/Classes/Services/JetpackBackupService.swift
@@ -1,5 +1,6 @@
 import Foundation
 import WordPressData
+import WordPressKit
 
 class JetpackBackupService {
 

diff --git a/WordPress/Classes/Services/JetpackRestoreService.swift b/WordPress/Classes/Services/JetpackRestoreService.swift
@@ -1,5 +1,6 @@
 import Foundation
 import WordPressData
+import WordPressKit
 
 class JetpackRestoreService {
 

diff --git a/WordPress/Classes/Services/JetpackScanService.swift b/WordPress/Classes/Services/JetpackScanService.swift
@@ -1,5 +1,6 @@
 import Foundation
 import WordPressData
+import WordPressKit
 
 class JetpackScanService {
 

diff --git a/WordPress/Classes/Services/LikeUserHelpers.swift b/WordPress/Classes/Services/LikeUserHelpers.swift
@@ -11,11 +11,11 @@ import WordPressKit
     @objc class func createOrUpdateFrom(remoteUser: RemoteLikeUser, context: NSManagedObjectContext) -> LikeUser {
         let liker = likeUser(for: remoteUser, context: context) ?? LikeUser(context: context)
 
-        liker.userID = remoteUser.userID.int64Value
-        liker.username = remoteUser.username
-        liker.displayName = remoteUser.displayName
+        liker.userID = remoteUser.userID?.int64Value ?? 0
+        liker.username = remoteUser.username ?? ""
+        liker.displayName = remoteUser.displayName ?? ""
         liker.primaryBlogID = remoteUser.primaryBlogID?.int64Value ?? 0
-        liker.avatarUrl = remoteUser.avatarURL
+        liker.avatarUrl = remoteUser.avatarURL ?? ""
         liker.bio = remoteUser.bio ?? ""
         liker.dateLikedString = remoteUser.dateLiked ?? ""
         liker.dateLiked = Date.dateFromServerDate(liker.dateLikedString) ?? .now

diff --git a/WordPress/Classes/Services/MediaRepository.swift b/WordPress/Classes/Services/MediaRepository.swift
@@ -1,5 +1,6 @@
 import Foundation
 import WordPressData
+import WordPressKit
 
 final class MediaRepository {
 

diff --git a/WordPress/Classes/Services/MediaService.h b/WordPress/Classes/Services/MediaService.h
@@ -2,6 +2,7 @@
 #import <Photos/Photos.h>
 @import WordPressData;
 
+@class Blog;
 @class Media;
 @class RemoteVideoPressVideo;
 @protocol ExportableAsset;