feat: Switched from the Loopwerk fork of PathKit back to the original…

… repo
loopwerk · Mar 28, 2022 · 23331e4 · 23331e4
1 parent 356bb92
commit 23331e4
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 8 deletions.
diff --git a/Example/Package.resolved b/Example/Package.resolved
@@ -21,11 +21,11 @@
       },
       {
         "package": "PathKit",
-        "repositoryURL": "https://github.com/loopwerk/PathKit",
+        "repositoryURL": "https://github.com/kylef/PathKit",
         "state": {
           "branch": null,
-          "revision": "a77fe683402ecfe2dfa9fa18e7aaca1a9f806f40",
-          "version": "1.2.0"
+          "revision": "3bfd2737b700b9a36565a8c94f4ad2b050a5e574",
+          "version": "1.0.1"
         }
       },
       {

diff --git a/Package.resolved b/Package.resolved
@@ -12,11 +12,11 @@
       },
       {
         "package": "PathKit",
-        "repositoryURL": "https://github.com/loopwerk/PathKit",
+        "repositoryURL": "https://github.com/kylef/PathKit",
         "state": {
           "branch": null,
-          "revision": "a77fe683402ecfe2dfa9fa18e7aaca1a9f806f40",
-          "version": "1.2.0"
+          "revision": "3bfd2737b700b9a36565a8c94f4ad2b050a5e574",
+          "version": "1.0.1"
         }
       },
       {

diff --git a/Package.swift b/Package.swift
@@ -12,7 +12,7 @@ let package = Package(
     .executable(name: "watch", targets: ["SagaCLI"])
   ],
   dependencies: [
-    .package(url: "https://github.com/loopwerk/PathKit", from: "1.1.0"),
+    .package(url: "https://github.com/kylef/PathKit", from: "1.0.1"),
     .package(url: "https://github.com/JohnSundell/Codextended.git", from: "0.1.0"),
     .package(url: "https://github.com/apple/swift-docc-plugin.git", branch: "main"),
   ],

diff --git a/Sources/Saga/Item.swift b/Sources/Saga/Item.swift
@@ -1,7 +1,7 @@
 import Foundation
 import PathKit
 
-public protocol Metadata: Codable {}
+public protocol Metadata: Decodable {}
 
 /// A convenience version of ``Metadata`` that's just empty. This can be used, for example, when you don't have custom item metadata or site metadata.
 public struct EmptyMetadata: Metadata {

diff --git a/Sources/Saga/Path+Extensions.swift b/Sources/Saga/Path+Extensions.swift
@@ -32,6 +32,14 @@ public extension Path {
   }
 }
 
+extension Path: Decodable {
+  public init(from decoder: Decoder) throws {
+    let container = try decoder.singleValueContainer()
+    let decodedString = try container.decode(String.self)
+    self.init(decodedString)
+  }
+}
+
 internal extension Path {
   func resolveSwiftPackageFolder() throws -> Path {
     var nextFolder = parent()