Skip to content

Commit dffd4b3

Browse files
authored
resolve warning from recent Version constructor changes (#3654)
motivation: less warnings changes: use Version(_:) instead of the recently deprecated Version(string:)
1 parent 2226d7e commit dffd4b3

File tree

8 files changed

+17
-17
lines changed

8 files changed

+17
-17
lines changed

Sources/Commands/SwiftPackageCollectionsTool.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ public struct SwiftPackageCollectionsTool: ParsableCommand {
271271
let result = try tsc_await { collections.getPackageMetadata(reference, callback: $0) }
272272

273273
if let versionString = version {
274-
guard let version = TSCUtility.Version(string: versionString), let result = result.package.versions.first(where: { $0.version == version }), let printedResult = printVersion(result) else {
274+
guard let version = TSCUtility.Version(versionString), let result = result.package.versions.first(where: { $0.version == version }), let printedResult = printVersion(result) else {
275275
throw CollectionsError.invalidVersionString(versionString)
276276
}
277277

Sources/Commands/SwiftPackageTool.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -976,7 +976,7 @@ extension SwiftPackageTool.Config {
976976

977977
extension SwiftPackageTool {
978978
struct ResolveOptions: ParsableArguments {
979-
@Option(help: "The version to resolve at", transform: { Version(string: $0) })
979+
@Option(help: "The version to resolve at", transform: { Version($0) })
980980
var version: Version?
981981

982982
@Option(help: "The branch to resolve at")

Sources/PackageLoading/ManifestJSONParser.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -461,18 +461,18 @@ extension PackageDependency.SourceControl.Requirement {
461461

462462
case "range":
463463
let lowerBoundString = try json.get(String.self, forKey: "lowerBound")
464-
guard let lowerBound = Version(string: lowerBoundString) else {
464+
guard let lowerBound = Version(lowerBoundString) else {
465465
throw InternalError("invalid version \(lowerBoundString)")
466466
}
467467
let upperBoundString = try json.get(String.self, forKey: "upperBound")
468-
guard let upperBound = Version(string: upperBoundString) else {
468+
guard let upperBound = Version(upperBoundString) else {
469469
throw InternalError("invalid version \(upperBoundString)")
470470
}
471471
self = .range(lowerBound ..< upperBound)
472472

473473
case "exact":
474474
let versionString = try json.get(String.self, forKey: "identifier")
475-
guard let version = Version(string: versionString) else {
475+
guard let version = Version(versionString) else {
476476
throw InternalError("invalid version \(versionString)")
477477
}
478478
self = .exact(version)
@@ -489,18 +489,18 @@ extension PackageDependency.Registry.Requirement {
489489
switch type {
490490
case "range":
491491
let lowerBoundString = try json.get(String.self, forKey: "lowerBound")
492-
guard let lowerBound = Version(string: lowerBoundString) else {
492+
guard let lowerBound = Version(lowerBoundString) else {
493493
throw InternalError("invalid version \(lowerBoundString)")
494494
}
495495
let upperBoundString = try json.get(String.self, forKey: "upperBound")
496-
guard let upperBound = Version(string: upperBoundString) else {
496+
guard let upperBound = Version(upperBoundString) else {
497497
throw InternalError("invalid version \(upperBoundString)")
498498
}
499499
self = .range(lowerBound ..< upperBound)
500500

501501
case "exact":
502502
let versionString = try json.get(String.self, forKey: "identifier")
503-
guard let version = Version(string: versionString) else {
503+
guard let version = Version(versionString) else {
504504
throw InternalError("invalid version \(versionString)")
505505
}
506506
self = .exact(version)

Sources/SPMTestSupport/MockDependencyGraph.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public extension MockDependencyGraph {
5050
let (container, version) = value
5151
guard case .string(let str) = version else { fatalError() }
5252
let package = PackageReference.remote(identity: PackageIdentity(url: container.lowercased()), location: "/\(container)")
53-
return (package, Version(string: str)!)
53+
return (package, Version(str)!)
5454
})
5555
self.name = name
5656
self.constraints = constraints.map(PackageContainerConstraint.init(json:))
@@ -67,7 +67,7 @@ private extension MockPackageContainer {
6767
var depByVersion: [Version: [(container: String, versionRequirement: VersionSetSpecifier)]] = [:]
6868
for (version, deps) in versions {
6969
guard case .array(let depArray) = deps else { fatalError() }
70-
depByVersion[Version(string: version)!] = depArray
70+
depByVersion[Version(version)!] = depArray
7171
.map(PackageContainerConstraint.init(json:))
7272
.map { constraint in
7373
switch constraint.requirement {
@@ -109,11 +109,11 @@ private extension VersionSetSpecifier {
109109
switch arr.count {
110110
case 1:
111111
guard case .string(let str) = arr[0] else { fatalError() }
112-
self = .exact(Version(string: str)!)
112+
self = .exact(Version(str)!)
113113
case 2:
114114
let versions = arr.map { json -> Version in
115115
guard case .string(let str) = json else { fatalError() }
116-
return Version(string: str)!
116+
return Version(str)!
117117
}
118118
self = .range(versions[0] ..< versions[1])
119119
default: fatalError()

Sources/SPMTestSupport/MockPackageContainer.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ public class MockPackageContainer: PackageContainer {
9292
dependencies: [String: [Dependency]] = [:]
9393
) {
9494
self.package = package
95-
self._versions = dependencies.keys.compactMap(Version.init(string:)).sorted()
95+
self._versions = dependencies.keys.compactMap(Version.init(_:)).sorted()
9696
self.dependencies = dependencies
9797
}
9898
}

Sources/SPMTestSupport/MockWorkspace.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ public final class MockWorkspace {
120120
let versions: [String?] = packageKind == .remote ? package.versions : [nil]
121121
let manifestPath = packagePath.appending(component: Manifest.filename)
122122
for version in versions {
123-
let v = version.flatMap(Version.init(string:))
123+
let v = version.flatMap(Version.init(_:))
124124
manifests[.init(url: packageLocation, version: v)] = Manifest(
125125
name: package.name,
126126
path: manifestPath,

Tests/PackageGraphTests/PubgrubTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2106,7 +2106,7 @@ public class MockContainer: PackageContainer {
21062106
) {
21072107
self.package = package
21082108
self.dependencies = dependencies
2109-
let versions = dependencies.keys.compactMap(Version.init(string:))
2109+
let versions = dependencies.keys.compactMap(Version.init(_:))
21102110
self._versions = versions
21112111
.sorted()
21122112
.map(BoundVersion.version)

Tests/PackageGraphTests/RepositoryPackageContainerProviderTests.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ private class MockRepository: Repository {
4848
}
4949

5050
func resolveRevision(tag: String) throws -> Revision {
51-
assert(self.versions.index(forKey: Version(string: tag)!) != nil)
51+
assert(self.versions.index(forKey: Version(tag)!) != nil)
5252
return Revision(identifier: tag)
5353
}
5454

@@ -69,7 +69,7 @@ private class MockRepository: Repository {
6969
}
7070

7171
func openFileView(revision: Revision) throws -> FileSystem {
72-
assert(self.versions.index(forKey: Version(string: revision.identifier)!) != nil)
72+
assert(self.versions.index(forKey: Version(revision.identifier)!) != nil)
7373
// This is used for reading the tools version.
7474
return self.fs
7575
}

0 commit comments

Comments
 (0)