From e2766468910ee2a4bda58cc993a8dde72d6c668f Mon Sep 17 00:00:00 2001 From: Ryan Zulkoski Date: Mon, 10 Jul 2023 09:55:03 -0500 Subject: [PATCH 1/2] Added support for parsing "b" as "beta" and added another assertion to test case. --- Sources/XcodesKit/Version+Xcode.swift | 2 ++ Tests/XcodesKitTests/Models+FirstWithVersionTests.swift | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/Sources/XcodesKit/Version+Xcode.swift b/Sources/XcodesKit/Version+Xcode.swift index 26aa9e10..af8e2796 100644 --- a/Sources/XcodesKit/Version+Xcode.swift +++ b/Sources/XcodesKit/Version+Xcode.swift @@ -43,6 +43,8 @@ public extension Version { optionalPrereleaseIdentifiers[lastIndex] = "\(lastItem)-seed" } + } else if type == "b" { + optionalPrereleaseIdentifiers.append("beta") } else { optionalPrereleaseIdentifiers.append(type) } diff --git a/Tests/XcodesKitTests/Models+FirstWithVersionTests.swift b/Tests/XcodesKitTests/Models+FirstWithVersionTests.swift index 489b9be7..df6d8dd5 100644 --- a/Tests/XcodesKitTests/Models+FirstWithVersionTests.swift +++ b/Tests/XcodesKitTests/Models+FirstWithVersionTests.swift @@ -91,6 +91,10 @@ final class ModelsFirstWithVersionTests: XCTestCase { installedXcodes.first(withVersion: Version(xcodeVersion: "1.2.3 Beta 2")!), InstalledXcode(path: Path("/Applications/Xcode-1.2.3-beta.2.app")!, version: Version(xcodeVersion: "1.2.3 Beta 2")!) ) + XCTAssertEqual( + installedXcodes.first(withVersion: Version(xcodeVersion: "1.2.3b2")!), + InstalledXcode(path: Path("/Applications/Xcode-1.2.3-beta.2.app")!, version: Version(xcodeVersion: "1.2.3 Beta 2")!) + ) // With build metadata XCTAssertEqual( From b5d239febddd47259395ba0eb3331f25684ad1ae Mon Sep 17 00:00:00 2001 From: Ryan Zulkoski Date: Mon, 10 Jul 2023 10:05:52 -0500 Subject: [PATCH 2/2] Fix indentation by replacing tabs with spaces. --- Sources/XcodesKit/Version+Xcode.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Sources/XcodesKit/Version+Xcode.swift b/Sources/XcodesKit/Version+Xcode.swift index af8e2796..b8d1e552 100644 --- a/Sources/XcodesKit/Version+Xcode.swift +++ b/Sources/XcodesKit/Version+Xcode.swift @@ -43,8 +43,8 @@ public extension Version { optionalPrereleaseIdentifiers[lastIndex] = "\(lastItem)-seed" } - } else if type == "b" { - optionalPrereleaseIdentifiers.append("beta") + } else if type == "b" { + optionalPrereleaseIdentifiers.append("beta") } else { optionalPrereleaseIdentifiers.append(type) }