Skip to content

Commit 5e5e2ca

Browse files
authored
Add missing TSCUtility.Version import (#6107)
`TSCUtility.Version` identifier is somehow implicitly re-exported in a lot of places. In some circumstances this re-exporting doesn't happen, which breaks the build. When building `main` I've multiple times stumbled upon errors showing that `TSCUtility.Version` is not available in scope. This could only surface in certain incremental build conditions, maybe dependency scanner not allowing this identifier to be re-exported.
1 parent 636ed43 commit 5e5e2ca

46 files changed

Lines changed: 84 additions & 0 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Sources/Commands/ToolWorkspaceDelegate.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import Workspace
2222

2323
import struct TSCBasic.AbsolutePath
2424
import protocol TSCBasic.OutputByteStream
25+
import struct TSCUtility.Version
2526

2627
class ToolWorkspaceDelegate: WorkspaceDelegate {
2728
private struct DownloadProgress {

Sources/PackageCollections/Model/PackageTypes.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ import struct Foundation.URL
1616
import PackageModel
1717
import SourceControl
1818

19+
import struct TSCUtility.Version
20+
1921
extension PackageCollectionsModel {
2022
/// Package metadata
2123
public struct Package: Codable, Equatable {

Sources/PackageCollections/Model/TargetListResult.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ import Foundation
1515
import PackageModel
1616
import SourceControl
1717

18+
import struct TSCUtility.Version
19+
1820
extension PackageCollectionsModel {
1921
public typealias TargetListResult = [TargetListItem]
2022

Sources/PackageCollections/PackageCollections+Validation.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ import Basics
1616
import PackageCollectionsModel
1717
import PackageModel
1818

19+
import struct TSCUtility.Version
20+
1921
// MARK: - Model validations
2022

2123
extension Model.CollectionSource {

Sources/PackageCollections/Providers/GitHubPackageMetadataProvider.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ import struct Foundation.URL
2020
import PackageModel
2121
import TSCBasic
2222

23+
import struct TSCUtility.Version
24+
2325
struct GitHubPackageMetadataProvider: PackageMetadataProvider, Closable {
2426
private static let apiHostPrefix = "api."
2527

Sources/PackageCollections/Providers/JSONPackageCollectionProvider.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ import PackageModel
2424
import SourceControl
2525
import TSCBasic
2626

27+
import struct TSCUtility.Version
28+
2729
private typealias JSONModel = PackageCollectionModel.V1
2830

2931
struct JSONPackageCollectionProvider: PackageCollectionProvider {

Sources/PackageCollections/Providers/PackageMetadataProvider.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ import struct Foundation.URL
1616
import PackageModel
1717
import TSCBasic
1818

19+
import struct TSCUtility.Version
20+
1921
/// `PackageBasicMetadata` provider
2022
protocol PackageMetadataProvider {
2123
/// Retrieves metadata for a package with the given identity and repository address.

Sources/PackageCollectionsTool/SwiftPackageCollectionsTool.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ import PackageCollections
1919
import PackageModel
2020
import TSCBasic
2121

22+
import struct TSCUtility.Version
23+
2224
private enum CollectionsError: Swift.Error {
2325
case invalidArgument(String)
2426
case invalidVersionString(String)

Sources/PackageFingerprint/FilePackageFingerprintStorage.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ import Foundation
1616
import PackageModel
1717
import TSCBasic
1818

19+
import struct TSCUtility.Version
20+
1921
public struct FilePackageFingerprintStorage: PackageFingerprintStorage {
2022
let fileSystem: FileSystem
2123
let directoryPath: AbsolutePath

Sources/PackageFingerprint/PackageFingerprintStorage.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ import Basics
1414
import Dispatch
1515
import PackageModel
1616

17+
import struct TSCUtility.Version
18+
1719
public protocol PackageFingerprintStorage {
1820
func get(package: PackageIdentity,
1921
version: Version,

0 commit comments

Comments
 (0)