From edf7204c7d74f0a74ed6928cfe61693544c8083b Mon Sep 17 00:00:00 2001
From: Suet-fei Li <suetfei@google.com>
Date: Wed, 12 Apr 2023 22:43:04 +0000
Subject: [PATCH 1/3] Fix json path

---
 .gitmodules      | 4 ----
 third_party/json | 1 -
 2 files changed, 5 deletions(-)
 delete mode 160000 third_party/json

diff --git a/.gitmodules b/.gitmodules
index b3e42f81..c14bb9c5 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -33,7 +33,3 @@
 [submodule "third_party/mbedtls"]
 	path = third_party/mbedtls
 	url = https://github.com/ARMmbed/mbedtls
-[submodule "third_party/json"]
-	path = third_party/json
-	url = https://github.com/nlohmann/json
-	branch = master
diff --git a/third_party/json b/third_party/json
deleted file mode 160000
index bc889afb..00000000
--- a/third_party/json
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit bc889afb4c5bf1c0d8ee29ef35eaaf4c8bef8a5d

From 1e949dff6328d4a827379861a30e20535973a691 Mon Sep 17 00:00:00 2001
From: Suet-fei Li <suetfei@google.com>
Date: Wed, 12 Apr 2023 22:44:16 +0000
Subject: [PATCH 2/3] .

---
 .gitmodules           | 4 ++++
 third_party/json/json | 1 +
 2 files changed, 5 insertions(+)
 create mode 160000 third_party/json/json

diff --git a/.gitmodules b/.gitmodules
index c14bb9c5..2dcff02e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -33,3 +33,7 @@
 [submodule "third_party/mbedtls"]
 	path = third_party/mbedtls
 	url = https://github.com/ARMmbed/mbedtls
+[submodule "third_party/json/json"]
+	path = third_party/json/json
+	url = https://github.com/nlohmann/json
+	branch = master
diff --git a/third_party/json/json b/third_party/json/json
new file mode 160000
index 00000000..6af826d0
--- /dev/null
+++ b/third_party/json/json
@@ -0,0 +1 @@
+Subproject commit 6af826d0bdb55e4b69e3ad817576745335f243ca

From 760b64e2e7bcf5d21a126f159a6b79334ba00076 Mon Sep 17 00:00:00 2001
From: Suet-fei Li <suetfei@google.com>
Date: Wed, 12 Apr 2023 23:09:35 +0000
Subject: [PATCH 3/3] .

---
 Package.swift | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/Package.swift b/Package.swift
index 2e3de9c5..e2281732 100644
--- a/Package.swift
+++ b/Package.swift
@@ -246,23 +246,23 @@ let package = Package(
       name: "json",
       path: "third_party/json",
       exclude:[
-        "LICENSES",
-        "cmake",
-        "docs",
-        "single_include",
-        "tests",
-        "tools",
-        "CITATION.cff",
-        "CMakeLists.txt",
-        "ChangeLog.md",
-        "LICENSE.MIT",
-        "Makefile",
-        "README.md",
-        "meson.build",
-        "nlohmann_json.natvis",
-        "wsjcpp.yml",
+        "json/LICENSES",
+        "json/cmake",
+        "json/docs",
+        "json/single_include",
+        "json/tests",
+        "json/tools",
+        "json/CITATION.cff",
+        "json/CMakeLists.txt",
+        "json/ChangeLog.md",
+        "json/LICENSE.MIT",
+        "json/Makefile",
+        "json/README.md",
+        "json/meson.build",
+        "json/nlohmann_json.natvis",
+        "json/wsjcpp.yml",
       ],
-      publicHeadersPath: "include"
+      publicHeadersPath: "json/include"
     ),
     .target(
       name: "protobuf",