From 38a023bea638c4d2d555d68f9145db7139dcc0ed Mon Sep 17 00:00:00 2001
From: Lucas Schwiderski <lucas@lschwiderski.de>
Date: Mon, 21 Apr 2025 22:52:54 +0200
Subject: [PATCH] Move serde_sjson to its own project

---
 .gitmodules     |  3 ---
 Cargo.lock      | 31 +++++++++++++++++++++----------
 Cargo.toml      |  3 +--
 lib/serde_sjson |  1 -
 4 files changed, 22 insertions(+), 16 deletions(-)
 delete mode 160000 lib/serde_sjson

diff --git a/.gitmodules b/.gitmodules
index a03eebf..e1964a8 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
-[submodule "lib/serde_sjson"]
-	path = lib/serde_sjson
-	url = https://git.sclu1034.dev/lucas/serde_sjson.git
 [submodule "lib/luajit2-sys"]
 	path = lib/luajit2-sys
 	url = https://github.com/sclu1034/luajit2-sys.git
diff --git a/Cargo.lock b/Cargo.lock
index 7417133..874331a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -39,7 +39,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c43e7fd8284f025d0bd143c2855618ecdf697db55bde39211e5c9faec7669173"
 dependencies = [
  "heapless",
- "nom",
+ "nom 7.1.3",
 ]
 
 [[package]]
@@ -383,7 +383,7 @@ version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
 dependencies = [
- "nom",
+ "nom 7.1.3",
 ]
 
 [[package]]
@@ -2033,7 +2033,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4"
 dependencies = [
  "cfg-if",
- "windows-targets 0.48.5",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -2274,14 +2274,23 @@ dependencies = [
 ]
 
 [[package]]
-name = "nom_locate"
-version = "4.2.0"
+name = "nom"
+version = "8.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e3c83c053b0713da60c5b8de47fe8e494fe3ece5267b2f23090a07a053ba8f3"
+checksum = "df9761775871bdef83bee530e60050f7e54b1105350d6884eb0fb4f46c2f9405"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "nom_locate"
+version = "5.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b577e2d69827c4740cba2b52efaad1c4cc7c73042860b199710b3575c68438d"
 dependencies = [
  "bytecount",
  "memchr",
- "nom",
+ "nom 8.0.0",
 ]
 
 [[package]]
@@ -3269,9 +3278,11 @@ dependencies = [
 
 [[package]]
 name = "serde_sjson"
-version = "1.0.0"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1c5b0d7af37492e99b8559436ee76b9ec8935c75449b1c2ef08c205a9e92ae6f"
 dependencies = [
- "nom",
+ "nom 8.0.0",
  "nom_locate",
  "serde",
 ]
@@ -4374,7 +4385,7 @@ version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
 dependencies = [
- "windows-sys 0.48.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index 3f00fe6..31130f4 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -6,7 +6,6 @@ members = [
     "lib/dtmt-shared",
     "lib/oodle",
     "lib/sdk",
-    "lib/serde_sjson",
     "lib/luajit2-sys",
     "lib/color-eyre",
 ]
@@ -47,7 +46,7 @@ pin-project-lite = "0.2.9"
 promptly = "0.3.1"
 sdk = { path = "lib/sdk" }
 serde = { version = "1.0.152", features = ["derive", "rc"] }
-serde_sjson = { path = "lib/serde_sjson" }
+serde_sjson = "1.2.1"
 steamlocate = "2.0.0-beta.2"
 strip-ansi-escapes = "0.2.0"
 time = { version = "0.3.20", features = ["serde", "serde-well-known", "local-offset", "formatting", "macros"] }
diff --git a/lib/serde_sjson b/lib/serde_sjson
deleted file mode 160000
index 73d2b23..0000000
--- a/lib/serde_sjson
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 73d2b23ce50e75b184f5092ad515e97a0adbe6da