XcodesOrg · MattKiazyk · Aug 27, 2025 · Aug 23, 2025 · Aug 23, 2025 · Aug 24, 2025
diff --git a/Xcodes.xcodeproj/project.pbxproj b/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 */; };
@@ -140,7 +139,6 @@
 		E8DA461125FAF7FB002E85EF /* NotificationsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E8DA461025FAF7FB002E85EF /* NotificationsView.swift */; };
 		E8E98A9025D8631800EC89A0 /* InstallationStepRowView.swift in Sources */ = {isa = PBXBuildFile; fileRef = CAFBC3FF259AC17F00E2A3D8 /* InstallationStepRowView.swift */; };
 		E8E98A9625D863D700EC89A0 /* InstallationStepDetailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E8E98A9525D863D700EC89A0 /* InstallationStepDetailView.swift */; };
-		E8EE58C02E1CC2A50003FA9F /* RuntimeArchitecture.swift in Sources */ = {isa = PBXBuildFile; fileRef = E8EE58BF2E1CC2A50003FA9F /* RuntimeArchitecture.swift */; };
 		E8F44A1E296B4CD7002D6592 /* Path in Frameworks */ = {isa = PBXBuildFile; productRef = E8F44A1D296B4CD7002D6592 /* Path */; };
 		E8FA00542B5B109800769CE0 /* com.xcodesorg.xcodesapp.Helper in Copy Helper */ = {isa = PBXBuildFile; fileRef = CA9FF8AE2595967A00E47BAF /* com.xcodesorg.xcodesapp.Helper */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
 		E8FD5727291EE4AC001E004C /* AsyncNetworkService in Frameworks */ = {isa = PBXBuildFile; productRef = E8FD5726291EE4AC001E004C /* AsyncNetworkService */; };
@@ -343,7 +341,6 @@
 		E8D655BF288DD04700A139C2 /* SelectedActionType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SelectedActionType.swift; sourceTree = "<group>"; };
 		E8DA461025FAF7FB002E85EF /* NotificationsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationsView.swift; sourceTree = "<group>"; };
 		E8E98A9525D863D700EC89A0 /* InstallationStepDetailView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InstallationStepDetailView.swift; sourceTree = "<group>"; };
-		E8EE58BF2E1CC2A50003FA9F /* RuntimeArchitecture.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RuntimeArchitecture.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -363,7 +360,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 */,
@@ -662,7 +658,6 @@
 		E8E98A9425D863B100EC89A0 /* InfoPane */ = {
 			isa = PBXGroup;
 			children = (
-				E8EE58BF2E1CC2A50003FA9F /* RuntimeArchitecture.swift */,
 				B0403CEF2AD92D7B00137C09 /* ReleaseNotesView.swift */,
 				B0403CF32AD9381D00137C09 /* SDKsView.swift */,
 				B0403CF52AD9849E00137C09 /* CompilersView.swift */,
@@ -726,7 +721,6 @@
 				CABFA9ED2592F0CC00380FEE /* SwiftSoup */,
 				CABFA9F72592F0F900380FEE /* KeychainAccess */,
 				CABFA9FC2592F13300380FEE /* LegibleError */,
-				CA9FF86C25951C6E00E47BAF /* XCModel */,
 				CAA858CC25A3D8BC00ACF8C0 /* ErrorHandling */,
 				E689540225BE8C64000EBCEA /* DockProgress */,
 				E8FD5726291EE4AC001E004C /* AsyncNetworkService */,
@@ -816,7 +810,6 @@
 				CABFA9EC2592F0CC00380FEE /* XCRemoteSwiftPackageReference "SwiftSoup" */,
 				CABFA9F62592F0F900380FEE /* XCRemoteSwiftPackageReference "KeychainAccess" */,
 				CABFA9FB2592F13300380FEE /* XCRemoteSwiftPackageReference "LegibleError" */,
-				CA9FF86B25951C6E00E47BAF /* XCRemoteSwiftPackageReference "data" */,
 				CAA858CB25A3D8BC00ACF8C0 /* XCRemoteSwiftPackageReference "ErrorHandling" */,
 				CAC28186259EE27200B8AB0B /* XCRemoteSwiftPackageReference "CombineExpectations" */,
 				E689540125BE8C64000EBCEA /* XCRemoteSwiftPackageReference "DockProgress" */,
@@ -942,7 +935,6 @@
 				53CBAB2C263DCC9100410495 /* XcodesAlert.swift in Sources */,
 				332807412CA5EA820036F691 /* SignInSecurityKeyTouchView.swift in Sources */,
 				CA61A6E0259835580008926E /* Xcode.swift in Sources */,
-				E8EE58C02E1CC2A50003FA9F /* RuntimeArchitecture.swift in Sources */,
 				CAE4247F259A666100B8B246 /* MainWindow.swift in Sources */,
 				CA452BB0259FD9770072DFA4 /* ProgressIndicator.swift in Sources */,
 				B0403CF02AD92D7B00137C09 /* ReleaseNotesView.swift in Sources */,
@@ -1504,14 +1496,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 +1591,6 @@
 			isa = XCSwiftPackageProductDependency;
 			productName = LibFido2Swift;
 		};
-		CA9FF86C25951C6E00E47BAF /* XCModel */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = CA9FF86B25951C6E00E47BAF /* XCRemoteSwiftPackageReference "data" */;
-			productName = XCModel;
-		};
 		CAA1CB2C255A5262003FD669 /* AppleAPI */ = {
 			isa = XCSwiftPackageProductDependency;
 			productName = AppleAPI;

diff --git a/Xcodes.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Xcodes.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
diff --git a/Xcodes/Backend/AppState+Install.swift b/Xcodes/Backend/AppState+Install.swift
@@ -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)
         }
     }
 

diff --git a/Xcodes/Backend/AppState+Runtimes.swift b/Xcodes/Backend/AppState+Runtimes.swift
@@ -61,7 +61,22 @@ extension AppState {
             // only selected xcodes > 16.1 beta 3 can download runtimes via a xcodebuild -downloadPlatform version
             // only Runtimes coming from cryptexDiskImage can be downloaded via xcodebuild
             if selectedXcode.version > Version(major: 16, minor: 0, patch: 0) {
-                downloadRuntimeViaXcodeBuild(runtime: runtime)
+
+                if runtime.architectures?.isAppleSilicon ?? false {
+                    if selectedXcode.version > Version(major: 26, minor: 0, patch: 0) {
+                        downloadRuntimeViaXcodeBuild(runtime: runtime)
+                    } else {
+                        // not supported
+                        Logger.appState.error("Trying to download a runtime we can't download")
+                        DispatchQueue.main.async {
+                            self.presentedAlert = .generic(title: localizeString("Alert.Install.Error.Title"), message: localizeString("Alert.Install.Error.Need.Xcode26"))
+                        }
+                        return
+                    }
+
+                } else {
+                    downloadRuntimeViaXcodeBuild(runtime: runtime)
+                }
             } else {
                 // not supported
                 Logger.appState.error("Trying to download a runtime we can't download")
@@ -77,7 +92,8 @@ extension AppState {
 
     func downloadRuntimeViaXcodeBuild(runtime: DownloadableRuntime) {
 
-        let downloadRuntimeTask = Current.shell.downloadRuntime(runtime.platform.shortName, runtime.simulatorVersion.buildUpdate)
+        let downloadRuntimeTask = Current.shell.downloadRuntime(runtime.platform.shortName, runtime.simulatorVersion.buildUpdate, runtime.architectures?.isAppleSilicon ?? false ? Architecture.arm64.rawValue : nil)
+
         runtimePublishers[runtime.identifier] = Task { [weak self] in
             guard let self = self else { return }
             do {
@@ -258,7 +274,10 @@ extension AppState {
     }
 
     func coreSimulatorInfo(runtime: DownloadableRuntime) -> CoreSimulatorImage? {
-        return installedRuntimes.filter({ $0.runtimeInfo.build == runtime.simulatorVersion.buildUpdate }).first
+        return installedRuntimes.filter({
+            $0.runtimeInfo.build == runtime.simulatorVersion.buildUpdate &&
+            ((runtime.architectures ?? []).isEmpty ? true :
+            $0.runtimeInfo.supportedArchitectures == runtime.architectures )}).first
     }
 
     func deleteRuntime(runtime: DownloadableRuntime) async throws {

diff --git a/Xcodes/Backend/AppState+Update.swift b/Xcodes/Backend/AppState+Update.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

diff --git a/Xcodes/Backend/AppState.swift b/Xcodes/Backend/AppState.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.xcodeID == id }) 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.xcodeID == id }) 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.xcodeID == id }) 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.xcodeID == id }) 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,21 @@ 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) 
+                    // if we want to have only specific Xcodes as selected instead of the Architecture Equivalent. 
+                   // if availableXcode.architectures == nil {
+//                        return availableXcode.version.isEquivalent(to: installedXcode.version)
+//                    } else {
+//                        return availableXcode.xcodeID == installedXcode.xcodeID
+//                    }
+                    return availableXcode.version.isEquivalent(to: installedXcode.version)
                 })
 
-                let identicalBuilds: [Version]
+                let identicalBuilds: [XcodeID]
                 let prereleaseAvailableXcodesWithIdenticalBuildIdentifiers = availableXcodes
                     .filter {
                         return $0.version.buildMetadataIdentifiers == availableXcode.version.buildMetadataIdentifiers &&
@@ -905,13 +913,13 @@ 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 = []
                 }
 
                 // If the existing install state is "installing", keep it 
-                let existingXcodeInstallState = allXcodes.first { $0.version == availableXcode.version && $0.installState.installing }?.installState
+                let existingXcodeInstallState = allXcodes.first { $0.id == availableXcode.xcodeID && $0.installState.installing }?.installState
                 // Otherwise, determine it from whether there's an installed Xcode
                 let defaultXcodeInstallState: XcodeInstallState = installedXcode.map { .installed($0.path) } ?? .notInstalled
 
@@ -926,7 +934,8 @@ class AppState: ObservableObject {
                     releaseDate: availableXcode.releaseDate,
                     sdks: availableXcode.sdks,
                     compilers: availableXcode.compilers,
-                    downloadFileSize: availableXcode.fileSize
+                    downloadFileSize: availableXcode.fileSize,
+                    architectures: availableXcode.architectures
                 )
             }