Install WordPressKit as a binary dependency

Author: kean

Modules/Package.swift

@@ -59,7 +59,7 @@ let package = Package(
         .target(name: "WordPressShared", dependencies: [.target(name: "WordPressSharedObjC")], resources: [.process("Resources")]),
         .target(name: "WordPressUIObjC"),
         .target(name: "WordPressUI", dependencies: [.target(name: "WordPressUIObjC")]),
-        .binaryTarget(name: "WordPressKit", url: "https://github.com/user-attachments/files/16195298/WordPressKit.zip", checksum: "f79fee94b3385f861a27edeeafe72984ddb7ba747b6a0564b388f14d362b58bf"),
+        .binaryTarget(name: "WordPressKit", url: "https://github.com/user-attachments/files/16195606/WordPressKit.zip", checksum: "aaf269292a2e9ed9f50c5483297d737853236314cf5dd57f6d6e50110b74634a"),
         .testTarget(name: "JetpackStatsWidgetsCoreTests", dependencies: [.target(name: "JetpackStatsWidgetsCore")]),
         .testTarget(name: "DesignSystemTests", dependencies: [.target(name: "DesignSystem")]),
         .testTarget(name: "WordPressFluxTests", dependencies: ["WordPressFlux"]),
@@ -87,8 +87,6 @@ enum XcodeSupport {
     static let products: [Product] = [
         .library(name: "XcodeTarget_App", targets: ["XcodeTarget_App"]),
         .library(name: "XcodeTarget_WordPressTests", targets: ["XcodeTarget_WordPressTests"]),
-        .library(name: "XcodeTarget_WordPressKit", targets: ["XcodeTarget_WordPressKit"]),
-        .library(name: "XcodeTarget_WordPressKitTests", targets: ["XcodeTarget_WordPressKitTests"]),
         .library(name: "XcodeTarget_WordPressAuthentificator", targets: ["XcodeTarget_WordPressAuthentificator"]),
         .library(name: "XcodeTarget_WordPressAuthentificatorTests", targets: ["XcodeTarget_WordPressAuthentificatorTests"]),
         .library(name: "XcodeTarget_ShareExtension", targets: ["XcodeTarget_ShareExtension"]),
@@ -100,18 +98,16 @@ enum XcodeSupport {
     ]
 
     static let targets: [Target] = {
-        let wordPressKitDependencies: [Target.Dependency] = [
-            "WordPressShared",
-            .product(name: "NSObject-SafeExpectations", package: "NSObject-SafeExpectations"),
-            .product(name: "wpxmlrpc", package: "wpxmlrpc"),
-        ]
-
         let wordPresAuthentificatorDependencies: [Target.Dependency] = [
             "WordPressUI",
+            "WordPressShared",
+            "WordPressKit",
             .product(name: "NSURL+IDN", package: "NSURL-IDN"),
             .product(name: "Gridicons", package: "Gridicons-iOS"),
+            .product(name: "NSObject-SafeExpectations", package: "NSObject-SafeExpectations"),
             .product(name: "SVProgressHUD", package: "SVProgressHUD"),
-        ] + wordPressKitDependencies
+            .product(name: "wpxmlrpc", package: "wpxmlrpc"),
+        ]
 
         let shareAndDraftExtensionsDependencies: [Target.Dependency] = [
             "WordPressShared",
@@ -136,6 +132,7 @@ enum XcodeSupport {
                 "WordPressFlux",
                 "WordPressShared",
                 "WordPressUI",
+                "WordPressKit",
                 .product(name: "Alamofire", package: "Alamofire"),
                 .product(name: "AlamofireImage", package: "AlamofireImage"),
                 .product(name: "AutomatticAbout", package: "AutomatticAbout-swift"),
@@ -167,17 +164,17 @@ enum XcodeSupport {
                 .product(name: "Nimble", package: "Nimble"),
                 .product(name: "BuildkiteTestCollector", package: "test-collector-swift"),
             ]),
-            .xcodeTarget("XcodeTarget_WordPressKit", dependencies: wordPressKitDependencies),
-            .xcodeTarget("XcodeTarget_WordPressKitTests", dependencies: wordPressKitDependencies + testDependencies),
             .xcodeTarget("XcodeTarget_WordPressAuthentificator", dependencies: wordPresAuthentificatorDependencies),
             .xcodeTarget("XcodeTarget_WordPressAuthentificatorTests", dependencies: wordPresAuthentificatorDependencies + testDependencies),
             .xcodeTarget("XcodeTarget_ShareExtension", dependencies: shareAndDraftExtensionsDependencies),
             .xcodeTarget("XcodeTarget_DraftActionExtension", dependencies: shareAndDraftExtensionsDependencies),
-            .xcodeTarget("XcodeTarget_NotificationServiceExtension", dependencies: wordPressKitDependencies + [
-                "WordPressUI"
+            .xcodeTarget("XcodeTarget_NotificationServiceExtension", dependencies: [
+                "WordPressUI", "WordPressShared", "WordPressKit",
             ]),
-            .xcodeTarget("XcodeTarget_StatsWidget", dependencies: wordPressKitDependencies + [
+            .xcodeTarget("XcodeTarget_StatsWidget", dependencies: [
                 "JetpackStatsWidgetsCore",
+                "WordPressShared",
+                "WordPressKit",
                 .product(name: "CocoaLumberjackSwift", package: "CocoaLumberjack"),
             ]),
             .xcodeTarget("XcodeTarget_Intents", dependencies: [

WordPress/Classes/Models/BasePost.m

@@ -1,6 +1,5 @@
 #import "BasePost.h"
 #import "Media.h"
-#import "NSMutableDictionary+Helpers.h"
 #import "CoreDataStack.h"
 @import WordPressShared;
 

WordPress/Classes/Utility/Logging/WordPressLibraryLogger.swift

@@ -1,8 +1,9 @@
 import CocoaLumberjack
 import AutomatticTracks
 import WordPressShared
+import WordPressKit
 
-class WordPressLibraryLogger: NSObject, TracksLoggingDelegate, WordPressLoggingDelegate {
+class WordPressLibraryLogger: NSObject, TracksLoggingDelegate, WordPressLoggingDelegate, WordPressKitLoggingDelegate {
 
     func logError(_ str: String) {
         DDLogError(str)

WordPress/WordPressNotificationServiceExtension/Sources/FormattableContent/RemoteNotificationStyles.swift

@@ -1,5 +1,4 @@
 import Foundation
-
 import WordPressShared
 import WordPressUI
 

WordPressAuthenticator/Sources/Authenticator/WordPressAuthenticator.swift

@@ -3,6 +3,7 @@ import NSURL_IDN
 import UIKit
 import WordPressShared
 import WordPressKit
+import NSObject_SafeExpectations
 
 // MARK: - WordPressAuthenticator: Public API to deal with WordPress.com and WordPress.org authentication.
 //