From 3e0f8ac66fa25eabc8ba7d860c161dee2ac26a9a Mon Sep 17 00:00:00 2001
From: Daniel McKnight <daniel@neon.ai>
Date: Fri, 13 Sep 2024 15:24:59 -0700
Subject: [PATCH 1/2] Update OVOS dependencies for 0.x compat. Refactor imports

---
 __init__.py      | 3 ++-
 requirements.txt | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/__init__.py b/__init__.py
index 8dd6b8c..1f64ac2 100644
--- a/__init__.py
+++ b/__init__.py
@@ -40,10 +40,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from adapt.intent import IntentBuilder
+
 from ovos_utils import classproperty
 from ovos_utils.log import LOG
 from ovos_utils.process_utils import RuntimeRequirements
+from ovos_workshop.intents import IntentBuilder
 from lingua_franca.parse import normalize
 from neon_utils.skills.common_query_skill import CommonQuerySkill, CQSMatchLevel
 from neon_utils.user_utils import get_message_user, get_user_prefs
diff --git a/requirements.txt b/requirements.txt
index 708a17f..ac3ee78 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
 requests>=2.13.0
-neon-utils~=1.9
-ovos-utils~=0.0, >=0.0.28
-adapt-parser>=0.5,<2.0
-ovos-workshop~=0.0.15
\ No newline at end of file
+# TODO: network patching dependency resolution
+neon-utils[network]~=1.9,>=1.11.1a3
+ovos-utils~=0.0,>=0.0.28
+ovos-workshop~=0.0,>=0.0.15
\ No newline at end of file

From 3363b693d1af00213b81998580dbd0ac37c10ed1 Mon Sep 17 00:00:00 2001
From: NeonDaniel <NeonDaniel@users.noreply.github.com>
Date: Fri, 13 Sep 2024 22:26:04 +0000
Subject: [PATCH 2/2] Update skill.json

---
 skill.json | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/skill.json b/skill.json
index e031ba4..ecf9a35 100644
--- a/skill.json
+++ b/skill.json
@@ -15,10 +15,9 @@
     "systemDeps": false,
     "requirements": {
         "python": [
-            "adapt-parser>=0.5,<2.0",
-            "neon-utils~=1.9",
-            "ovos-utils~=0.0, >=0.0.28",
-            "ovos-workshop~=0.0.15",
+            "neon-utils[network]~=1.9,>=1.11.1a3",
+            "ovos-utils~=0.0,>=0.0.28",
+            "ovos-workshop~=0.0,>=0.0.15",
             "requests>=2.13.0"
         ],
         "system": {},