Skip to content

fix missing xcode duplicate versions #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MattKiazyk merged 1 commit into from
May 25, 2026
Merged

fix missing xcode duplicate versions #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion Sources/XcodesKit/Services/XcodeListPresentationService.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public struct XcodeListPresentationService: Sendable {
)
: availableXcodes)
.matchingArchitectureFilters(architectures)
let visibleAvailableXcodes = XcodeListService.filteringPrereleasesWithDuplicateBuildMetadata(adjustedAvailableXcodes)
let visibleAvailableXcodes = Self.filteringPrereleasesWithReleaseMatchingBuildAndArchitecture(adjustedAvailableXcodes)

let adjustedInstalledXcodes = architectures.isEmpty
? installedXcodes
Expand Down Expand Up @@ -149,4 +149,18 @@ public struct XcodeListPresentationService: Sendable {
guard let selectedXcodePath else { return nil }
return installedXcodes.first { selectedXcodePath.hasPrefix($0.path.string) }
}

static func filteringPrereleasesWithReleaseMatchingBuildAndArchitecture(_ xcodes: [AvailableXcode]) -> [AvailableXcode] {
xcodes.filter { availableXcode in
let releaseWithSameBuildAndArchitecture = xcodes.contains {
$0.version.buildMetadataIdentifiers == availableXcode.version.buildMetadataIdentifiers &&
$0.version.prereleaseIdentifiers.isEmpty &&
$0.architectures == availableXcode.architectures
}

return availableXcode.version.prereleaseIdentifiers.isEmpty ||
availableXcode.version.buildMetadataIdentifiers.isEmpty ||
!releaseWithSameBuildAndArchitecture
}
}
}
7 changes: 1 addition & 6 deletions Sources/XcodesKit/Services/XcodeListService.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,14 +220,9 @@ public struct XcodeListService: Sendable {
$0.version.buildMetadataIdentifiers == availableXcode.version.buildMetadataIdentifiers
}

let releaseWithSameBuildAndArchitecture = availableXcodesWithIdenticalBuildIdentifiers.contains {
$0.version.prereleaseIdentifiers.isEmpty &&
$0.architectures == availableXcode.architectures
}

return availableXcodesWithIdenticalBuildIdentifiers.count == 1 ||
availableXcodesWithIdenticalBuildIdentifiers.count > 1 &&
(availableXcode.version.prereleaseIdentifiers.isEmpty || !releaseWithSameBuildAndArchitecture)
(availableXcode.version.prereleaseIdentifiers.isEmpty || availableXcode.architectures?.isEmpty == false)
}
}

Expand Down
5 changes: 3 additions & 2 deletions Tests/XcodesKitTests/XcodesKitTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1102,7 +1102,7 @@ final class XcodesKitTests: XCTestCase {
])
}

func testXcodeListServiceFiltersArchitectureSpecificPrereleaseWhenReleaseHasSameArchitecture() throws {
func testXcodeListServiceKeepsArchitectureSpecificPrereleaseWhenReleaseHasSameArchitecture() throws {
let release = AvailableXcode(
version: try XCTUnwrap(Version("26.5.0+17F42")),
url: try XCTUnwrap(URL(string: "https://apple.com/xcode-arm64.xip")),
Expand All @@ -1124,7 +1124,8 @@ final class XcodesKitTests: XCTestCase {
])

XCTAssertEqual(filtered.map(\.xcodeID), [
release.xcodeID
release.xcodeID,
prerelease.xcodeID
])
}

Expand Down
Loading