Fix up includes to nlohmann json

Dockerfile

@@ -73,7 +73,7 @@ RUN \
     cmake -H. -Bbuild -GNinja -DCMAKE_BUILD_TYPE=Release && \
     cmake --build build --target install && \
     # json.hpp
-    curl -L https://github.com/nlohmann/json/releases/download/v3.2.0/json.hpp -o /usr/local/include/json.hpp && \
+    curl -L https://github.com/nlohmann/json/releases/download/v3.2.0/json.hpp -o /usr/local/include/nlohmann/json.hpp && \
     rm -rf /build/* && \
     rm -rf /var/lib/apt/lists/* && \
     apt-get clean && \

deps/CMakeLists.txt

@@ -53,7 +53,7 @@ set(JSON_HEADER_URL
 set(JSON_HEADER_HASH
     ce6b5610a051ec6795fa11c33854abebb086f0fd67c311f5921c3c07f9531b44)
 
-file(DOWNLOAD ${JSON_HEADER_URL} ${DEPS_INSTALL_DIR}/include/json.hpp
+file(DOWNLOAD ${JSON_HEADER_URL} ${DEPS_INSTALL_DIR}/include/nlohmann/json.hpp
      EXPECTED_HASH SHA256=${JSON_HEADER_HASH})
 
 if(USE_BUNDLED_BOOST)

examples/crypto_bot.cpp

@@ -11,7 +11,7 @@
 #include <atomic>
 #include <fstream>
 #include <iostream>
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 #include <stdexcept>
 #include <unistd.h>
 

examples/simple_bot.cpp

@@ -3,7 +3,7 @@
 #include <boost/variant.hpp>
 
 #include <iostream>
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 #include <unistd.h>
 
 #include <mtx.hpp>

include/mtx/common.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 
 #include <map>
 #include <string>

include/mtx/errors.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 #include <string>
 
 using json = nlohmann::json;

include/mtx/events.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 
 #include <iostream>
 

include/mtx/events/aliases.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 

include/mtx/events/avatar.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 

include/mtx/events/canonical_alias.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 

include/mtx/events/common.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 

include/mtx/events/create.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 

include/mtx/events/encrypted.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 
 #include "mtx/events.hpp"
 

include/mtx/events/encryption.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 

include/mtx/events/guest_access.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 #include <string>
 
 using json = nlohmann::json;

include/mtx/events/history_visibility.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 #include <string>
 
 using json = nlohmann::json;

include/mtx/events/join_rules.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 #include <string>
 
 using json = nlohmann::json;

include/mtx/events/member.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 #include <string>
 
 using json = nlohmann::json;

include/mtx/events/messages/audio.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 #include <string>
 
 #include "mtx/events/common.hpp"

include/mtx/events/messages/emote.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 #include <string>
 
 using json = nlohmann::json;

include/mtx/events/messages/file.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 #include <string>
 
 #include "mtx/events/common.hpp"

include/mtx/events/messages/image.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 #include <string>
 
 #include "mtx/events/common.hpp"

include/mtx/events/messages/notice.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 #include <string>
 
 using json = nlohmann::json;

include/mtx/events/messages/text.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 #include <string>
 
 using json = nlohmann::json;

include/mtx/events/messages/video.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 #include <string>
 
 #include "mtx/events/common.hpp"

include/mtx/events/name.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 #include <string>
 
 using json = nlohmann::json;

include/mtx/events/pinned_events.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 #include <string>
 
 using json = nlohmann::json;

include/mtx/events/power_levels.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 #include <string>
 
 using json = nlohmann::json;

include/mtx/events/redaction.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 #include <string>
 
 using json = nlohmann::json;

include/mtx/events/tag.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 #include <string>
 
 using json = nlohmann::json;

include/mtx/events/topic.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 #include <string>
 
 using json = nlohmann::json;

include/mtx/identifiers.hpp

@@ -3,7 +3,7 @@
 #include <exception>
 #include <iostream>
 
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 
 namespace mtx {
 namespace identifiers {

include/mtx/requests.hpp

@@ -2,7 +2,7 @@
 
 #include <string>
 
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 #include <mtx/common.hpp>
 
 using json = nlohmann::json;

include/mtx/responses/common.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 
 #include <string>
 #include <vector>

include/mtx/responses/create_room.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 
 namespace mtx {
 namespace responses {

include/mtx/responses/crypto.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 
 #include "mtx/common.hpp"
 

include/mtx/responses/empty.hpp

@@ -2,7 +2,7 @@
 
 #include <string>
 
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 
 #include "mtx/identifiers.hpp"
 

include/mtx/responses/groups.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 namespace mtx {
 namespace responses {

include/mtx/responses/login.hpp

@@ -2,7 +2,7 @@
 
 #include <string>
 
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 
 #include "mtx/identifiers.hpp"
 

include/mtx/responses/media.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 #include <string>
 
 namespace mtx {

include/mtx/responses/messages.hpp

@@ -2,7 +2,7 @@
 
 #include <string>
 
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 
 #include "mtx/events/collections.hpp"
 

include/mtx/responses/notifications.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 
 #include "mtx/events/collections.hpp"
 

include/mtx/responses/profile.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 
 namespace mtx {
 namespace responses {

include/mtx/responses/register.hpp

@@ -2,7 +2,7 @@
 
 #include <string>
 
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 
 #include "mtx/identifiers.hpp"
 

include/mtx/responses/sync.hpp

@@ -7,7 +7,7 @@
 #include "mtx/events.hpp"
 #include "mtx/events/collections.hpp"
 #include "mtx/identifiers.hpp"
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 

include/mtx/responses/version.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 
 namespace mtx {
 namespace responses {

include/mtxclient/crypto/client.hpp

@@ -4,7 +4,7 @@
 #include <memory>
 #include <new>
 
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 #include <sodium.h>
 
 #include <mtx/identifiers.hpp>

include/mtxclient/crypto/types.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "mtxclient/utils.hpp"
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 
 STRONG_TYPE(UserId, std::string)
 STRONG_TYPE(DeviceId, std::string)