From 7c1774b5630a65b18e7eeae849c603b85a0c9adc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 16 Feb 2024 16:23:48 +0000 Subject: [PATCH 1/2] Bump github.com/mxcl/version from 1.0.3 to 2.0.1 Bumps [github.com/mxcl/version](https://github.com/mxcl/Version) from 1.0.3 to 2.0.1. - [Release notes](https://github.com/mxcl/Version/releases) - [Commits](https://github.com/mxcl/Version/compare/1.0.3...2.0.1) --- updated-dependencies: - dependency-name: github.com/mxcl/version dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- Package.resolved | 4 ++-- Package.swift | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Package.resolved b/Package.resolved index 01d83c2..556b447 100644 --- a/Package.resolved +++ b/Package.resolved @@ -85,8 +85,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/mxcl/Version.git", "state" : { - "revision" : "087c91fedc110f9f833b14ef4c32745dabca8913", - "version" : "1.0.3" + "revision" : "1fe824b80d89201652e7eca7c9252269a1d85e25", + "version" : "2.0.1" } }, { diff --git a/Package.swift b/Package.swift index 0f6c442..1a35722 100644 --- a/Package.swift +++ b/Package.swift @@ -14,7 +14,7 @@ let package = Package( dependencies: [ .package(url: "https://github.com/apple/swift-argument-parser", .upToNextMinor(from: "1.1.4")), .package(url: "https://github.com/mxcl/Path.swift.git", .upToNextMinor(from: "0.16.0")), - .package(url: "https://github.com/mxcl/Version.git", .upToNextMinor(from: "1.0.3")), + .package(url: "https://github.com/mxcl/Version.git", .upToNextMinor(from: "2.0.1")), .package(url: "https://github.com/mxcl/PromiseKit.git", .upToNextMinor(from: "6.22.1")), .package(url: "https://github.com/PromiseKit/Foundation.git", .upToNextMinor(from: "3.4.0")), .package(url: "https://github.com/scinfu/SwiftSoup.git", .upToNextMinor(from: "2.0.0")), From 77ec6e6f45d5d4b86280445439fc0611c71198df Mon Sep 17 00:00:00 2001 From: Kem Chen Date: Sat, 17 Feb 2024 15:24:41 +0800 Subject: [PATCH 2/2] Fix compilation error --- Tests/XcodesKitTests/Models+FirstWithVersionTests.swift | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Tests/XcodesKitTests/Models+FirstWithVersionTests.swift b/Tests/XcodesKitTests/Models+FirstWithVersionTests.swift index df6d8dd..5f54368 100644 --- a/Tests/XcodesKitTests/Models+FirstWithVersionTests.swift +++ b/Tests/XcodesKitTests/Models+FirstWithVersionTests.swift @@ -16,7 +16,7 @@ final class ModelsFirstWithVersionTests: XCTestCase { Xcode(version: Version("7.8.9+ABC123")!, url: URL(fileURLWithPath: "https://developer.apple.com/Xcode7.8.9.app"), filename: "Xcode7.8.9.app", releaseDate: nil), Xcode(version: Version(xcodeVersion: "10.11.12 Release Candidate")!, url: URL(fileURLWithPath: "https://developer.apple.com/Xcode10.11.12ReleaseCandidate.app"), filename: "Xcode10.11.12ReleaseCandidate.app", releaseDate: nil), - Xcode(version: Version(11, 12, 13, prereleaseIdentifiers: ["Release", "Candidate"], buildMetadataIdentifiers: ["DEF456"]), url: URL(fileURLWithPath: "https://developer.apple.com/Xcode11.12.13ReleaseCandidate.app"), filename: "Xcode11.12.13ReleaseCandidate.app", releaseDate: nil), + Xcode(version: Version(major: 11, minor: 12, patch: 13, prereleaseIdentifiers: ["Release", "Candidate"], buildMetadataIdentifiers: ["DEF456"]), url: URL(fileURLWithPath: "https://developer.apple.com/Xcode11.12.13ReleaseCandidate.app"), filename: "Xcode11.12.13ReleaseCandidate.app", releaseDate: nil), ] let installedXcodes = [ @@ -31,7 +31,7 @@ final class ModelsFirstWithVersionTests: XCTestCase { InstalledXcode(path: Path("/Applications/Xcode-7.8.9.app")!, version: Version("7.8.9+ABC123")!), InstalledXcode(path: Path("/Applications/Xcode-10.11.12-release.candidate.app")!, version: Version(xcodeVersion: "10.11.12 Release Candidate")!), - InstalledXcode(path: Path("/Applications/Xcode-11.12.13-release.candidate.app")!, version: Version(11, 12, 13, prereleaseIdentifiers: ["Release", "Candidate"], buildMetadataIdentifiers: ["DEF456"])), + InstalledXcode(path: Path("/Applications/Xcode-11.12.13-release.candidate.app")!, version: Version(major: 11, minor: 12, patch: 13, prereleaseIdentifiers: ["Release", "Candidate"], buildMetadataIdentifiers: ["DEF456"])), ] func test_xcodes_exactMatch() { @@ -64,7 +64,7 @@ final class ModelsFirstWithVersionTests: XCTestCase { // With build metadata XCTAssertEqual( xcodes.first(withVersion: Version(xcodeVersion: "11.12.13")!), - Xcode(version: Version(11, 12, 13, prereleaseIdentifiers: ["Release", "Candidate"], buildMetadataIdentifiers: ["DEF456"]), url: URL(fileURLWithPath: "https://developer.apple.com/Xcode11.12.13ReleaseCandidate.app"), filename: "Xcode11.12.13ReleaseCandidate.app", releaseDate: nil) + Xcode(version: Version(major: 11, minor: 12, patch: 13, prereleaseIdentifiers: ["Release", "Candidate"], buildMetadataIdentifiers: ["DEF456"]), url: URL(fileURLWithPath: "https://developer.apple.com/Xcode11.12.13ReleaseCandidate.app"), filename: "Xcode11.12.13ReleaseCandidate.app", releaseDate: nil) ) } @@ -116,7 +116,7 @@ final class ModelsFirstWithVersionTests: XCTestCase { // With build metadata XCTAssertEqual( installedXcodes.first(withVersion: Version(xcodeVersion: "11.12.13")!), - InstalledXcode(path: Path("/Applications/Xcode-11.12.13-release.candidate.app")!, version: Version(11, 12, 13, prereleaseIdentifiers: ["Release", "Candidate"], buildMetadataIdentifiers: ["DEF456"])) + InstalledXcode(path: Path("/Applications/Xcode-11.12.13-release.candidate.app")!, version: Version(major: 11, minor: 12, patch: 13, prereleaseIdentifiers: ["Release", "Candidate"], buildMetadataIdentifiers: ["DEF456"])) ) }