Bump deployment to macOS 13, iOS 16 (#173)

Necessary in order to pull in swift-subprocess

Author: kabiroberai

Package.resolved

@@ -22,8 +22,8 @@ let cSettings: [CSetting] = [
 let package = Package(
     name: "xtool",
     platforms: [
-        .iOS(.v15),
-        .macOS(.v12),
+        .iOS(.v16),
+        .macOS(.v13),
     ],
     products: [
         .library(
@@ -53,7 +53,8 @@ let package = Package(
         .package(url: "https://github.com/apple/swift-openapi-runtime", from: "1.0.0"),
         .package(url: "https://github.com/apple/swift-openapi-urlsession", from: "1.0.0"),
         .package(url: "https://github.com/apple/swift-nio", from: "2.77.0"),
-        .package(url: "https://github.com/apple/swift-docc-plugin", from: "1.0.0"),
+
+        .package(url: "https://github.com/swiftlang/swift-docc-plugin", from: "1.0.0"),
 
         .package(url: "https://github.com/swift-server/async-http-client.git", from: "1.23.0"),
         .package(url: "https://github.com/swift-server/swift-openapi-async-http-client", from: "1.0.0"),

Package.swift

@@ -174,7 +174,7 @@ public struct ADIDataProvider: AnisetteDataProvider {
             .acceptLanguage: "en_US",
             .init(AnisetteData.localUserIDKey)!: self.localUserID,
         ]
-        request.headerFields[.init("X-MMe-Country")!] = Locale.current.regionCode
+        request.headerFields[.init("X-MMe-Country")!] = Locale.current.region?.identifier
 
         request.headerFields[.init(DeviceInfo.clientInfoKey)!] = try await clientInfo()
         request.headerFields[.init(DeviceInfo.deviceIDKey)!] = self.localUserUID.uuidString

Sources/XKit/GrandSlam/Anisette/ADIDataProvider.swift

@@ -54,7 +54,8 @@ public struct AnisetteData {
 
     var dictionary: [String: String] {
         // GSA doesn't like "en_US@rg=..."; it has to be just "en_US".
-        let localeIdentifier = if let language = locale.languageCode, let region = locale.regionCode {
+        let localeIdentifier = if let language = locale.language.languageCode?.identifier,
+                                  let region = locale.region?.identifier {
             "\(language)_\(region)"
         } else {
             "en_US"

Sources/XKit/GrandSlam/Anisette/AnisetteData.swift

@@ -56,13 +56,14 @@ extension DeviceInfo {
 
     private static func fetchHardwareModel() -> String? {
         var modelSize = 0
-        guard sysctlbyname("hw.model", nil, &modelSize, nil, 0) == 0 else { return nil }
-        guard let rawString = malloc(modelSize) else { return nil }
-        guard sysctlbyname("hw.model", rawString, &modelSize, nil, 0) == 0 else {
-            free(rawString)
-            return nil
+        guard sysctlbyname("hw.model", nil, &modelSize, nil, 0) == 0,
+              modelSize > 0 else { return nil }
+        return String(unsafeUninitializedCapacity: modelSize) { buf in
+            var len = modelSize
+            guard sysctlbyname("hw.model", buf.baseAddress, &len, nil, 0) == 0,
+                  len == modelSize else { return 0 }
+            return len - 1 // exclude NUL
         }
-        return String(bytesNoCopy: rawString, length: modelSize - 1, encoding: .utf8, freeWhenDone: true)
     }
 
     public static func current() -> DeviceInfo? {

Sources/XKit/GrandSlam/Anisette/DeviceInfo+Fetching.swift

@@ -45,7 +45,7 @@ actor GrandSlamLookupManager {
             .init(AnisetteData.timeZoneKey)!: TimeZone.current.identifier,
             .init("X-Apple-I-TimeZone-Offset")!: "\(TimeZone.current.secondsFromGMT())"
         ]
-        request.headerFields[.init("X-MMe-Country")!] = Locale.current.regionCode
+        request.headerFields[.init("X-MMe-Country")!] = Locale.current.region?.identifier
 
         let (_, body) = try await httpClient.makeRequest(request)
 

Sources/XKit/GrandSlam/Lookup/GrandSlamLookupManager.swift

@@ -138,11 +138,9 @@ public struct KeychainStorage: KeyValueStorage {
     private func makeQuery(forKey key: String, _ parameters: [CFString: Any]) -> CFDictionary {
         var query: [CFString: Any] = [
             kSecClass: kSecClassGenericPassword,
-            kSecAttrAccount: key
+            kSecAttrAccount: key,
+            kSecUseDataProtectionKeychain: true,
         ]
-        if #available(macOS 10.15, *) {
-            query[kSecUseDataProtectionKeychain] = true
-        }
         query[kSecAttrService] = service
         query.merge(parameters) { _, b in b }
         return query as CFDictionary

Sources/XKit/Utilities/KeyValueStorage.swift

@@ -11,25 +11,27 @@ GEM
     artifactory (3.0.17)
     atomos (0.1.3)
     aws-eventstream (1.4.0)
-    aws-partitions (1.1118.0)
-    aws-sdk-core (3.226.0)
+    aws-partitions (1.1172.0)
+    aws-sdk-core (3.233.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
       base64
+      bigdecimal
       jmespath (~> 1, >= 1.6.1)
       logger
-    aws-sdk-kms (1.105.0)
-      aws-sdk-core (~> 3, >= 3.225.0)
+    aws-sdk-kms (1.113.0)
+      aws-sdk-core (~> 3, >= 3.231.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.190.0)
-      aws-sdk-core (~> 3, >= 3.225.0)
+    aws-sdk-s3 (1.199.1)
+      aws-sdk-core (~> 3, >= 3.231.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
     aws-sigv4 (1.12.1)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
     base64 (0.3.0)
+    bigdecimal (3.3.1)
     claide (1.1.0)
     colored (1.2)
     colored2 (3.1.2)
@@ -161,21 +163,21 @@ GEM
     httpclient (2.9.0)
       mutex_m
     jmespath (1.6.2)
-    json (2.12.2)
-    jwt (2.10.1)
+    json (2.15.1)
+    jwt (2.10.2)
       base64
     logger (1.7.0)
     mini_magick (4.13.2)
     mini_mime (1.1.5)
-    multi_json (1.15.0)
+    multi_json (1.17.0)
     multipart-post (2.4.1)
     mutex_m (0.3.0)
     nanaimo (0.4.0)
     naturally (2.3.0)
     nkf (0.2.0)
     optparse (0.6.0)
     os (1.1.4)
-    ostruct (0.6.2)
+    ostruct (0.6.3)
     plist (3.7.2)
     public_suffix (6.0.2)
     rake (13.3.0)
@@ -184,15 +186,15 @@ GEM
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
-    rexml (3.4.1)
+    rexml (3.4.4)
     rouge (3.28.0)
     ruby2_keywords (0.0.5)
     rubyzip (2.4.1)
     security (0.1.5)
-    signet (0.20.0)
+    signet (0.21.0)
       addressable (~> 2.8)
       faraday (>= 0.17.5, < 3.a)
-      jwt (>= 1.5, < 3.0)
+      jwt (>= 1.5, < 4.0)
       multi_json (~> 1.10)
     simctl (1.6.10)
       CFPropertyList

macOS/Gemfile.lock

@@ -5,7 +5,7 @@ struct XToolMacUI: App {
         WindowGroup {
             ContentView()
         }
-        .disableWindowResizingIfPossible()
+        .windowResizability(.contentSize)
     }
 }
 
@@ -64,16 +64,6 @@ private struct StepView<Content: View>: View {
     }
 }
 
-extension Scene {
-    fileprivate func disableWindowResizingIfPossible() -> some Scene {
-        if #available(macOS 13, *) {
-            return self.windowResizability(.contentSize)
-        } else {
-            return self
-        }
-    }
-}
-
 #Preview {
     ContentView()
 }

macOS/XToolMac/XToolMacUI.swift

@@ -11,7 +11,7 @@ targets:
   XToolMac:
     type: application
     platform: macOS
-    deploymentTarget: "12.0"
+    deploymentTarget: "13.0"
     sources:
       - path: XToolMac
       - path: Resources/xtool