From 08c9007bb1d08acb22ce51bd380aa105e96060f1 Mon Sep 17 00:00:00 2001 From: Suet-fei Li Date: Tue, 11 Apr 2023 18:48:32 +0000 Subject: [PATCH 1/5] Add Json submodule --- .gitmodules | 3 +++ json | 1 + 2 files changed, 4 insertions(+) create mode 160000 json diff --git a/.gitmodules b/.gitmodules index c14bb9c5..5f24276d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -33,3 +33,6 @@ [submodule "third_party/mbedtls"] path = third_party/mbedtls url = https://github.com/ARMmbed/mbedtls +[submodule "json"] + path = json + url = https://github.com/nlohmann/json diff --git a/json b/json new file mode 160000 index 00000000..6af826d0 --- /dev/null +++ b/json @@ -0,0 +1 @@ +Subproject commit 6af826d0bdb55e4b69e3ad817576745335f243ca From 10d0285ac93157aaa6799e91376764bd8c2bf5b5 Mon Sep 17 00:00:00 2001 From: Suet-fei Li Date: Tue, 11 Apr 2023 19:18:30 +0000 Subject: [PATCH 2/5] . --- .gitmodules | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitmodules b/.gitmodules index 5f24276d..2840e8cf 100644 --- a/.gitmodules +++ b/.gitmodules @@ -36,3 +36,4 @@ [submodule "json"] path = json url = https://github.com/nlohmann/json + branch = v3.10.5 From 20bfbfef7b7892ec9a81079cb149a387919b26ed Mon Sep 17 00:00:00 2001 From: Suet-fei Li Date: Tue, 11 Apr 2023 19:19:21 +0000 Subject: [PATCH 3/5] remove json --- .gitmodules | 4 ---- json | 1 - 2 files changed, 5 deletions(-) delete mode 160000 json diff --git a/.gitmodules b/.gitmodules index 2840e8cf..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 "json"] - path = json - url = https://github.com/nlohmann/json - branch = v3.10.5 diff --git a/json b/json deleted file mode 160000 index 6af826d0..00000000 --- a/json +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 6af826d0bdb55e4b69e3ad817576745335f243ca From 2ecdb45e9d19fcfd4f45e97c91f0f572bfde4e8b Mon Sep 17 00:00:00 2001 From: Suet-fei Li Date: Tue, 11 Apr 2023 19:22:46 +0000 Subject: [PATCH 4/5] Add Json submodule --- .gitmodules | 3 +++ third_party/json | 1 + 2 files changed, 4 insertions(+) create mode 160000 third_party/json diff --git a/.gitmodules b/.gitmodules index c14bb9c5..039c8dc5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -33,3 +33,6 @@ [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 diff --git a/third_party/json b/third_party/json new file mode 160000 index 00000000..6af826d0 --- /dev/null +++ b/third_party/json @@ -0,0 +1 @@ +Subproject commit 6af826d0bdb55e4b69e3ad817576745335f243ca From 531c420b5e1f2844c40f9bff357cb2597c0419c5 Mon Sep 17 00:00:00 2001 From: Suet-fei Li Date: Tue, 11 Apr 2023 20:36:40 +0000 Subject: [PATCH 5/5] . --- .gitmodules | 1 + third_party/absl | 2 +- third_party/depot_tools | 2 +- third_party/google-toolbox-for-mac/google-toolbox-for-mac | 2 +- third_party/gtest | 2 +- third_party/json | 2 +- third_party/mbedtls | 2 +- third_party/protobuf | 2 +- 8 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.gitmodules b/.gitmodules index 039c8dc5..b3e42f81 100644 --- a/.gitmodules +++ b/.gitmodules @@ -36,3 +36,4 @@ [submodule "third_party/json"] path = third_party/json url = https://github.com/nlohmann/json + branch = master diff --git a/third_party/absl b/third_party/absl index 9336be04..29273402 160000 --- a/third_party/absl +++ b/third_party/absl @@ -1 +1 @@ -Subproject commit 9336be04a242237cd41a525bedfcf3be1bb55377 +Subproject commit 2927340217c37328319b5869285a6dcdbc13e7a7 diff --git a/third_party/depot_tools b/third_party/depot_tools index e1197f06..95a28c5a 160000 --- a/third_party/depot_tools +++ b/third_party/depot_tools @@ -1 +1 @@ -Subproject commit e1197f06a8f45c0328d341b30e337d3a4b609716 +Subproject commit 95a28c5a14cf0c7040794e10e9404b270784010c diff --git a/third_party/google-toolbox-for-mac/google-toolbox-for-mac b/third_party/google-toolbox-for-mac/google-toolbox-for-mac index 33941504..1b2da5e6 160000 --- a/third_party/google-toolbox-for-mac/google-toolbox-for-mac +++ b/third_party/google-toolbox-for-mac/google-toolbox-for-mac @@ -1 +1 @@ -Subproject commit 339415048005a9eba957357a02459a977a2e3007 +Subproject commit 1b2da5e6e6b5edb1fa1427cc77e23f04069c04ad diff --git a/third_party/gtest b/third_party/gtest index d61d4d8e..8fa9461c 160000 --- a/third_party/gtest +++ b/third_party/gtest @@ -1 +1 @@ -Subproject commit d61d4d8e64c08a662055e82904bbf90e108a704f +Subproject commit 8fa9461cc28e053d66f17132808d287ae51575e2 diff --git a/third_party/json b/third_party/json index 6af826d0..bc889afb 160000 --- a/third_party/json +++ b/third_party/json @@ -1 +1 @@ -Subproject commit 6af826d0bdb55e4b69e3ad817576745335f243ca +Subproject commit bc889afb4c5bf1c0d8ee29ef35eaaf4c8bef8a5d diff --git a/third_party/mbedtls b/third_party/mbedtls index 3e0418fe..6a327a5f 160000 --- a/third_party/mbedtls +++ b/third_party/mbedtls @@ -1 +1 @@ -Subproject commit 3e0418fe502b2a2194e118d362efdfc0e558be73 +Subproject commit 6a327a5fdc2786cb50b4dbe5e3a75884a1f8435a diff --git a/third_party/protobuf b/third_party/protobuf index 4812107b..53515ead 160000 --- a/third_party/protobuf +++ b/third_party/protobuf @@ -1 +1 @@ -Subproject commit 4812107b9d0fb9fdcca933766c237c38f2150379 +Subproject commit 53515eadce8d732bc0b2d0f0c8ec20ddd55ef86b