[Utility] Export Version from Utility.

ddunbar · ddunbar · commit 19dffcc9ae82 · 2016-08-12T13:39:58.000-07:00
- Conceptually, this is one of our core types; it should come from a core
   library not from PackageDescription.

 - Also, export Version from PackageModel since it is also conceptually part of
   the model.
diff --git a/Sources/Commands/SwiftBuildTool.swift b/Sources/Commands/SwiftBuildTool.swift
@@ -16,9 +16,7 @@ import PackageModel
 import Utility
 
 import enum Build.Configuration
-import enum Utility.ColorWrap
 import protocol Build.Toolchain
-import struct PackageDescription.Version
 
 import func POSIX.chdir
 
diff --git a/Sources/Commands/SwiftPackageTool.swift b/Sources/Commands/SwiftPackageTool.swift
@@ -17,9 +17,7 @@ import Utility
 import Xcodeproj
 
 import enum Build.Configuration
-import enum Utility.ColorWrap
 import protocol Build.Toolchain
-import struct PackageDescription.Version
 
 import func POSIX.chdir
 
diff --git a/Sources/Commands/show-dependencies.swift b/Sources/Commands/show-dependencies.swift
@@ -10,7 +10,6 @@
 
 import Basic
 import PackageModel
-import struct PackageDescription.Version
 
 func dumpDependenciesOf(rootPackage: Package, mode: ShowDependenciesMode) {
     let dumper: DependenciesDumper
diff --git a/Sources/Get/Error.swift b/Sources/Get/Error.swift
@@ -8,7 +8,7 @@
  See http://swift.org/CONTRIBUTORS.txt for Swift project authors
 */
 
-import struct PackageDescription.Version
+import Utility
 
 enum Error: Swift.Error {
 
diff --git a/Sources/Get/Fetchable.swift b/Sources/Get/Fetchable.swift
@@ -8,7 +8,7 @@
  See http://swift.org/CONTRIBUTORS.txt for Swift project authors
 */
 
-import struct PackageDescription.Version
+import Utility
 
 protocol Fetchable {
     var currentVersion: Version { get }
diff --git a/Sources/Get/Fetcher.swift b/Sources/Get/Fetcher.swift
@@ -8,7 +8,7 @@
  See http://swift.org/CONTRIBUTORS.txt for Swift project authors
 */
 
-import struct PackageDescription.Version
+import Utility
 
 /**
  Testable protocol to recursively fetch versioned resources.
diff --git a/Sources/Get/Git.swift b/Sources/Get/Git.swift
@@ -8,17 +8,19 @@
  See http://swift.org/CONTRIBUTORS.txt for Swift project authors
 */
 
+import class Foundation.ProcessInfo
+
 import Basic
-import struct PackageDescription.Version
+import Utility
+
 import func POSIX.realpath
-import func POSIX.getenv
 import enum POSIX.Error
-import class Foundation.ProcessInfo
-import Utility
 
 extension Git {
     class func clone(_ url: String, to dstdir: AbsolutePath) throws -> Repo {
-        // canonicalize URL
+        // Canonicalize URL.
+        //
+        // FIXME: This is redundant with the same code in the manifest loader.
         var url = url
         if URL.scheme(url) == nil {
             url = try realpath(url)
diff --git a/Sources/Get/Manifest+Fetchable.swift b/Sources/Get/Manifest+Fetchable.swift
@@ -9,8 +9,7 @@
 */
 
 import PackageModel
-
-import struct PackageDescription.Version
+import Utility
 
 extension Manifest: Fetchable {
     var children: [(String, Range<Version>)] {
diff --git a/Sources/Get/PackagesDirectory.swift b/Sources/Get/PackagesDirectory.swift
@@ -13,7 +13,6 @@ import PackageLoading
 import PackageModel
 import Utility
 
-import struct PackageDescription.Version
 import func POSIX.rename
 
 /// A container for fetched packages.
diff --git a/Sources/Get/Range.swift b/Sources/Get/Range.swift
@@ -8,7 +8,7 @@
  See http://swift.org/CONTRIBUTORS.txt for Swift project authors
 */
 
-import PackageDescription
+import struct Utility.Version
 
 // FIXME: workaround for inability to constrain the extension to `Bound == Version`.
 protocol _VersionProtocol : Comparable {}
diff --git a/Sources/Get/RawClone.swift b/Sources/Get/RawClone.swift
@@ -12,8 +12,6 @@ import Basic
 import PackageModel
 import Utility
 
-import struct PackageDescription.Version
-
 /// A clone of a repository which is not yet fully loaded.
 ///
 /// Initially we clone into a non-final form because we may need to adjust the
diff --git a/Sources/Get/Version.swift b/Sources/Get/Version.swift
@@ -8,8 +8,7 @@
  See http://swift.org/CONTRIBUTORS.txt for Swift project authors
 */
 
-import struct PackageDescription.Version
-
+import struct Utility.Version
 
 extension Version {
     static var max: Version {
diff --git a/Sources/PackageGraph/DependencyResolver.swift b/Sources/PackageGraph/DependencyResolver.swift
@@ -8,7 +8,7 @@
  See http://swift.org/CONTRIBUTORS.txt for Swift project authors
 */
 
-import struct PackageDescription.Version
+import struct Utility.Version
 
 public enum DependencyResolverError: Error {
     /// The resolver was unable to find a solution to the input constraints.
diff --git a/Sources/PackageModel/Package.swift b/Sources/PackageModel/Package.swift
@@ -10,7 +10,9 @@
 
 import Basic
 import Utility
-import struct PackageDescription.Version
+
+// Re-export Version from PackageModel, since it is a key part of the model.
+@_exported import struct Utility.Version
 
 /// The basic package representation.
 ///
diff --git a/Sources/Utility/Git.swift b/Sources/Utility/Git.swift
@@ -14,8 +14,6 @@ import func POSIX.getenv
 import libc
 import class Foundation.ProcessInfo
 
-import struct PackageDescription.Version
-
 extension Version {
     static func vprefix(_ string: String) -> Version? {
         if string.characters.first == "v" {
diff --git a/Sources/Utility/Version.swift b/Sources/Utility/Version.swift
@@ -0,0 +1,18 @@
+/*
+ This source file is part of the Swift.org open source project
+
+ Copyright 2016 Apple Inc. and the Swift project authors
+ Licensed under Apache License v2.0 with Runtime Library Exception
+
+ See http://swift.org/LICENSE.txt for license information
+ See http://swift.org/CONTRIBUTORS.txt for Swift project authors
+*/
+
+// Explicitly re-export Version from Utility.
+//
+// FIXME: Conceptually, we shouldn't explicitly depend on any of the types in
+// PackageDescription, since we want the API to be fully decoupled from the
+// exact SwiftPM version. That is important if we ever need to load manifests
+// from other versions of the package manager within a single build.
+
+@_exported import struct PackageDescription.Version
diff --git a/Tests/GetTests/GetTests.swift b/Tests/GetTests/GetTests.swift
@@ -17,7 +17,6 @@ import Utility
 import struct PackageModel.Manifest
 import class PackageModel.Package
 
-@testable import struct PackageDescription.Version
 @testable import Get
 
 class GetTests: XCTestCase {
diff --git a/Tests/GetTests/GitTests.swift b/Tests/GetTests/GitTests.swift
@@ -16,7 +16,6 @@ import Utility
 import TestSupport
 
 import class PackageDescription.Package
-import struct PackageDescription.Version
 import struct PackageModel.Manifest
 
 @testable import Get
diff --git a/Tests/GetTests/VersionGraphTests.swift b/Tests/GetTests/VersionGraphTests.swift
@@ -8,10 +8,12 @@
  See http://swift.org/CONTRIBUTORS.txt for Swift project authors
 */
 
-@testable import struct PackageDescription.Version
-@testable import Get
 import XCTest
 
+import Utility
+
+@testable import Get
+
 class VersionGraphTests: XCTestCase {
 
     func testNoGraph() {
diff --git a/Tests/PackageGraphTests/DependencyResolverTests.swift b/Tests/PackageGraphTests/DependencyResolverTests.swift
@@ -12,7 +12,7 @@ import XCTest
 
 import PackageGraph
 
-import struct PackageDescription.Version
+import struct Utility.Version
 
 import TestSupport
 
diff --git a/Tests/UtilityTests/GitTests.swift b/Tests/UtilityTests/GitTests.swift
@@ -12,8 +12,6 @@ import XCTest
 
 import Basic
 
-import struct PackageDescription.Version
-
 @testable import Utility
 
 import TestSupport
