Rename Utility to SPMUtility

The former is very likely to conflict with targets in other packages, preventing users from importing them in conjunction with SwiftPM.

Author: jakepetroules

Package.swift

@@ -27,7 +27,7 @@ let package = Package(
  "SPMLibc",
  "POSIX",
  "Basic",
- "Utility",
+ "SPMUtility",
  "SourceControl",
  "SPMLLBuild",
  "PackageModel",
@@ -45,7 +45,7 @@ let package = Package(
  "SPMLibc",
  "POSIX",
  "Basic",
- "Utility",
+ "SPMUtility",
  "SourceControl",
  "SPMLLBuild",
  "PackageModel",
@@ -63,13 +63,13 @@ let package = Package(
  // APIs are implementation details of the package manager. Depend on it
  // at your own risk.
  .library(
- name: "Utility",
+ name: "SPMUtility",
  targets: [
  "clibc",
  "SPMLibc",
  "POSIX",
  "Basic",
- "Utility",
+ "SPMUtility",
  ]
  ),
  ],
@@ -101,34 +101,34 @@ let package = Package(
  dependencies: ["SPMLibc", "POSIX"]),
  .target(
  /** Abstractions for common operations, should migrate to Basic */
- name: "Utility",
+ name: "SPMUtility",
  dependencies: ["POSIX", "Basic"]),
  .target(
  /** Source control operations */
  name: "SourceControl",
- dependencies: ["Basic", "Utility"]),
+ dependencies: ["Basic", "SPMUtility"]),
  .target(
  /** Shim for llbuild library */
  name: "SPMLLBuild",
- dependencies: ["Basic", "Utility"]),
+ dependencies: ["Basic", "SPMUtility"]),
 
  // MARK: Project Model
 
  .target(
  /** Primitive Package model objects */
  name: "PackageModel",
- dependencies: ["Basic", "Utility"]),
+ dependencies: ["Basic", "SPMUtility"]),
  .target(
  /** Package model conventions and loading support */
  name: "PackageLoading",
- dependencies: ["Basic", "PackageModel", "Utility", "SPMLLBuild"]),
+ dependencies: ["Basic", "PackageModel", "SPMUtility", "SPMLLBuild"]),
 
  // MARK: Package Dependency Resolution
 
  .target(
  /** Data structures and support for complete package graphs */
  name: "PackageGraph",
- dependencies: ["Basic", "PackageLoading", "PackageModel", "SourceControl", "Utility"]),
+ dependencies: ["Basic", "PackageLoading", "PackageModel", "SourceControl", "SPMUtility"]),
 
  // MARK: Package Manager Functionality
 
@@ -150,7 +150,7 @@ let package = Package(
  .target(
  /** High-level commands */
  name: "Commands",
- dependencies: ["Basic", "Build", "PackageGraph", "SourceControl", "Utility", "Xcodeproj", "Workspace"]),
+ dependencies: ["Basic", "Build", "PackageGraph", "SourceControl", "SPMUtility", "Xcodeproj", "Workspace"]),
  .target(
  /** The main executable provided by SwiftPM */
  name: "swift-package",
@@ -177,11 +177,11 @@ let package = Package(
  .target(
  /** Test support library */
  name: "TestSupport",
- dependencies: ["Basic", "POSIX", "PackageGraph", "PackageLoading", "SourceControl", "Utility", "Commands"]),
+ dependencies: ["Basic", "POSIX", "PackageGraph", "PackageLoading", "SourceControl", "SPMUtility", "Commands"]),
  .target(
  /** Test support executable */
  name: "TestSupportExecutable",
- dependencies: ["Basic", "POSIX", "Utility"]),
+ dependencies: ["Basic", "POSIX", "SPMUtility"]),
 
  .testTarget(
  name: "BasicTests",
@@ -200,7 +200,7 @@ let package = Package(
  dependencies: ["Workspace", "TestSupport"]),
  .testTarget(
  name: "FunctionalTests",
- dependencies: ["swift-build", "swift-package", "swift-test", "Basic", "Utility", "PackageModel", "TestSupport"]),
+ dependencies: ["swift-build", "swift-package", "swift-test", "Basic", "SPMUtility", "PackageModel", "TestSupport"]),
  .testTarget(
  name: "FunctionalPerformanceTests",
  dependencies: ["swift-build", "swift-package", "swift-test", "TestSupport"]),
@@ -234,7 +234,7 @@ let package = Package(
  dependencies: ["TestSupport"]),
  .testTarget(
  name: "UtilityTests",
- dependencies: ["Utility", "TestSupport", "TestSupportExecutable"]),
+ dependencies: ["SPMUtility", "TestSupport", "TestSupportExecutable"]),
  .testTarget(
  name: "XcodeprojTests",
  dependencies: ["Xcodeproj", "TestSupport"]),

Sources/Build/BuildDelegate.swift

@@ -9,7 +9,7 @@
 */
 
 import Basic
-import Utility
+import SPMUtility
 import SPMLLBuild
 import Dispatch
 

Sources/Build/BuildPlan.swift

@@ -9,7 +9,7 @@
 */
 
 import Basic
-import Utility
+import SPMUtility
 import PackageModel
 import PackageGraph
 import PackageLoading
@@ -144,11 +144,11 @@ public struct BuildParameters {
  }
  return TerminalController.isTTY(stream)
  }()
- 
+
  public var regenerateManifestToken: AbsolutePath {
  return dataPath.appending(components: "..", "regenerate-token")
  }
- 
+
  public var llbuildManifest: AbsolutePath {
  return dataPath.appending(components: "..", configuration.dirname + ".yaml")
  }
@@ -188,7 +188,7 @@ public struct BuildParameters {
  case .off:
  addIndexStoreArguments = false
  case .auto:
- addIndexStoreArguments = configuration == .debug 
+ addIndexStoreArguments = configuration == .debug
  }
 
  if addIndexStoreArguments {
@@ -325,7 +325,7 @@ public final class ClangTargetBuildDescription {
  // Enable index store, if appropriate.
  //
  // This feature is not widely available in OSS clang. So, we only enable
- // index store for Apple's clang or if explicitly asked to. 
+ // index store for Apple's clang or if explicitly asked to.
  if Process.env.keys.contains("SWIFTPM_ENABLE_CLANG_INDEX_STORE") {
  args += buildParameters.indexStoreArguments
  } else if buildParameters.triple.isDarwin(), (try? buildParameters.toolchain._isClangCompilerVendorApple()) == true {
@@ -719,7 +719,7 @@ public final class ProductBuildDescription {
  }
  args += ["-emit-executable"]
  }
- 
+
  // On linux, set rpath such that dynamic libraries are looked up
  // adjacent to the product. This happens by default on macOS.
  if buildParameters.triple.isLinux() {
@@ -902,7 +902,7 @@ public class BuildPlan {
  for buildProduct in buildProducts {
  try plan(buildProduct)
  }
- // FIXME: We need to find out if any product has a target on which it depends 
+ // FIXME: We need to find out if any product has a target on which it depends
  // both static and dynamically and then issue a suitable diagnostic or auto
  // handle that situation.
  }
@@ -979,7 +979,7 @@ public class BuildPlan {
  switch dependency {
  case .target(let target):
  switch target.type {
- // Include executable and tests only if they're top level contents 
+ // Include executable and tests only if they're top level contents
  // of the product. Otherwise they are just build time dependency.
  case .executable, .test:
  if product.targets.contains(target) {

Sources/Build/Sanitizers.swift

@@ -9,7 +9,7 @@
  */
 
 import Basic
-import Utility
+import SPMUtility
 
 /// Available runtime sanitizers.
 public enum Sanitizer: String {

Sources/Build/ToolProtocol.swift

@@ -10,7 +10,7 @@
 
 import Basic
 import PackageModel
-import Utility
+import SPMUtility
 import class Foundation.ProcessInfo
 
 /// Describes a tool which can be understood by llbuild's BuildSystem library.

Sources/Build/llbuild.swift

@@ -9,7 +9,7 @@
 */
 
 import Basic
-import Utility
+import SPMUtility
 import PackageModel
 import PackageGraph
 

Sources/Commands/Completions+bash.swift

@@ -10,7 +10,7 @@
 
 import Foundation
 import Basic
-import Utility
+import SPMUtility
 
 let listDependenciesCommand = "swift package \(PackageMode.completionTool.rawValue) \(PackageToolOptions.CompletionToolMode.listDependencies.rawValue)"
 let listExecutablesCommand = "swift package \(PackageMode.completionTool.rawValue) \(PackageToolOptions.CompletionToolMode.listExecutables.rawValue)"

Sources/Commands/Completions+zsh.swift

@@ -10,7 +10,7 @@
 
 import Foundation
 import Basic
-import Utility
+import SPMUtility
 
 /// Template for ZSH completion script.
 ///

Sources/Commands/Error.swift

@@ -12,7 +12,7 @@ import Basic
 import PackageLoading
 import PackageModel
 import SourceControl
-import Utility
+import SPMUtility
 import func POSIX.exit
 import Workspace
 

Sources/Commands/Options.swift

@@ -9,14 +9,14 @@
 */
 
 import Basic
-import Utility
+import SPMUtility
 import Build
 import PackageModel
 
 public class ToolOptions {
  /// Custom arguments to pass to C compiler, swift compiler and the linker.
  public var buildFlags = BuildFlags()
- 
+
  /// Build configuration.
  public var configuration: BuildConfiguration = .debug
 
@@ -25,7 +25,7 @@ public class ToolOptions {
 
  /// The custom working directory that the tool should operate in (deprecated).
  public var chdir: AbsolutePath?
- 
+
  /// The custom working directory that the tool should operate in.
  public var packagePath: AbsolutePath?
 
@@ -49,7 +49,7 @@ public class ToolOptions {
 
  /// If should link the Swift stdlib statically.
  public var shouldLinkStaticSwiftStdlib = false
- 
+
  /// If should enable building with llbuild library.
  public var shouldEnableLLBuildLibrary = true