From 2296430b04fcb25bb82fd4b1b35558e30ff9c430 Mon Sep 17 00:00:00 2001
From: Joshua Kaunert <44586402+jkaunert@users.noreply.github.com>
Date: Fri, 26 May 2023 23:36:18 -0500
Subject: [PATCH 1/4] rename/resolve deps

---
 Package.resolved | 16 ----------------
 Package.swift    |  3 ++-
 2 files changed, 2 insertions(+), 17 deletions(-)
 delete mode 100644 Package.resolved

diff --git a/Package.resolved b/Package.resolved
deleted file mode 100644
index b5e055a..0000000
--- a/Package.resolved
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "object": {
-    "pins": [
-      {
-        "package": "feather-objects",
-        "repositoryURL": "https://github.com/FeatherCMS/feather-objects",
-        "state": {
-          "branch": "main",
-          "revision": "169386ce3bf664fa768186467e4aec1caaee0fcf",
-          "version": null
-        }
-      }
-    ]
-  },
-  "version": 1
-}
diff --git a/Package.swift b/Package.swift
index 0723742..8d7cf34 100644
--- a/Package.swift
+++ b/Package.swift
@@ -10,7 +10,8 @@ let package = Package(
         .library(name: "RedirectObjects", targets: ["RedirectObjects"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/FeatherCMS/feather-objects", .branch("main")),
+		.package(path: "../feather-objects"),
+//        .package(url: "https://github.com/FeatherCMS/feather-objects", .branch("main")),
     ],
     targets: [
         .target(name: "RedirectObjects", dependencies: [

From 4e2bed66e4b92f10f16ba4cfffc52cca3b952df8 Mon Sep 17 00:00:00 2001
From: Joshua Kaunert <44586402+jkaunert@users.noreply.github.com>
Date: Sat, 27 May 2023 18:34:03 -0500
Subject: [PATCH 2/4] re-enables remote SP

---
 Package.resolved | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 Package.resolved

diff --git a/Package.resolved b/Package.resolved
new file mode 100644
index 0000000..3f6a587
--- /dev/null
+++ b/Package.resolved
@@ -0,0 +1,16 @@
+{
+  "object": {
+    "pins": [
+      {
+        "package": "feather-objects",
+        "repositoryURL": "https://github.com/Rando-Coderissian/feather-objects",
+        "state": {
+          "branch": "test-refactor-modules",
+          "revision": "169386ce3bf664fa768186467e4aec1caaee0fcf",
+          "version": null
+        }
+      }
+    ]
+  },
+  "version": 1
+}

From e5b04680c0ef58fa35abc8e198d3f9682417cc74 Mon Sep 17 00:00:00 2001
From: Joshua Kaunert <44586402+jkaunert@users.noreply.github.com>
Date: Sat, 27 May 2023 18:34:17 -0500
Subject: [PATCH 3/4] re-enables remote SP

---
 Package.swift | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Package.swift b/Package.swift
index 8d7cf34..dc3d997 100644
--- a/Package.swift
+++ b/Package.swift
@@ -10,8 +10,10 @@ let package = Package(
         .library(name: "RedirectObjects", targets: ["RedirectObjects"]),
     ],
     dependencies: [
-		.package(path: "../feather-objects"),
-//        .package(url: "https://github.com/FeatherCMS/feather-objects", .branch("main")),
+//		.package(path: "../feather-objects"),
+        .package(url: "https://github.com/Rando-Coderissian/feather-objects", .branch("test-refactor-modules")),
+		
+//        .package(url: "https://github.com/feathercms/feather-objects", .branch("main")),
     ],
     targets: [
         .target(name: "RedirectObjects", dependencies: [

From 8cfd508ad4bb1a80b03c98fc66846c0e9a7f8e64 Mon Sep 17 00:00:00 2001
From: Joshua Kaunert <44586402+jkaunert@users.noreply.github.com>
Date: Mon, 29 May 2023 08:16:19 -0500
Subject: [PATCH 4/4] refactor dep urls for merge

---
 Package.swift | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/Package.swift b/Package.swift
index dc3d997..d6584ba 100644
--- a/Package.swift
+++ b/Package.swift
@@ -4,16 +4,13 @@ import PackageDescription
 let package = Package(
     name: "redirect-objects",
     platforms: [
-       .macOS(.v10_15),
+       .macOS(.v12),
     ],
     products: [
         .library(name: "RedirectObjects", targets: ["RedirectObjects"]),
     ],
-    dependencies: [
-//		.package(path: "../feather-objects"),
-        .package(url: "https://github.com/Rando-Coderissian/feather-objects", .branch("test-refactor-modules")),
-		
-//        .package(url: "https://github.com/feathercms/feather-objects", .branch("main")),
+    dependencies: [		
+       .package(url: "https://github.com/feathercms/feather-objects", .branch("main")),
     ],
     targets: [
         .target(name: "RedirectObjects", dependencies: [