Merge pull request swiftlang#83 from allevato/tools-support-core-migration

Migrate to swift-tools-support-core.

Author: allevato

Package.resolved

@@ -1,4 +1,4 @@
-// swift-tools-version:4.2
+// swift-tools-version:5.1
 //===----------------------------------------------------------------------===//
 //
 // This source file is part of the Swift.org open source project
@@ -21,11 +21,11 @@ let package = Package(
     .library(name: "SwiftFormatConfiguration", targets: ["SwiftFormatConfiguration"]),
   ],
   dependencies: [
-    .package(url: "https://github.com/apple/swift-package-manager.git", from: "0.4.0"),
     .package(
       url: "https://github.com/apple/swift-syntax",
       .revision("swift-DEVELOPMENT-SNAPSHOT-2019-09-26-m")
     ),
+    .package(url: "https://github.com/apple/swift-tools-support-core.git", from: "0.0.1"),
   ],
   targets: [
     .target(
@@ -60,11 +60,11 @@ let package = Package(
     .target(
       name: "swift-format",
       dependencies: [
-        "SPMUtility",
         "SwiftFormat",
         "SwiftFormatConfiguration",
         "SwiftFormatCore",
         "SwiftSyntax",
+        "SwiftToolsSupport-auto",
       ]
     ),
     .testTarget(

Package.swift

@@ -10,10 +10,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Basic
 import Foundation
-import SPMUtility
 import SwiftFormat
+import TSCBasic
+import TSCUtility
 
 /// Collects the command line options that were passed to `swift-format`.
 struct CommandLineOptions {

Sources/swift-format/CommandLineOptions.swift

@@ -10,12 +10,12 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Basic
 import Foundation
 import SwiftFormat
 import SwiftFormatConfiguration
 import SwiftFormatCore
 import SwiftSyntax
+import TSCBasic
 
 /// Runs the linting pipeline over the provided source file.
 ///

Sources/swift-format/Run.swift

@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import SPMUtility
+import TSCUtility
 
 /// The mode in which the `swift-format` tool should run.
 enum ToolMode: String, Codable, ArgumentKind {

Sources/swift-format/ToolMode.swift

@@ -10,12 +10,12 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Basic
 import Foundation
-import SPMUtility
 import SwiftFormat
 import SwiftFormatConfiguration
 import SwiftFormatCore
+import TSCBasic
+import TSCUtility
 
 fileprivate func main(_ arguments: [String]) -> Int32 {
   let url = URL(fileURLWithPath: arguments.first!)