Use preinstalled swift format

FabricMC · May 20, 2024 · 9339a1a · 9339a1a
1 parent a6b9a67
commit 9339a1a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 41 deletions.
diff --git a/windows/Package.resolved b/windows/Package.resolved
@@ -9,33 +9,6 @@
         "revision" : "23deb111ae4c751be9bd28bd49e7294c0e49640e"
       }
     },
-    {
-      "identity" : "swift-argument-parser",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-argument-parser.git",
-      "state" : {
-        "revision" : "46989693916f56d1186bd59ac15124caef896560",
-        "version" : "1.3.1"
-      }
-    },
-    {
-      "identity" : "swift-cmark",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-cmark.git",
-      "state" : {
-        "revision" : "f218e5d7691f78b55bfa39b367763f4612486c35",
-        "version" : "0.3.0"
-      }
-    },
-    {
-      "identity" : "swift-format",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-format",
-      "state" : {
-        "branch" : "58c2ef5",
-        "revision" : "58c2ef514d5b8b3766d2d0957b816a8387b01fed"
-      }
-    },
     {
       "identity" : "swift-log",
       "kind" : "remoteSourceControl",
@@ -45,22 +18,13 @@
         "version" : "1.5.4"
       }
     },
-    {
-      "identity" : "swift-markdown",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-markdown.git",
-      "state" : {
-        "revision" : "e4f95e2dc23097a1a9a1dfdfe3fe3ee44de77378",
-        "version" : "0.3.0"
-      }
-    },
     {
       "identity" : "swift-syntax",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-syntax.git",
       "state" : {
-        "branch" : "main",
-        "revision" : "4824d4d0ee6b733f8fb87016b165e55c37127190"
+        "revision" : "303e5c5c36d6a558407d364878df131c3546fad8",
+        "version" : "510.0.2"
       }
     },
     {

diff --git a/windows/Package.swift b/windows/Package.swift
@@ -21,7 +21,6 @@ let package = Package(
         .executable(name: "Packager", targets: ["Packager"])
     ],
     dependencies: [
-        .package(url: "https://github.com/apple/swift-format", revision: "58c2ef5"),
         .package(url: "https://github.com/apple/swift-testing", .upToNextMinor(from: "0.6.0")),
         .package(url: "https://github.com/apple/swift-log.git", from: "1.0.0"),
         .package(url: "https://github.com/modmuss50/Detours", revision: "23deb11"),

diff --git a/windows/build.gradle b/windows/build.gradle
@@ -99,13 +99,13 @@ tasks.register("clean", Exec) {
 tasks.register("swiftFormat", Exec) {
     inputs.dir file("Sources")
     inputs.dir file("Tests")
-    commandLine "swift", "run", "swift-format", "format", "-r", "-p", "-i", "Sources/", "Tests/"
+    commandLine "swift-format", "format", "-r", "-p", "-i", "Sources/", "Tests/"
     group "swift"
 }
 
 tasks.register("swiftLint", Exec) {
     inputs.dir file("Sources")
     inputs.dir file("Tests")
-    commandLine "swift", "run", "swift-format", "lint", "-r", "-p", "Sources/", "Tests/"
+    commandLine "swift-format", "lint", "-r", "-p", "Sources/", "Tests/"
     group "swift"
 }