Skip to content

armgit / xtool

Public Imported from GitHub
0

Cross-platform Xcode replacement. Build and deploy iOS apps with SwiftPM on Linux, Windows, macOS.

packer: custom SwiftVersion parser (#303)

Kabir Oberaid802c719e43f
diff --git a/Package.resolved b/Package.resolved
index 38d8f63..4cc2f50 100644
--- a/Package.resolved
+++ b/Package.resolved
@@ -1,5 +1,5 @@
{
- "originHash" : "72833caa0d28404618b540ad08cbaa72d65446a56dc70dfd3ff2790a48c9fdda",
+ "originHash" : "7ae7f57a6038e121dec04557563bc2a3412c9e46e473d9c84f3e3ac82be608f9",
"pins" : [
{
"identity" : "aexml",
@@ -397,15 +397,6 @@
"version" : "3.3.0"
}
},
- {
- "identity" : "version",
- "kind" : "remoteSourceControl",
- "location" : "https://github.com/mxcl/Version",
- "state" : {
- "revision" : "3043fcd2a50375db76d89ff206a612471833d1c2",
- "version" : "2.2.1"
- }
- },
{
"identity" : "websocket-kit",
"kind" : "remoteSourceControl",
diff --git a/Package.swift b/Package.swift
index 132ddf5..4a7766f 100644
--- a/Package.swift
+++ b/Package.swift
@@ -81,7 +81,6 @@ let package = Package(
.package(url: "https://github.com/OpenCombine/OpenCombine.git", from: "0.14.0"),
.package(url: "https://github.com/attaswift/BigInt", from: "6.0.0"),
- .package(url: "https://github.com/mxcl/Version", from: "2.1.0"),
.package(url: "https://github.com/jpsim/Yams", from: "5.1.3"),
.package(url: "https://github.com/saagarjha/unxip", from: "3.2.0"),
@@ -198,7 +197,6 @@ let package = Package(
"XcodeProjects",
.product(name: "Superutils", package: "xtool-core"),
.product(name: "Yams", package: "Yams"),
- .product(name: "Version", package: "Version"),
.product(name: "XcodeProjectFormat", package: "xcode-project-format"),
],
swiftSettings: swiftSettings,
diff --git a/Sources/PackLib/SwiftVersion.swift b/Sources/PackLib/SwiftVersion.swift
index 83c31e6..7b5fbe8 100644
--- a/Sources/PackLib/SwiftVersion.swift
+++ b/Sources/PackLib/SwiftVersion.swift
@@ -1,12 +1,64 @@
import Subprocess
-import Version
import XUtils
-public struct SwiftVersion: Sendable {
- public var version: Version
+public struct SwiftVersion: Sendable, Comparable, Hashable {
+ public var major: Int
+ public var minor: Int
+ public var patch: Int
+ public init(_ major: Int, _ minor: Int, _ patch: Int = 0) {
+ self.major = major
+ self.minor = minor
+ self.patch = patch
+ }
+
+ public static func < (lhs: Self, rhs: Self) -> Bool {
+ lhs.tuple < rhs.tuple
+ }
+
+ fileprivate var tuple: (Int, Int, Int) {
+ (major, minor, patch)
+ }
+}
+
+extension SwiftVersion {
public var supportsSwiftBuild: Bool {
- version >= Version(6, 4, 0)
+ self >= SwiftVersion(6, 4)
+ }
+}
+
+extension SwiftVersion: LosslessStringConvertible, CustomStringConvertible {
+ public var description: String {
+ "\(major).\(minor).\(patch)"
+ }
+
+ public init?(_ description: String) {
+ // inverse of https://github.com/swiftlang/swift/blob/896191b38/lib/Basic/Version.cpp#L266
+
+ var output = description[...]
+ if output.hasPrefix("Apple ") {
+ output = output.dropFirst("Apple ".count)
+ }
+ if output.hasPrefix("Swift version ") {
+ output = output.dropFirst("Swift version ".count)
+ output = output.prefix { !$0.isWhitespace }
+ }
+ let isDev = output.hasSuffix("-dev")
+ if isDev { output = output.dropLast("-dev".count) }
+
+ let parts = output.split(separator: ".")
+ var numericParts = parts.compactMap { Int($0) }
+ guard parts.count == numericParts.count else {
+ return nil
+ }
+
+ switch numericParts.count {
+ case 2: numericParts.append(0)
+ case 3: break
+ default: return nil
+ }
+
+ self.init(numericParts[0], numericParts[1], numericParts[2])
}
}
@@ -24,22 +76,12 @@ extension SwiftVersion {
} catch {
throw StringError("Failed to obtain Swift version")
}
- var output = outputString?[...] ?? ""
- if output.hasPrefix("Apple ") {
- output = output.dropFirst("Apple ".count)
- }
- guard output.hasPrefix("Swift version ") else {
- throw StringError("Could not parse Swift version: '\(output)'")
- }
- output = output.dropFirst("Swift version ".count)
- guard let space = output.firstIndex(of: " ") else {
- throw StringError("Could not parse Swift version: '\(output)'")
- }
- output = output[..<space]
- guard let version = Version(tolerant: output) else {
+
+ let output = outputString ?? ""
+ guard let version = Self(output) else {
throw StringError("Could not parse Swift version: '\(output)'")
}
- return SwiftVersion(version: version)
+ return version
}
public static var current: Self {
diff --git a/Tests/XToolTests/SwiftVersionTests.swift b/Tests/XToolTests/SwiftVersionTests.swift
new file mode 100644
index 0000000..d163414
--- /dev/null
+++ b/Tests/XToolTests/SwiftVersionTests.swift
@@ -0,0 +1,86 @@
+import Testing
+@testable import PackLib
+
+@Test(arguments: [
+ ("6.2", SwiftVersion(6, 2)),
+ ("6.2.0", SwiftVersion(6, 2)),
+ ("6.2.1", SwiftVersion(6, 2, 1)),
+ ("Swift version 6.2 (swift-6.2-RELEASE)\nTarget: aarch64-unknown-linux-gnu", SwiftVersion(6, 2)),
+ ("Swift version 6.2.1 (swift-6.2.1-RELEASE)", SwiftVersion(6, 2, 1)),
+ ("Apple Swift version 6.2 (swiftlang-6.2.0.19.9 clang-1700.3.19.1)", SwiftVersion(6, 2)),
+ ("Apple Swift version 6.2.1 (swiftlang-6.2.1.4.3 clang-1700.3.19.1)", SwiftVersion(6, 2, 1)),
+ ("Swift version 6.4-dev (LLVM abcdef, Swift abcdef)", SwiftVersion(6, 4)),
+ ("Apple Swift version 6.4.1-dev (LLVM abcdef, Swift abcdef)", SwiftVersion(6, 4, 1)),
+ ("Swift version 6.2 effective-5.10 (swift-6.2-RELEASE)", SwiftVersion(6, 2)),
+ ("Swift version 6.2", SwiftVersion(6, 2)),
+ ("Apple Swift version 6.2.1", SwiftVersion(6, 2, 1)),
+ ("Swift version 6.4-dev", SwiftVersion(6, 4)),
+ ("Apple Swift version 6.4.1-dev", SwiftVersion(6, 4, 1)),
+ ("Swift version 6.4-dev\n", SwiftVersion(6, 4)),
+ ("Swift version 6.4-dev\nTarget: aarch64-unknown-linux-gnu", SwiftVersion(6, 4)),
+])
+func testSwiftVersionParsing(string: String, expected: SwiftVersion) {
+ #expect(SwiftVersion(string) == expected)
+}
+
+@Test(arguments: [
+ "",
+ "6",
+ "6.2.1.4",
+ "swift version 6.2 (swift-6.2-RELEASE)",
+ "Swift version ",
+ "Swift version 6 (swift-6-RELEASE)",
+ "Swift version 6.2.1.4 (swift-6.2.1.4-RELEASE)",
+ "Swift version six.2 (swift-6.2-RELEASE)",
+ "Swift version 6.two (swift-6.2-RELEASE)",
+ "Swift version 6.2.one (swift-6.2.1-RELEASE)",
+ "Swift version 6.2-beta (swift-6.2-RELEASE)",
+ "Swift version 99999999999999999999.2 (swift-6.2-RELEASE)",
+])
+func testSwiftVersionParsingInvalidInput(string: String) {
+ #expect(SwiftVersion(string) == nil)
+}
+
+@Test(arguments: [
+ (SwiftVersion(0, 0), "0.0.0"),
+ (SwiftVersion(6, 2), "6.2.0"),
+ (SwiftVersion(6, 2, 1), "6.2.1"),
+ (SwiftVersion(10, 20, 30), "10.20.30"),
+])
+func testSwiftVersionStringConversion(version: SwiftVersion, expected: String) {
+ #expect(version.description == expected)
+ #expect(String(version) == expected)
+ #expect(SwiftVersion(version.description) == version)
+}
+
+@Test(arguments: [
+ (SwiftVersion(5, 99, 99), SwiftVersion(6, 0, 0)),
+ (SwiftVersion(6, 2, 99), SwiftVersion(6, 3, 0)),
+ (SwiftVersion(6, 2, 0), SwiftVersion(6, 2, 1)),
+ (SwiftVersion(9, 0, 0), SwiftVersion(10, 0, 0)),
+ (SwiftVersion(6, 9, 0), SwiftVersion(6, 10, 0)),
+ (SwiftVersion(6, 2, 9), SwiftVersion(6, 2, 10)),
+])
+func testSwiftVersionOrdering(lower: SwiftVersion, higher: SwiftVersion) {
+ #expect(lower < higher)
+ #expect(higher > lower)
+ #expect(lower <= higher)
+ #expect(higher >= lower)
+ #expect(!(higher < lower))
+ #expect(!(lower > higher))
+ #expect(lower != higher)
+}
+
+@Test(arguments: [
+ (SwiftVersion(6, 2), SwiftVersion(6, 2, 0)),
+ (SwiftVersion(6, 2, 1), SwiftVersion(6, 2, 1)),
+])
+func testSwiftVersionComparisonEquality(lhs: SwiftVersion, rhs: SwiftVersion) {
+ #expect(lhs == rhs)
+ #expect(!(lhs < rhs))
+ #expect(!(rhs < lhs))
+ #expect(!(lhs > rhs))
+ #expect(!(rhs > lhs))
+ #expect(lhs <= rhs)
+ #expect(lhs >= rhs)
+}