Merge pull request #1 from ra1028/fix-dependencies

Remove swift-format from main Package.swift
ra1028 · Jan 14, 2020 · 85deacd · 85deacd
2 parents 444cd5f + 7c303ab
commit 85deacd
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 15 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,5 @@
 .DS_Store
-/.build
-/Packages
+.build
 /*.xcodeproj
 xcuserdata/
 vendor/

diff --git a/Makefile b/Makefile
@@ -29,10 +29,10 @@ mod:
 	swift run -c release swift-mod
 
 format:
-	swift run -c release swift-format --configuration .swift-format.json -i -r -m format $(SWIFT_FORMAT_PATHS)
+	swift run -c release --package-path ./Packages swift-format --configuration .swift-format.json -i -r -m format $(SWIFT_FORMAT_PATHS)
 
 lint:
-	swift run -c release swift-format --configuration .swift-format.json -r -m lint $(SWIFT_FORMAT_PATHS)
+	swift run -c release --package-path ./Packages swift-format --configuration .swift-format.json -r -m lint $(SWIFT_FORMAT_PATHS)
 
 autocorrect: mod format lint linuxmain
 

diff --git a/Package.resolved b/Package.resolved
@@ -1,15 +1,6 @@
 {
   "object": {
     "pins": [
-      {
-        "package": "swift-format",
-        "repositoryURL": "https://github.com/ra1028/swift-format.git",
-        "state": {
-          "branch": "swift-5.1-branch-latest",
-          "revision": "d53bc0f8225040cbae99035b3b12a27a215fbd88",
-          "version": null
-        }
-      },
       {
         "package": "SwiftSyntax",
         "repositoryURL": "https://github.com/apple/swift-syntax",

diff --git a/Package.swift b/Package.swift
@@ -51,8 +51,7 @@ let package = Package(
     dependencies: [
         .package(url: "https://github.com/apple/swift-syntax", .exact("0.50100.0")),
         .package(url: "https://github.com/apple/swift-tools-support-core.git", from: "0.0.1"),
-        .package(url: "https://github.com/jpsim/Yams.git", from: "2.0.0"),
-        .package(url: "https://github.com/ra1028/swift-format.git", .branch("swift-5.1-branch-latest")),
+        .package(url: "https://github.com/jpsim/Yams.git", from: "2.0.0")
     ],
     targets: [
         cli,

diff --git a/Packages/Package.resolved b/Packages/Package.resolved
@@ -0,0 +1,34 @@
+{
+  "object": {
+    "pins": [
+      {
+        "package": "swift-format",
+        "repositoryURL": "https://github.com/ra1028/swift-format.git",
+        "state": {
+          "branch": "swift-5.1-branch-latest",
+          "revision": "d53bc0f8225040cbae99035b3b12a27a215fbd88",
+          "version": null
+        }
+      },
+      {
+        "package": "SwiftSyntax",
+        "repositoryURL": "https://github.com/apple/swift-syntax",
+        "state": {
+          "branch": null,
+          "revision": "3e3eb191fcdbecc6031522660c4ed6ce25282c25",
+          "version": "0.50100.0"
+        }
+      },
+      {
+        "package": "swift-tools-support-core",
+        "repositoryURL": "https://github.com/apple/swift-tools-support-core.git",
+        "state": {
+          "branch": null,
+          "revision": "693aba4c4c9dcc4767cc853a0dd38bf90ad8c258",
+          "version": "0.0.1"
+        }
+      }
+    ]
+  },
+  "version": 1
+}
diff --git a/Packages/Package.swift b/Packages/Package.swift
@@ -0,0 +1,10 @@
+// swift-tools-version:5.1
+
+import PackageDescription
+
+let package = Package(
+    name: "Modules",
+    dependencies: [
+        .package(url: "https://github.com/ra1028/swift-format.git", .branch("swift-5.1-branch-latest")),
+    ]
+)