Unify changes from the common lib migration and mutable JSON workstreams

Author: AlexNachbaur

.github/workflows/tests.yaml

@@ -229,7 +229,7 @@ jobs:
     strategy:
       matrix:
         include:
-        - destination: "platform=iOS Simulator,OS=18.5,name=iPhone 16 Pro Max"
+        - destination: "platform=iOS Simulator,OS=18.6,name=iPhone 16 Pro Max"
           xcode_version: "16.4"
           os: macos-15
         - destination: "platform=tvOS Simulator,OS=18.5,name=Apple TV"

Package.swift

@@ -46,9 +46,9 @@ var package = Package(
         .library(name: "OktaDirectAuth", targets: ["OktaDirectAuth"]),
         .library(name: "OktaIdxAuth", targets: ["OktaIdxAuth"])
     ],
-    // dependencies: [
-    //     .package(url: "https://github.com/apple/swift-docc-plugin", from: "1.4.0")
-    // ],
+    dependencies: [
+        .package(url: "https://github.com/apple/swift-docc-plugin", from: "1.4.0")
+    ],
     targets: [
         .target(name: "CommonSupport",
                 swiftSettings: .libraryTarget),

Sources/AuthFoundation/Debugging/APIRequestObserver.swift

@@ -18,11 +18,6 @@
 
 #if DEBUG && canImport(OSLog)
 import Foundation
-
-#if !COCOAPODS
-import CommonSupport
-#endif
-
 import OSLog
 
 #if !COCOAPODS

Sources/AuthFoundation/JWT/JWK.swift

@@ -16,10 +16,6 @@ import Foundation
 import CommonSupport
 #endif
 
-#if !COCOAPODS
-import CommonSupport
-#endif
-
 /// Describes an individual key from an authorization server, which can be used to validate tokens or encrypt content.
 ///
 /// > Warning: At this time, this class only supports RSA Public Keys.

Sources/AuthFoundation/Migration/Migration.swift

@@ -16,10 +16,6 @@ import Foundation
 import CommonSupport
 #endif
 
-#if !COCOAPODS
-import CommonSupport
-#endif
-
 /// Namespace used for a variety of version migration agents.
 public final class Migration {
     /// Determines whether or not some user data needs to be migrated.

Sources/AuthFoundation/Migration/SDKVersion.swift

@@ -16,10 +16,6 @@ import Foundation
 import CommonSupport
 #endif
 
-#if !COCOAPODS
-import CommonSupport
-#endif
-
 #if canImport(UIKit)
 import UIKit
 #endif
@@ -33,16 +29,12 @@ import Android
 #endif
 
 private let deviceModel: String = {
-    #if os(Darwin)
     var system = utsname()
     uname(&system)
     let model = withUnsafePointer(to: &system.machine.0) { ptr in
         return String(cString: ptr)
     }
     return model
-    #else
-    return "Unknown"
-    #endif
 }()
 
 private let systemName: String = {
@@ -56,10 +48,10 @@ private let systemName: String = {
         return "tvOS"
     #elseif os(macOS)
         return "macOS"
-    #elseif os(Linux)
-        return "linux"
     #elseif os(Android)
         return "android"
+    #elseif os(Linux)
+        return "linux"
     #endif
 }()
 

Sources/AuthFoundation/OAuth2/Authentication.swift

@@ -16,10 +16,6 @@ import Foundation
 import CommonSupport
 #endif
 
-#if !COCOAPODS
-import CommonSupport
-#endif
-
 /// A common delegate protocol that all authentication flows should support.
 public protocol AuthenticationDelegate: AnyObject {
     /// Sent when an authentication session starts.

Sources/AuthFoundation/Responses/OpenIdConfiguration.swift

@@ -16,10 +16,6 @@ import Foundation
 @_exported import JSON
 #endif
 
-#if !COCOAPODS
-import JSON
-#endif
-
 /// Describes the configuration of an OpenID server.
 ///
 /// The values exposed from this configuration are typically used during authentication, or when querying a server for its capabilities. This type uses ``HasClaims`` to represent the various provider metadata (represented as ``OpenIdConfiguration/ProviderMetadata``) for returning the full contents of the server's configuration. For more information, please see the ``HasClaims`` documentation.

Sources/AuthFoundation/Security/Keychain.swift

@@ -16,10 +16,6 @@ import Foundation
 import CommonSupport
 #endif
 
-#if !COCOAPODS
-import CommonSupport
-#endif
-
 #if os(iOS) || os(macOS) || os(tvOS) || os(watchOS) || (swift(>=5.10) && os(visionOS))
 
 #if canImport(LocalAuthentication) && !os(tvOS)

Sources/AuthFoundation/Token Management/Token.swift

@@ -17,11 +17,6 @@ import CommonSupport
 @_exported import JSON
 #endif
 
-#if !COCOAPODS
-import CommonSupport
-import JSON
-#endif
-
 /// Token information representing a user's access to a resource server, including access token, refresh token, and other related information.
 public struct Token: Sendable, Codable, Equatable, Hashable, HasClaims, Expires {
     public typealias ClaimType = TokenClaim