Support showing multiple architectures

Author: MattKiazyk

Xcodes.xcodeproj/project.pbxproj

@@ -48,7 +48,6 @@
 		CA9FF84E2595079F00E47BAF /* ScrollingTextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA9FF84D2595079F00E47BAF /* ScrollingTextView.swift */; };
 		CA9FF8522595080100E47BAF /* AcknowledgementsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA9FF8512595080100E47BAF /* AcknowledgementsView.swift */; };
 		CA9FF8662595130600E47BAF /* View+IsHidden.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA9FF8652595130600E47BAF /* View+IsHidden.swift */; };
-		CA9FF86D25951C6E00E47BAF /* XCModel in Frameworks */ = {isa = PBXBuildFile; productRef = CA9FF86C25951C6E00E47BAF /* XCModel */; };
 		CA9FF877259528CC00E47BAF /* Version+XcodeReleases.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA9FF876259528CC00E47BAF /* Version+XcodeReleases.swift */; };
 		CA9FF87B2595293E00E47BAF /* DataSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA9FF87A2595293E00E47BAF /* DataSource.swift */; };
 		CA9FF88125955C7000E47BAF /* AvailableXcode.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA9FF88025955C7000E47BAF /* AvailableXcode.swift */; };
@@ -363,7 +362,6 @@
 				CABFA9E42592F08E00380FEE /* Version in Frameworks */,
 				CABFA9FD2592F13300380FEE /* LegibleError in Frameworks */,
 				E689540325BE8C64000EBCEA /* DockProgress in Frameworks */,
-				CA9FF86D25951C6E00E47BAF /* XCModel in Frameworks */,
 				CABFA9F82592F0F900380FEE /* KeychainAccess in Frameworks */,
 				E83FDC442CBB649100679C6B /* Sparkle in Frameworks */,
 				E862D43B2CC8B26F00BAA376 /* SRP in Frameworks */,
@@ -726,7 +724,6 @@
 				CABFA9ED2592F0CC00380FEE /* SwiftSoup */,
 				CABFA9F72592F0F900380FEE /* KeychainAccess */,
 				CABFA9FC2592F13300380FEE /* LegibleError */,
-				CA9FF86C25951C6E00E47BAF /* XCModel */,
 				CAA858CC25A3D8BC00ACF8C0 /* ErrorHandling */,
 				E689540225BE8C64000EBCEA /* DockProgress */,
 				E8FD5726291EE4AC001E004C /* AsyncNetworkService */,
@@ -816,7 +813,6 @@
 				CABFA9EC2592F0CC00380FEE /* XCRemoteSwiftPackageReference "SwiftSoup" */,
 				CABFA9F62592F0F900380FEE /* XCRemoteSwiftPackageReference "KeychainAccess" */,
 				CABFA9FB2592F13300380FEE /* XCRemoteSwiftPackageReference "LegibleError" */,
-				CA9FF86B25951C6E00E47BAF /* XCRemoteSwiftPackageReference "data" */,
 				CAA858CB25A3D8BC00ACF8C0 /* XCRemoteSwiftPackageReference "ErrorHandling" */,
 				CAC28186259EE27200B8AB0B /* XCRemoteSwiftPackageReference "CombineExpectations" */,
 				E689540125BE8C64000EBCEA /* XCRemoteSwiftPackageReference "DockProgress" */,
@@ -1504,14 +1500,6 @@
 				minimumVersion = 0.1.4;
 			};
 		};
-		CA9FF86B25951C6E00E47BAF /* XCRemoteSwiftPackageReference "data" */ = {
-			isa = XCRemoteSwiftPackageReference;
-			repositoryURL = "https://github.com/xcodereleases/data";
-			requirement = {
-				branch = main;
-				kind = branch;
-			};
-		};
 		CAA858CB25A3D8BC00ACF8C0 /* XCRemoteSwiftPackageReference "ErrorHandling" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/RobotsAndPencils/ErrorHandling";
@@ -1607,11 +1595,6 @@
 			isa = XCSwiftPackageProductDependency;
 			productName = LibFido2Swift;
 		};
-		CA9FF86C25951C6E00E47BAF /* XCModel */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = CA9FF86B25951C6E00E47BAF /* XCRemoteSwiftPackageReference "data" */;
-			productName = XCModel;
-		};
 		CAA1CB2C255A5262003FD669 /* AppleAPI */ = {
 			isa = XCSwiftPackageProductDependency;
 			productName = AppleAPI;

Xcodes.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -502,7 +502,7 @@ extension AppState {
             self.allXcodes[index].installState = .installing(step)
 
             let xcode = self.allXcodes[index]
-            Current.notificationManager.scheduleNotification(title: xcode.id.appleDescription, body: step.description, category: .normal)
+            Current.notificationManager.scheduleNotification(title: xcode.version.major.description + "." + xcode.version.appleDescription, body: step.description, category: .normal)
         }
     }
 

Xcodes/Backend/AppState+Install.swift

@@ -3,7 +3,6 @@ import Foundation
 import Path
 import Version
 import SwiftSoup
-import struct XCModel.Xcode
 import AppleAPI
 import XcodesKit
 
@@ -211,8 +210,8 @@ extension AppState {
     private func xcodeReleases() -> AnyPublisher<[AvailableXcode], Error> {
         Current.network.dataTask(with: URLRequest(url: URL(string: "https://xcodereleases.com/data.json")!))
             .map(\.data)
-            .decode(type: [XCModel.Xcode].self, decoder: JSONDecoder())
-            .map { xcReleasesXcodes in  
+            .decode(type: [XcodeRelease].self, decoder: JSONDecoder())
+            .map { xcReleasesXcodes in
                 let xcodes = xcReleasesXcodes.compactMap { xcReleasesXcode -> AvailableXcode? in
                     guard
                         let downloadURL = xcReleasesXcode.links?.download?.url,
@@ -233,7 +232,8 @@ extension AppState {
                         requiredMacOSVersion: xcReleasesXcode.requires,
                         releaseNotesURL: xcReleasesXcode.links?.notes?.url,
                         sdks: xcReleasesXcode.sdks,
-                        compilers: xcReleasesXcode.compilers
+                        compilers: xcReleasesXcode.compilers,
+                        architectures: xcReleasesXcode.architectures
                     )
                 }
                 return xcodes

Xcodes/Backend/AppState+Update.swift

@@ -26,6 +26,7 @@ enum PreferenceKey: String {
     case xcodeListCategory
     case allowedMajorVersions
     case hideSupportXcodes
+    case xcodeListArchitectures
 
     func isManaged() -> Bool { UserDefaults.standard.objectIsForced(forKey: self.rawValue) }
 }
@@ -146,7 +147,7 @@ class AppState: ObservableObject {
     // MARK: - Publisher Cancellables
 
     var cancellables = Set<AnyCancellable>()
-    private var installationPublishers: [Version: AnyCancellable] = [:]
+    private var installationPublishers: [XcodeID: AnyCancellable] = [:]
     internal var runtimePublishers: [String: Task<(), any Error>] = [:]
     private var selectPublisher: AnyCancellable?
     private var uninstallPublisher: AnyCancellable?
@@ -523,8 +524,8 @@ class AppState: ObservableObject {
 
     // MARK: - Install
 
-    func checkMinVersionAndInstall(id: Xcode.ID) {
-        guard let availableXcode = availableXcodes.first(where: { $0.version == id }) else { return }
+    func checkMinVersionAndInstall(id: XcodeID) {
+        guard let availableXcode = availableXcodes.first(where: { $0.version == id.version }) else { return }
 
         // Check to see if users macOS is supported
         if let requiredMacOSVersion = availableXcode.requiredMacOSVersion {
@@ -550,8 +551,8 @@ class AppState: ObservableObject {
         return !ProcessInfo.processInfo.isOperatingSystemAtLeast(xcodeMinimumMacOSVersion)
     }
 
-    func install(id: Xcode.ID) {
-        guard let availableXcode = availableXcodes.first(where: { $0.version == id }) else { return }
+    func install(id: XcodeID) {
+        guard let availableXcode = availableXcodes.first(where: { $0.version == id.version }) else { return }
 
         installationPublishers[id] = signInIfNeeded()
             .handleEvents(
@@ -626,7 +627,7 @@ class AppState: ObservableObject {
     /// Skips using the username/password to log in to Apple, and simply gets a Auth Cookie used in downloading
     /// As of Nov 2022 this was returning a 403 forbidden
     func installWithoutLogin(id: Xcode.ID) {
-        guard let availableXcode = availableXcodes.first(where: { $0.version == id }) else { return }
+        guard let availableXcode = availableXcodes.first(where: { $0.version == id.version }) else { return }
 
         installationPublishers[id] = self.install(.version(availableXcode), downloader: Downloader(rawValue: Current.defaults.string(forKey: "downloader") ?? "aria2") ?? .aria2)
             .receive(on: DispatchQueue.main)
@@ -649,7 +650,7 @@ class AppState: ObservableObject {
     }
 
     func cancelInstall(id: Xcode.ID) {
-        guard let availableXcode = availableXcodes.first(where: { $0.version == id }) else { return }
+        guard let availableXcode = availableXcodes.first(where: { $0.version == id.version }) else { return }
 
         // Cancel the publisher
         installationPublishers[id] = nil
@@ -767,7 +768,7 @@ class AppState: ObservableObject {
             config.allowsRunningApplicationSubstitution = false
             NSWorkspace.shared.openApplication(at: path.url, configuration: config)
         default:
-            Logger.appState.error("\(xcode.id) is not installed")
+            Logger.appState.error("\(xcode.id.version) is not installed")
             return
         }
     }
@@ -863,15 +864,15 @@ class AppState: ObservableObject {
                 // If build metadata matches exactly, replace the available version with the installed version.
                 // This should handle Apple versions from /downloads/more which don't have build metadata identifiers. 
                 if let index = adjustedAvailableXcodes.map(\.version).firstIndex(where: { $0.buildMetadataIdentifiers == installedXcode.version.buildMetadataIdentifiers }) {
-                    adjustedAvailableXcodes[index].version = installedXcode.version
+                    adjustedAvailableXcodes[index].xcodeID = installedXcode.xcodeID
                 }
                 // If an installed version is the same as one that's listed online which doesn't have build metadata, replace it with the installed version
                 // Not all prerelease Apple versions available online include build metadata
                 else if let index = adjustedAvailableXcodes.firstIndex(where: { availableXcode in
                     availableXcode.version.isEquivalent(to: installedXcode.version) &&
                         availableXcode.version.buildMetadataIdentifiers.isEmpty
                 }) {
-                    adjustedAvailableXcodes[index].version = installedXcode.version
+                    adjustedAvailableXcodes[index].xcodeID = installedXcode.xcodeID
                 }
             }
         }
@@ -888,14 +889,15 @@ class AppState: ObservableObject {
                 // Include this version if there's only one with this build identifier
                 return availableXcodesWithIdenticalBuildIdentifiers.count == 1 ||
                     // Or if there's more than one with this build identifier and this is the release version
-                    availableXcodesWithIdenticalBuildIdentifiers.count > 1 && availableXcode.version.prereleaseIdentifiers.isEmpty
-            }            
+                
+                availableXcodesWithIdenticalBuildIdentifiers.count > 1 && (availableXcode.version.prereleaseIdentifiers.isEmpty || availableXcode.architectures?.count ?? 0 != 0)
+            }
             .map { availableXcode -> Xcode in
                 let installedXcode = installedXcodes.first(where: { installedXcode in
                     availableXcode.version.isEquivalent(to: installedXcode.version) 
                 })
 
-                let identicalBuilds: [Version]
+                let identicalBuilds: [XcodeID]
                 let prereleaseAvailableXcodesWithIdenticalBuildIdentifiers = availableXcodes
                     .filter {
                         return $0.version.buildMetadataIdentifiers == availableXcode.version.buildMetadataIdentifiers &&
@@ -905,7 +907,7 @@ class AppState: ObservableObject {
                     }
                 // If this is the release version, add the identical builds to it
                 if !prereleaseAvailableXcodesWithIdenticalBuildIdentifiers.isEmpty, availableXcode.version.prereleaseIdentifiers.isEmpty {
-                    identicalBuilds = [availableXcode.version] + prereleaseAvailableXcodesWithIdenticalBuildIdentifiers.map(\.version)
+                    identicalBuilds = [availableXcode.xcodeID] + prereleaseAvailableXcodesWithIdenticalBuildIdentifiers.map(\.xcodeID)
                 } else {
                     identicalBuilds = []
                 }
@@ -926,7 +928,8 @@ class AppState: ObservableObject {
                     releaseDate: availableXcode.releaseDate,
                     sdks: availableXcode.sdks,
                     compilers: availableXcode.compilers,
-                    downloadFileSize: availableXcode.fileSize
+                    downloadFileSize: availableXcode.fileSize,
+                    architectures: availableXcode.architectures
                 )
             }
 

Xcodes/Backend/AppState.swift

@@ -1,11 +1,12 @@
 import Foundation
 import Version
-import struct XCModel.SDKs
-import struct XCModel.Compilers
+import XcodesKit
 
 /// A version of Xcode that's available for installation
 public struct AvailableXcode: Codable {
-    public var version: Version
+    public var version: Version {
+        return xcodeID.version
+    }
     public let url: URL
     public let filename: String
     public let releaseDate: Date?
@@ -14,9 +15,11 @@ public struct AvailableXcode: Codable {
     public let sdks: SDKs?
     public let compilers: Compilers?
     public let fileSize: Int64?
+    public let architectures: [Architecture]?
     public var downloadPath: String {
         return url.path
     }
+    public var xcodeID: XcodeID
 
     public init(
         version: Version,
@@ -27,9 +30,9 @@ public struct AvailableXcode: Codable {
         releaseNotesURL: URL? = nil,
         sdks: SDKs? = nil,
         compilers: Compilers? = nil,
-        fileSize: Int64? = nil
+        fileSize: Int64? = nil,
+        architectures: [Architecture]? = nil
     ) {
-        self.version =  version
         self.url = url
         self.filename = filename
         self.releaseDate = releaseDate
@@ -38,5 +41,7 @@ public struct AvailableXcode: Codable {
         self.sdks = sdks
         self.compilers = compilers
         self.fileSize = fileSize
+        self.architectures = architectures
+        self.xcodeID = XcodeID(version: version, architectures: architectures)
     }
 }

Xcodes/Backend/AvailableXcode.swift

@@ -5,8 +5,12 @@ import Path
 /// A version of Xcode that's already installed
 public struct InstalledXcode: Equatable {
     public let path: Path
+    public let xcodeID: XcodeID
+    
     /// Composed of the bundle short version from Info.plist and the product build version from version.plist
-    public let version: Version
+    public var version: Version {
+        return xcodeID.version
+    }
 
     public init?(path: Path) {
         self.path = path
@@ -32,11 +36,13 @@ public struct InstalledXcode: Equatable {
             prereleaseIdentifiers = ["beta"]
         }
 
-        self.version = Version(major: bundleVersion.major,
+        let version = Version(major: bundleVersion.major,
                                minor: bundleVersion.minor,
                                patch: bundleVersion.patch,
                                prereleaseIdentifiers: prereleaseIdentifiers,
                                buildMetadataIdentifiers: [versionPlist.productBuildVersion].compactMap { $0 })
+        
+        self.xcodeID = XcodeID(version: version, architectures: nil)
     }
 }
 

Xcodes/Backend/InstalledXcode.swift

@@ -7,7 +7,6 @@
 //
 
 import Foundation
-import struct XCModel.SDKs
 import XcodesKit
 import SwiftUI
 

Xcodes/Backend/SDKs+Xcode.swift

@@ -1,11 +1,11 @@
 import Version
-import struct XCModel.Xcode
+import XcodesKit
 
 extension Version {
     /// Initialize a Version from an XcodeReleases' XCModel.Xcode
     ///
     /// This is kinda quick-and-dirty, and it would probably be better for us to adopt something closer to XCModel.Xcode under the hood and map the scraped data to it instead.
-    init?(xcReleasesXcode: XCModel.Xcode) {
+    init?(xcReleasesXcode: XcodeRelease) {
         var versionString = xcReleasesXcode.version.number ?? ""
 
         // Append trailing ".0" in order to get a fully-specified version string