Change Swift package to provide source code

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version: 5.10
+// swift-tools-version: 6.1
 
 import PackageDescription
 
@@ -8,11 +8,41 @@ let package = Package(
     products: [
         .library(name: "WordPressKit", targets: ["WordPressKit"]),
     ],
+    dependencies: [
+        .package(url: "https://github.com/wordpress-mobile/NSObject-SafeExpectations", from: "0.0.6"),
+        .package(url: "https://github.com/wordpress-mobile/wpxmlrpc", from: "0.9.0"),
+    ],
     targets: [
-        .binaryTarget(
+        .target(
+            name: "WordPressKitObjCUtils",
+        ),
+        .target(
+            name: "WordPressKitModels",
+            dependencies: [
+                "NSObject-SafeExpectations",
+                "WordPressKitObjCUtils",
+            ]
+        ),
+        .target(
+            name: "WordPressKitObjC",
+            dependencies: [
+                "NSObject-SafeExpectations",
+                "wpxmlrpc",
+                "WordPressKitModels",
+                "WordPressKitObjCUtils",
+            ],
+            publicHeadersPath: "include"
+        ),
+        .target(
             name: "WordPressKit",
-            url: "https://github.com/user-attachments/files/21582269/WordPressKit.zip",
-            checksum: "cbfe79d7a4244302d308027ff329f1ccdfd1c604d990871359764eca567ea86f"
+            dependencies: [
+                "WordPressKitObjC",
+                "WordPressKitModels",
+                "WordPressKitObjCUtils",
+                "NSObject-SafeExpectations",
+                "wpxmlrpc",
+            ],
+            swiftSettings: [.swiftLanguageMode(.v5)]
         ),
     ]
 )

Sources/WordPressKit/Services/AccountSettingsRemote.swift → Sources/WordPressKit/AccountSettingsRemote.swift

@@ -1,4 +1,5 @@
 import Foundation
+import WordPressKitObjC
 
 public class AccountSettingsRemote: ServiceRemoteWordPressComREST {
     @objc public static let remotes = NSMapTable<AnyObject, AnyObject>(keyOptions: NSPointerFunctions.Options(), valueOptions: NSPointerFunctions.Options.weakMemory)

Sources/WordPressKit/Models/Activity.swift → Sources/WordPressKit/Activity.swift

@@ -1,4 +1,5 @@
 import Foundation
+import WordPressKitModels
 
 public struct Activity: Decodable {
 

Sources/WordPressKit/Services/ActivityServiceRemote.swift → Sources/WordPressKit/ActivityServiceRemote.swift

@@ -1,4 +1,5 @@
 import Foundation
+import WordPressKitObjC
 
 open class ActivityServiceRemote: ServiceRemoteWordPressComREST {
 

Sources/WordPressKit/Services/ActivityServiceRemote_ApiVersion1_0.swift → Sources/WordPressKit/ActivityServiceRemote_ApiVersion1_0.swift

@@ -1,3 +1,6 @@
+import Foundation
+import WordPressKitObjC
+
 @objc public class ActivityServiceRemote_ApiVersion1_0: ServiceRemoteWordPressComREST {
 
     public enum ResponseError: Error {

Sources/WordPressKit/Services/AnnouncementServiceRemote.swift → Sources/WordPressKit/AnnouncementServiceRemote.swift

@@ -1,4 +1,5 @@
 import Foundation
+import WordPressKitObjC
 
 /// Retrieves feature announcements from the related endpoint
 open class AnnouncementServiceRemote: ServiceRemoteWordPressComREST {

Sources/WordPressKit/Services/AtomicAuthenticationServiceRemote.swift → Sources/WordPressKit/AtomicAuthenticationServiceRemote.swift

@@ -1,4 +1,5 @@
 import Foundation
+import WordPressKitObjC
 
 public class AtomicAuthenticationServiceRemote: ServiceRemoteWordPressComREST {
 

Sources/WordPressKit/Services/AtomicSiteServiceRemote.swift → Sources/WordPressKit/AtomicSiteServiceRemote.swift

@@ -1,4 +1,5 @@
 import Foundation
+import WordPressKitObjC
 
 public final class AtomicSiteServiceRemote: ServiceRemoteWordPressComREST {
     /// - parameter scrollID: Pass the scroll ID from the previous response to

Sources/WordPressKit/Services/AutomatedTransferService.swift → Sources/WordPressKit/AutomatedTransferService.swift

@@ -1,4 +1,5 @@
 import Foundation
+import WordPressKitObjC
 
 /// Class encapsualting all requests related to performing Automated Transfer operations.
 public class AutomatedTransferService: ServiceRemoteWordPressComREST {

Sources/WordPressKit/Services/BlazeServiceRemote.swift → Sources/WordPressKit/BlazeServiceRemote.swift

@@ -1,4 +1,5 @@
 import Foundation
+import WordPressKitObjC
 
 open class BlazeServiceRemote: ServiceRemoteWordPressComREST {
 

Sources/WordPressKit/Services/BlogJetpackSettingsServiceRemote.swift → Sources/WordPressKit/BlogJetpackSettingsServiceRemote.swift

@@ -1,4 +1,5 @@
 import Foundation
+import WordPressKitObjC
 
 public class BlogJetpackSettingsServiceRemote: ServiceRemoteWordPressComREST {
 

Sources/WordPressKit/Services/BloggingPromptsServiceRemote.swift → Sources/WordPressKit/BloggingPromptsServiceRemote.swift

@@ -1,3 +1,6 @@
+import Foundation
+import WordPressKitObjC
+
 /// Encapsulates logic to fetch blogging prompts from the remote endpoint.
 ///
 open class BloggingPromptsServiceRemote: ServiceRemoteWordPressComREST {

Sources/WordPressKit/Services/CommentServiceRemoteREST+ApiV2.swift → Sources/WordPressKit/CommentServiceRemoteREST+ApiV2.swift

@@ -1,3 +1,4 @@
+import Foundation
 public extension CommentServiceRemoteREST {
     /// Lists the available keys for the request parameter.
     enum RequestKeys: String {

Sources/WordPressKit/Services/DashboardServiceRemote.swift → Sources/WordPressKit/DashboardServiceRemote.swift

@@ -1,4 +1,5 @@
 import Foundation
+import WordPressKitObjC
 
 open class DashboardServiceRemote: ServiceRemoteWordPressComREST {
     open func fetch(

Sources/WordPressKit/Models/Extensions/Decodable+Dictionary.swift → Sources/WordPressKit/Decodable+Dictionary.swift

@@ -1,3 +1,4 @@
+import Foundation
 struct JSONCodingKeys: CodingKey {
     var stringValue: String
 

Sources/WordPressKit/Services/Domains/DomainsServiceRemote.swift → Sources/WordPressKit/DomainsServiceRemote.swift

@@ -1,4 +1,5 @@
 import Foundation
+import WordPressKitObjC
 
 /// Allows the construction of a request for domain suggestions.
 ///

Sources/WordPressKit/Services/EditorServiceRemote.swift → Sources/WordPressKit/EditorServiceRemote.swift

@@ -1,4 +1,5 @@
 import Foundation
+import WordPressKitObjC
 
 public class EditorServiceRemote: ServiceRemoteWordPressComREST {
     public func postDesignateMobileEditor(_ siteID: Int, editor: EditorSettings.Mobile, success: @escaping (EditorSettings) -> Void, failure: @escaping (Error) -> Void) {

Sources/WordPressKit/Models/EditorSettings.swift → Sources/WordPressKit/EditorSettings.swift

@@ -1,3 +1,4 @@
+import Foundation
 private struct RemoteEditorSettings: Codable {
     let editorMobile: String
     let editorWeb: String

Sources/WordPressKit/Models/Extensions/Enum+UnknownCaseRepresentable.swift → Sources/WordPressKit/Enum+UnknownCaseRepresentable.swift

@@ -1,3 +1,4 @@
+import Foundation
 /// Allows automatic defaulting to `unknown` for any Enum that conforms to `UnknownCaseRepresentable`
 /// Credits: https://www.latenightswift.com/2019/02/04/unknown-enum-cases/
 protocol UnknownCaseRepresentable: RawRepresentable, CaseIterable where RawValue: Equatable {

Sources/WordPressKit/Exports.swift

@@ -0,0 +1,15 @@
+@_exported import WordPressKitModels
+@_exported import WordPressKitObjC
+@_exported import WordPressKitObjCUtils
+
+extension ServiceRemoteWordPressComREST {
+    public var wordPressComRestApi: WordPressComRestApi {
+        self.wordPressComRESTAPI as! WordPressComRestApi
+    }
+}
+
+extension ServiceRemoteWordPressXMLRPC {
+    public var xmlrpcApi: WordPressOrgXMLRPCApi {
+        self.api as! WordPressOrgXMLRPCApi
+    }
+}

Sources/WordPressKit/Services/FeatureFlagRemote.swift → Sources/WordPressKit/FeatureFlagRemote.swift

@@ -1,4 +1,6 @@
+import Foundation
 import UIKit
+import WordPressKitObjC
 
 open class FeatureFlagRemote: ServiceRemoteWordPressComREST {
 

Sources/CoreAPI/HTTPRequestBuilder.swift → Sources/WordPressKit/HTTPRequestBuilder.swift

@@ -1,5 +1,5 @@
 import Foundation
-@_implementationOnly import wpxmlrpc
+import wpxmlrpc
 
 /// A builder type that appends HTTP request data to a URL.
 ///

Sources/WordPressKit/Services/HomepageSettingsServiceRemote.swift → Sources/WordPressKit/HomepageSettingsServiceRemote.swift

@@ -1,4 +1,5 @@
 import Foundation
+import WordPressKitObjC
 
 public class HomepageSettingsServiceRemote: ServiceRemoteWordPressComREST {
 

Sources/WordPressKit/Services/JetpackBackupServiceRemote.swift → Sources/WordPressKit/JetpackBackupServiceRemote.swift

@@ -1,4 +1,5 @@
 import Foundation
+import WordPressKitObjC
 
 open class JetpackBackupServiceRemote: ServiceRemoteWordPressComREST {
 

Sources/WordPressKit/Services/JetpackCapabilitiesServiceRemote.swift → Sources/WordPressKit/JetpackCapabilitiesServiceRemote.swift

@@ -1,4 +1,5 @@
 import Foundation
+import WordPressKitObjC
 
 /// A service that returns the Jetpack Capabilities for a set of blogs
 open class JetpackCapabilitiesServiceRemote: ServiceRemoteWordPressComREST {

Sources/WordPressKit/Services/Plugin Management/JetpackPluginManagementClient.swift → Sources/WordPressKit/JetpackPluginManagementClient.swift

@@ -1,3 +1,4 @@
+import Foundation
 public class JetpackPluginManagementClient: PluginManagementClient {
     private let siteID: Int
     private let remote: PluginServiceRemote

Sources/WordPressKit/Services/JetpackProxyServiceRemote.swift → Sources/WordPressKit/JetpackProxyServiceRemote.swift

@@ -1,3 +1,6 @@
+import Foundation
+import WordPressKitObjC
+
 /// Encapsulates Jetpack Proxy requests.
 public class JetpackProxyServiceRemote: ServiceRemoteWordPressComREST {
 

Sources/WordPressKit/Services/JetpackScanServiceRemote.swift → Sources/WordPressKit/JetpackScanServiceRemote.swift

@@ -1,4 +1,5 @@
 import Foundation
+import WordPressKitObjC
 
 public class JetpackScanServiceRemote: ServiceRemoteWordPressComREST {
     // MARK: - Scanning

Sources/WordPressKit/Services/JetpackServiceRemote.swift → Sources/WordPressKit/JetpackServiceRemote.swift

@@ -1,4 +1,5 @@
 import Foundation
+import WordPressKitObjC
 
 public struct JetpackInstallError: LocalizedError, Equatable {
     public enum ErrorType: String {

Sources/WordPressKit/Services/JetpackSocialServiceRemote.swift → Sources/WordPressKit/JetpackSocialServiceRemote.swift

@@ -1,3 +1,6 @@
+import Foundation
+import WordPressKitObjC
+
 /// Encapsulates remote service logic related to Jetpack Social.
 public class JetpackSocialServiceRemote: ServiceRemoteWordPressComREST {
 

Sources/WordPressKit/Services/NotificationSettingsServiceRemote.swift → Sources/WordPressKit/NotificationSettingsServiceRemote.swift

@@ -1,17 +1,10 @@
 import Foundation
+import WordPressKitObjC
 
 /// The purpose of this class is to encapsulate all of the interaction with the Notifications REST endpoints.
 /// Here we'll deal mostly with the Settings / Push Notifications API.
 ///
 open class NotificationSettingsServiceRemote: ServiceRemoteWordPressComREST {
-    /// Designated Initializer. Fails if the remoteApi is nil.
-    ///
-    /// - Parameter wordPressComRestApi: A Reference to the WordPressComRestApi that should be used to interact with WordPress.com
-    ///
-    public override init(wordPressComRestApi: WordPressComRestApi) {
-        super.init(wordPressComRestApi: wordPressComRestApi)
-    }
-
     /// Retrieves all of the Notification Settings
     ///
     /// - Parameters:

Sources/WordPressKit/Services/NotificationSyncServiceRemote.swift → Sources/WordPressKit/NotificationSyncServiceRemote.swift

@@ -1,4 +1,5 @@
 import Foundation
+import WordPressKitObjC
 
 // MARK: - NotificationSyncServiceRemote
 //

Sources/WordPressKit/Services/PeopleServiceRemote.swift → Sources/WordPressKit/PeopleServiceRemote.swift

@@ -1,4 +1,5 @@
 import Foundation
+import WordPressKitObjC
 
 /// Encapsulates all of the People Management WordPress.com Methods
 ///

Sources/WordPressKit/Services/Plans/PlanServiceRemote.swift → Sources/WordPressKit/PlanServiceRemote.swift

@@ -1,4 +1,5 @@
 import Foundation
+import WordPressKitObjC
 
 open class PlanServiceRemote: ServiceRemoteWordPressComREST {
     public typealias AvailablePlans = (plans: [RemoteWpcomPlan], groups: [RemotePlanGroup], features: [RemotePlanFeature])

Sources/WordPressKit/Services/Plans/PlanServiceRemote_ApiVersion1_3.swift → Sources/WordPressKit/PlanServiceRemote_ApiVersion1_3.swift

@@ -1,4 +1,5 @@
 import Foundation
+import WordPressKitObjC
 
 @objc public class PlanServiceRemote_ApiVersion1_3: ServiceRemoteWordPressComREST {
 

Sources/WordPressKit/Services/PluginServiceRemote.swift → Sources/WordPressKit/PluginServiceRemote.swift

@@ -1,4 +1,5 @@
 import Foundation
+import WordPressKitObjC
 
 public class PluginServiceRemote: ServiceRemoteWordPressComREST {
     public enum ResponseError: Error {

Sources/WordPressKit/PostServiceRemoteREST.swift

@@ -0,0 +1,56 @@
+import WordPressKitObjC
+import NSObject_SafeExpectations
+
+extension PostServiceRemoteREST {
+
+    /// Requests a list of users that liked the post with the specified ID.
+    ///
+    /// Due to the API limitation, up to 90 users will be returned from the endpoint.
+    ///
+    /// - Parameters:
+    ///   - postID: The ID for the post. Cannot be nil.
+    ///   - count: Number of records to retrieve. Cannot be nil. If 0, will default to endpoint max.
+    ///   - before: Filter results to Likes before this date/time string. Can be nil.
+    ///   - excludeUserIDs: Array of user IDs to exclude from response. Can be nil.
+    ///   - success: The block that will be executed on success. Can be nil.
+    ///   - failure: The block that will be executed on failure. Can be nil.
+    @objc(getLikesForPostID:count:before:excludeUserIDs:success:failure:)
+    public func getLikesForPostID(
+        _ postID: NSNumber,
+        count: NSNumber,
+        before: String?,
+        excludeUserIDs: [NSNumber]?,
+        success: (([RemoteLikeUser], NSNumber) -> Void)?,
+        failure: ((Error?) -> Void)?
+    ) {
+        let path = "sites/\(siteID)/posts/\(postID)/likes"
+        let requestUrl = self.path(forEndpoint: path, withVersion: ._1_2)
+        let siteID = self.siteID
+
+        // If no count provided, default to endpoint max.
+        var parameters: [String: Any] = ["number": count == 0 ? 90 : count]
+
+        if let before {
+            parameters["before"] = before
+        }
+
+        if let excludeUserIDs {
+            parameters["exclude"] = excludeUserIDs
+        }
+
+        wordPressComRESTAPI.get(requestUrl,
+                               parameters: parameters,
+                               success: { (responseObject, httpResponse) in
+            if let success {
+                let responseDict = responseObject as? [String: Any] ?? [:]
+                let jsonUsers = responseDict["likes"] as? [[String: Any]] ?? []
+                let users = jsonUsers.map { RemoteLikeUser(dictionary: $0, postID: postID, siteID: siteID) }
+                let found = responseDict["found"] as? NSNumber ?? 0
+                success(users, found)
+            }
+        }, failure: { (error, _) in
+            failure?(error)
+        })
+    }
+
+}