From 6bbe7e1395b5b6764559868725233ca8248797d4 Mon Sep 17 00:00:00 2001
From: Joshua Kaunert <44586402+jkaunert@users.noreply.github.com>
Date: Fri, 26 May 2023 23:37: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 6a33731..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 6916e20..3a8601a 100644
--- a/Package.swift
+++ b/Package.swift
@@ -10,7 +10,8 @@ let package = Package(
         .library(name: "UserObjects", targets: ["UserObjects"]),
     ],
     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: "UserObjects", dependencies: [

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

---
 Package.swift | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Package.swift b/Package.swift
index 3a8601a..a45a95b 100644
--- a/Package.swift
+++ b/Package.swift
@@ -10,7 +10,8 @@ let package = Package(
         .library(name: "UserObjects", targets: ["UserObjects"]),
     ],
     dependencies: [
-		.package(path: "../feather-objects"),
+//		.package(path: "../feather-objects"),
+        .package(url: "https://github.com/feathercms/feather-objects", .branch("test-refactor-modules")),
 //        .package(url: "https://github.com/feathercms/feather-objects", .branch("main")),
     ],
     targets: [

From e94b529e0ebe09b1528456f84b983699a2707eb6 Mon Sep 17 00:00:00 2001
From: Joshua Kaunert <44586402+jkaunert@users.noreply.github.com>
Date: Sun, 28 May 2023 19:45:17 -0500
Subject: [PATCH 3/4] fixes syntax error in dep url

---
 Package.resolved | 16 ++++++++++++++++
 Package.swift    |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)
 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
+}
diff --git a/Package.swift b/Package.swift
index a45a95b..6e0f3fe 100644
--- a/Package.swift
+++ b/Package.swift
@@ -11,7 +11,7 @@ let package = Package(
     ],
     dependencies: [
 //		.package(path: "../feather-objects"),
-        .package(url: "https://github.com/feathercms/feather-objects", .branch("test-refactor-modules")),
+        .package(url: "https://github.com/Rando-Coderissian/feather-objects", .branch("test-refactor-modules")),
 //        .package(url: "https://github.com/feathercms/feather-objects", .branch("main")),
     ],
     targets: [

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

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

diff --git a/Package.swift b/Package.swift
index 6e0f3fe..a1bedd3 100644
--- a/Package.swift
+++ b/Package.swift
@@ -4,15 +4,13 @@ import PackageDescription
 let package = Package(
     name: "user-objects",
     platforms: [
-       .macOS(.v10_15)
+       .macOS(.v12)
     ],
     products: [
         .library(name: "UserObjects", targets: ["UserObjects"]),
     ],
     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")),
+       .package(url: "https://github.com/feathercms/feather-objects", .branch("main")),
     ],
     targets: [
         .target(name: "UserObjects", dependencies: [