Decouple WordPressKit from UIKit

Introduce DeviceInformation struct to replace direct UIDevice usage in
NotificationSettingsServiceRemote. Use ProcessInfo for OS version in
SessionDetails. Guard UIKit-only code with #if canImport(UIKit) in
HTTPAuthenticationAlertController, UIDevice+Extensions,
NSMutableParagraphStyle+extensions, GravatarServiceRemote (upload),
PluginDirectoryEntry (HTML text extraction), and
SiteDesignServiceRemote (screen scale).

Co-Authored-By: Claude Opus 4.6 <[email protected]>

Author: jkmassel

Modules/Sources/WordPressKit/DeviceInformationProvider.swift

@@ -0,0 +1,28 @@
+import Foundation
+
+/// Device metadata needed for push notification registration.
+///
+/// This protocol decouples networking code from UIKit, allowing WordPressKit to build on macOS.
+/// On iOS, `UIDevice` conforms to this protocol automatically.
+public protocol DeviceInformationProvider {
+    var name: String { get }
+    var systemVersion: String { get }
+    var identifierForVendor: UUID? { get }
+}
+
+extension DeviceInformationProvider {
+    /// The hardware machine identifier (e.g. "iPhone15,2", "Mac14,6").
+    public var hardwarePlatform: String {
+        var size = 0
+        sysctlbyname("hw.machine", nil, &size, nil, 0)
+        var machine = [CChar](repeating: 0, count: size)
+        sysctlbyname("hw.machine", &machine, &size, nil, 0)
+        return String(cString: machine)
+    }
+}
+
+#if canImport(UIKit)
+import UIKit
+
+extension UIDevice: DeviceInformationProvider {}
+#endif

Modules/Sources/WordPressKit/GravatarServiceRemote.swift

@@ -72,6 +72,7 @@ open class GravatarServiceRemote {
         task.resume()
     }
 
+    #if canImport(UIKit)
     /// This method hits the Gravatar Endpoint, and uploads a new image, to be used as profile.
     ///
     /// - Parameters:
@@ -105,6 +106,7 @@ open class GravatarServiceRemote {
 
         task.resume()
     }
+    #endif
 
     // MARK: - Private Helpers
 

Modules/Sources/WordPressKit/HTTPAuthenticationAlertController.swift

@@ -1,3 +1,4 @@
+#if canImport(UIKit)
 import Foundation
 import UIKit
 
@@ -102,3 +103,4 @@ open class HTTPAuthenticationAlertController {
     }
 
 }
+#endif

Modules/Sources/WordPressKit/NSMutableParagraphStyle+extensions.swift

@@ -1,4 +1,8 @@
-import Foundation
+#if canImport(AppKit)
+import AppKit
+#elseif canImport(UIKit)
+import UIKit
+#endif
 
 extension NSMutableParagraphStyle {
     @objc convenience public init(minLineHeight: CGFloat, lineBreakMode: NSLineBreakMode, alignment: NSTextAlignment) {

Modules/Sources/WordPressKit/NotificationSettingsServiceRemote.swift

@@ -55,23 +55,23 @@ open class NotificationSettingsServiceRemote: ServiceRemoteWordPressComREST {
     /// - Parameters:
     ///     - token: The token of the device to be registered.
     ///     - pushNotificationAppId: The app id to be registered.
+    ///     - deviceInformation: Metadata about the device being registered.
     ///     - success: Optional closure to be called on success.
     ///     - failure: Optional closure to be called on failure.
     ///
-    @objc open func registerDeviceForPushNotifications(_ token: String, pushNotificationAppId: String, success: ((_ deviceId: String) -> Void)?, failure: ((NSError) -> Void)?) {
+    open func registerDeviceForPushNotifications(_ token: String, pushNotificationAppId: String, deviceInformation: some DeviceInformationProvider, success: ((_ deviceId: String) -> Void)?, failure: ((NSError) -> Void)?) {
         let endpoint = "devices/new"
         let requestUrl = path(forEndpoint: endpoint, withVersion: ._1_1)
 
-        let device = UIDevice.current
         let parameters = [
             "device_token": token,
             "device_family": "apple",
             "app_secret_key": pushNotificationAppId,
-            "device_name": device.name,
-            "device_model": device.platform,
-            "os_version": device.systemVersion,
+            "device_name": deviceInformation.name,
+            "device_model": deviceInformation.hardwarePlatform,
+            "os_version": deviceInformation.systemVersion,
             "app_version": Bundle.main.wpkit_bundleVersion(),
-            "device_uuid": device.identifierForVendor?.uuidString
+            "device_uuid": deviceInformation.identifierForVendor?.uuidString
         ]
 
         wordPressComRESTAPI.post(requestUrl,

Modules/Sources/WordPressKit/PluginDirectoryEntry.swift

@@ -1,4 +1,9 @@
 import Foundation
+#if canImport(AppKit)
+import AppKit
+#elseif canImport(UIKit)
+import UIKit
+#endif
 
 public struct PluginDirectoryEntry {
     public let name: String
@@ -17,7 +22,7 @@ public struct PluginDirectoryEntry {
     let faqHTML: String?
     let changelogHTML: String?
 
-    public var descriptionText: NSAttributedString? {
+        public var descriptionText: NSAttributedString? {
         return extractHTMLText(self.descriptionHTML)
     }
     public var installationText: NSAttributedString? {

Modules/Sources/WordPressKit/SessionDetails.swift

@@ -25,7 +25,8 @@ extension SessionDetails: Encodable {
         self.buildNumber = bundle.infoDictionary?["CFBundleVersion"] as? String ?? "Unknown"
         self.marketingVersion = bundle.infoDictionary?["CFBundleShortVersionString"] as? String ?? "Unknown"
         self.identifier = bundle.bundleIdentifier ?? "Unknown"
-        self.osVersion = UIDevice.current.systemVersion
+        let version = ProcessInfo.processInfo.operatingSystemVersion
+        self.osVersion = "\(version.majorVersion).\(version.minorVersion).\(version.patchVersion)"
     }
 
     func dictionaryRepresentation() throws -> [String: AnyObject]? {

Modules/Sources/WordPressKit/SiteDesignServiceRemote.swift

@@ -1,4 +1,9 @@
 import Foundation
+#if canImport(AppKit)
+import AppKit
+#elseif canImport(UIKit)
+import UIKit
+#endif
 
 public struct SiteDesignRequest {
     public enum TemplateGroup: String {
@@ -14,14 +19,22 @@ public struct SiteDesignRequest {
         parameters = [
             "preview_width": "\(thumbnailSize.width)" as AnyObject,
             "preview_height": "\(thumbnailSize.height)" as AnyObject,
-            "scale": UIScreen.main.nativeScale as AnyObject
+            "scale": Self.screenScale as AnyObject
         ]
         if 0 < groups.count {
             let groups = groups.map { $0.rawValue }
             parameters["group"] = groups.joined(separator: ",") as AnyObject
         }
         self.parameters = parameters
     }
+
+    private static var screenScale: CGFloat {
+        #if canImport(UIKit)
+        return UIScreen.main.nativeScale
+        #else
+        return 1.0
+        #endif
+    }
 }
 
 public class SiteDesignServiceRemote {

Modules/Sources/WordPressKit/UIDevice+Extensions.swift

@@ -148,6 +148,7 @@ class NotificationSettingsService {
         notificationsServiceRemote?.registerDeviceForPushNotifications(
             token,
             pushNotificationAppId: BuildSettings.current.pushNotificationAppID,
+            deviceInformation: UIDevice.current,
             success: success,
             failure: failure
         )