Skip to content

Commit 822b5d7

Browse files
authored
Remove re-export of Version from PackageModel (#6193)
This doesn't seem to be working well (anymore?), so we should get rid of it to avoid flakiness. Long term we may want to move the `Version` type to `PackageModel` directly or possibly to `Basics`. We also have a duplicate of it in `PackageDescription`.
1 parent 11db1f7 commit 822b5d7

File tree

6 files changed

+11
-2
lines changed

6 files changed

+11
-2
lines changed

Sources/PackageModel/Manifest/Manifest.swift

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

17+
import struct TSCUtility.Version
18+
1719
/// This contains the declarative specification loaded from package manifest
1820
/// files, and the tools for working with the manifest.
1921
public final class Manifest: Sendable {

Sources/PackageModel/Manifest/PackageDependencyDescription.swift

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

17+
import struct TSCUtility.Version
18+
1719
/// Represents a package dependency.
1820
public enum PackageDependency: Equatable, Hashable, Sendable {
1921
case fileSystem(FileSystem)

Sources/PackageModel/PackageModel.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@
1313
import Basics
1414
import struct Foundation.URL
1515
import TSCBasic
16-
// Re-export Version from PackageModel, since it is a key part of the model.
17-
@_exported import struct TSCUtility.Version
16+
import struct TSCUtility.Version
1817

1918
import enum TSCUtility.PackageLocation
2019
import struct TSCUtility.PolymorphicCodableArray

Sources/PackageModel/Platform.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
//
1111
//===----------------------------------------------------------------------===//
1212

13+
import struct TSCUtility.Version
14+
1315
/// Represents a platform.
1416
public struct Platform: Equatable, Hashable, Codable {
1517
/// The name of the platform.

Sources/PackageModel/SwiftLanguageVersion.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ import TSCBasic
1414

1515
import Foundation
1616

17+
import struct TSCUtility.Version
18+
1719
/// Represents a Swift language version.
1820
public struct SwiftLanguageVersion: Sendable {
1921

Sources/PackageModel/ToolsVersion.swift

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

17+
import struct TSCUtility.Version
18+
1719
/// Tools version represents version of the Swift toolchain.
1820
public struct ToolsVersion: Equatable, Hashable, Codable, Sendable {
1921

0 commit comments

Comments
 (0)