Merge branch 'feature/remove-swift-format'

Cleverlance · Feb 20, 2024 · eae37c9 · eae37c9
2 parents 6b2c777 + 0dfbeb2
commit eae37c9
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 100 deletions.
diff --git a/Package.swift b/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:5.4
+// swift-tools-version:5.9
 
 import PackageDescription
 
@@ -9,16 +9,14 @@ let package = Package(
         .library(name: "SwiftTools", targets: ["SwiftTools"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/Swinject/Swinject.git", .exact("2.8.1")),
-        .package(url: "https://github.com/Swinject/SwinjectAutoregistration", .exact("2.8.1")),
-        .package(url: "https://github.com/nicklockwood/SwiftFormat", .upToNextMajor(from: "0.53.0")),
-        .package(url: "https://github.com/jakeheis/SwiftCLI", .exact("6.0.3")),
+        .package(url: "https://github.com/Swinject/Swinject.git", from: "2.8.1"),
+        .package(url: "https://github.com/Swinject/SwinjectAutoregistration", from: "2.8.1"),
+        .package(url: "https://github.com/jakeheis/SwiftCLI", exact: "6.0.3"),
     ],
     targets: [
         .target(name: "SwiftTools", dependencies: [
             "Swinject",
             "SwinjectAutoregistration",
-            "SwiftFormat",
             "SwiftCLI",
         ]),
         .testTarget(

diff --git a/Sources/SwiftTools/Format/Injection/FormatAssembly.swift b/Sources/SwiftTools/Format/Injection/FormatAssembly.swift
diff --git a/Sources/SwiftTools/Format/Resource/FormatService.swift b/Sources/SwiftTools/Format/Resource/FormatService.swift
diff --git a/Sources/SwiftTools/Format/Resource/FormatXMLService.swift b/Sources/SwiftTools/Format/Resource/FormatXMLService.swift
diff --git a/Sources/SwiftTools/SwiftToolsAssemblies.swift b/Sources/SwiftTools/SwiftToolsAssemblies.swift
@@ -19,7 +19,6 @@ public enum SwiftToolsAssemblies {
             NetworkAssembly(),
             PrintAssembly(),
             ShellAssembly(),
-            FormatAssembly(),
             MergeAssembly(),
             SynchronizeLatestReleaseAssembly(),
             UpdateAssembly(),