пре 8 година · 024976cda2
--- a/ArduinoJson.h
+++ b/ArduinoJson.h
@@ -5,4 +5,4 @@
 
				 // https://bblanchon.github.io/ArduinoJson/
			
 
				 // If you like this project, please add a star!
			
 
				 
			
 
				-#include "include/ArduinoJson.h"
			
 
				+#include "src/ArduinoJson.h"
			
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ HEAD
 
				 * Added `JsonArray::remove(iterator)` (issue #479)

			
 
				 * Added `JsonObject::remove(iterator)`

			
 
				 * Renamed `JsonArray::removeAt(size_t)` into `remove(size_t)`

			
 
				+* Renamed folder `include/` to `src/`

			
 
				 

			
 
				 v5.8.4

			
 
				 ------

			
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,5 +14,6 @@ if(${COVERAGE})
 
				 	set(CMAKE_CXX_FLAGS "-g -O0 -fprofile-arcs -ftest-coverage")
			
 
				 endif()
			
 
				 
			
 
				+include_directories(${CMAKE_CURRENT_LIST_DIR}/src)
			
 
				 add_subdirectory(third-party/catch)
			
 
				 add_subdirectory(test)
			
--- a/fuzzing/Makefile
+++ b/fuzzing/Makefile
@@ -1,13 +1,13 @@
 
				 # CAUTION: this file is invoked by https://github.com/google/oss-fuzz
			
 
				 
			
 
				-CXXFLAGS += -I../include
			
 
				+CXXFLAGS += -I../src
			
 
				 
			
 
				 all: \
			
 
				 	$(OUT)/json_fuzzer \
			
 
				 	$(OUT)/json_fuzzer_seed_corpus.zip \
			
 
				 	$(OUT)/json_fuzzer.options
			
 
				 
			
 
				-$(OUT)/json_fuzzer: fuzzer.cpp $(shell find ../include -type f)
			
 
				+$(OUT)/json_fuzzer: fuzzer.cpp $(shell find ../src -type f)
			
 
				 	$(CXX) $(CXXFLAGS) $< -o$@ $(LIB_FUZZING_ENGINE)
			
 
				 
			
 
				 $(OUT)/json_fuzzer_seed_corpus.zip: seed_corpus/*
			
--- a/library.json
+++ b/library.json
@@ -13,7 +13,6 @@
 
				   },
			
 
				   "exclude": [
			
 
				     "scripts",
			
 
				-    "src/ArduinoJson.h",
			
 
				     "test",
			
 
				     "third-party"
			
 
				   ],
			
--- a/scripts/build-arduino-package.sh
+++ b/scripts/build-arduino-package.sh
@@ -12,7 +12,7 @@ rm -f $OUTPUT
 
				 7z a $OUTPUT \
			
 
				 	ArduinoJson/CHANGELOG.md \
			
 
				 	ArduinoJson/examples \
			
 
				-	ArduinoJson/include \
			
 
				+	ArduinoJson/src \
			
 
				 	ArduinoJson/keywords.txt \
			
 
				 	ArduinoJson/library.properties \
			
 
				 	ArduinoJson/LICENSE.md \
			
--- a/scripts/build-single-header.sh
+++ b/scripts/build-single-header.sh
@@ -39,6 +39,6 @@ process()
 
				 
			
 
				 cd $(dirname $0)/../
			
 
				 INCLUDED=()
			
 
				-process include/ArduinoJson.h true > ../ArduinoJson-$TAG.h
			
 
				+process src/ArduinoJson.h true > ../ArduinoJson-$TAG.h
			
 
				 INCLUDED=()
			
 
				-process include/ArduinoJson.hpp true > ../ArduinoJson-$TAG.hpp
			
 
				+process src/ArduinoJson.hpp true > ../ArduinoJson-$TAG.hpp
			
--- a/include/ArduinoJson.h
+++ b/include/ArduinoJson.h
--- a/include/ArduinoJson.hpp
+++ b/include/ArduinoJson.hpp
--- a/include/ArduinoJson/Configuration.hpp
+++ b/include/ArduinoJson/Configuration.hpp
--- a/include/ArduinoJson/Data/Encoding.hpp
+++ b/include/ArduinoJson/Data/Encoding.hpp
--- a/include/ArduinoJson/Data/JsonBufferAllocated.hpp
+++ b/include/ArduinoJson/Data/JsonBufferAllocated.hpp
--- a/include/ArduinoJson/Data/JsonFloat.hpp
+++ b/include/ArduinoJson/Data/JsonFloat.hpp
--- a/include/ArduinoJson/Data/JsonInteger.hpp
+++ b/include/ArduinoJson/Data/JsonInteger.hpp
--- a/include/ArduinoJson/Data/JsonVariantAs.hpp
+++ b/include/ArduinoJson/Data/JsonVariantAs.hpp
--- a/include/ArduinoJson/Data/JsonVariantComparer.hpp
+++ b/include/ArduinoJson/Data/JsonVariantComparer.hpp
--- a/include/ArduinoJson/Data/JsonVariantContent.hpp
+++ b/include/ArduinoJson/Data/JsonVariantContent.hpp
--- a/include/ArduinoJson/Data/JsonVariantDefault.hpp
+++ b/include/ArduinoJson/Data/JsonVariantDefault.hpp
--- a/include/ArduinoJson/Data/JsonVariantType.hpp
+++ b/include/ArduinoJson/Data/JsonVariantType.hpp
--- a/include/ArduinoJson/Data/List.hpp
+++ b/include/ArduinoJson/Data/List.hpp
--- a/include/ArduinoJson/Data/ListConstIterator.hpp
+++ b/include/ArduinoJson/Data/ListConstIterator.hpp
--- a/include/ArduinoJson/Data/ListIterator.hpp
+++ b/include/ArduinoJson/Data/ListIterator.hpp
--- a/include/ArduinoJson/Data/ListNode.hpp
+++ b/include/ArduinoJson/Data/ListNode.hpp
--- a/include/ArduinoJson/Data/ReferenceType.hpp
+++ b/include/ArduinoJson/Data/ReferenceType.hpp
--- a/include/ArduinoJson/Data/ValueSetter.hpp
+++ b/include/ArduinoJson/Data/ValueSetter.hpp
--- a/include/ArduinoJson/Deserialization/Comments.hpp
+++ b/include/ArduinoJson/Deserialization/Comments.hpp
--- a/include/ArduinoJson/Deserialization/JsonParser.hpp
+++ b/include/ArduinoJson/Deserialization/JsonParser.hpp
--- a/include/ArduinoJson/Deserialization/JsonParserImpl.hpp
+++ b/include/ArduinoJson/Deserialization/JsonParserImpl.hpp
--- a/include/ArduinoJson/Deserialization/StringWriter.hpp
+++ b/include/ArduinoJson/Deserialization/StringWriter.hpp
--- a/include/ArduinoJson/DynamicJsonBuffer.hpp
+++ b/include/ArduinoJson/DynamicJsonBuffer.hpp
--- a/include/ArduinoJson/JsonArray.hpp
+++ b/include/ArduinoJson/JsonArray.hpp
--- a/include/ArduinoJson/JsonArrayImpl.hpp
+++ b/include/ArduinoJson/JsonArrayImpl.hpp
--- a/include/ArduinoJson/JsonArraySubscript.hpp
+++ b/include/ArduinoJson/JsonArraySubscript.hpp
--- a/include/ArduinoJson/JsonBuffer.hpp
+++ b/include/ArduinoJson/JsonBuffer.hpp
--- a/include/ArduinoJson/JsonBufferBase.hpp
+++ b/include/ArduinoJson/JsonBufferBase.hpp
--- a/include/ArduinoJson/JsonBufferImpl.hpp
+++ b/include/ArduinoJson/JsonBufferImpl.hpp
--- a/include/ArduinoJson/JsonObject.hpp
+++ b/include/ArduinoJson/JsonObject.hpp
--- a/include/ArduinoJson/JsonObjectImpl.hpp
+++ b/include/ArduinoJson/JsonObjectImpl.hpp
--- a/include/ArduinoJson/JsonObjectSubscript.hpp
+++ b/include/ArduinoJson/JsonObjectSubscript.hpp
--- a/include/ArduinoJson/JsonPair.hpp
+++ b/include/ArduinoJson/JsonPair.hpp
--- a/include/ArduinoJson/JsonVariant.hpp
+++ b/include/ArduinoJson/JsonVariant.hpp
--- a/include/ArduinoJson/JsonVariantBase.hpp
+++ b/include/ArduinoJson/JsonVariantBase.hpp
--- a/include/ArduinoJson/JsonVariantComparisons.hpp
+++ b/include/ArduinoJson/JsonVariantComparisons.hpp
--- a/include/ArduinoJson/JsonVariantImpl.hpp
+++ b/include/ArduinoJson/JsonVariantImpl.hpp
--- a/include/ArduinoJson/Polyfills/attributes.hpp
+++ b/include/ArduinoJson/Polyfills/attributes.hpp
--- a/include/ArduinoJson/Polyfills/ctype.hpp
+++ b/include/ArduinoJson/Polyfills/ctype.hpp
--- a/include/ArduinoJson/Polyfills/isFloat.hpp
+++ b/include/ArduinoJson/Polyfills/isFloat.hpp
--- a/include/ArduinoJson/Polyfills/isInteger.hpp
+++ b/include/ArduinoJson/Polyfills/isInteger.hpp
--- a/include/ArduinoJson/Polyfills/math.hpp
+++ b/include/ArduinoJson/Polyfills/math.hpp
--- a/include/ArduinoJson/Polyfills/normalize.hpp
+++ b/include/ArduinoJson/Polyfills/normalize.hpp
--- a/include/ArduinoJson/Polyfills/parseFloat.hpp
+++ b/include/ArduinoJson/Polyfills/parseFloat.hpp
--- a/include/ArduinoJson/Polyfills/parseInteger.hpp
+++ b/include/ArduinoJson/Polyfills/parseInteger.hpp
--- a/include/ArduinoJson/Print.hpp
+++ b/include/ArduinoJson/Print.hpp
--- a/include/ArduinoJson/RawJson.hpp
+++ b/include/ArduinoJson/RawJson.hpp
--- a/include/ArduinoJson/Serialization/DummyPrint.hpp
+++ b/include/ArduinoJson/Serialization/DummyPrint.hpp
--- a/include/ArduinoJson/Serialization/DynamicStringBuilder.hpp
+++ b/include/ArduinoJson/Serialization/DynamicStringBuilder.hpp
--- a/include/ArduinoJson/Serialization/IndentedPrint.hpp
+++ b/include/ArduinoJson/Serialization/IndentedPrint.hpp
--- a/include/ArduinoJson/Serialization/JsonPrintable.hpp
+++ b/include/ArduinoJson/Serialization/JsonPrintable.hpp
--- a/include/ArduinoJson/Serialization/JsonSerializer.hpp
+++ b/include/ArduinoJson/Serialization/JsonSerializer.hpp
--- a/include/ArduinoJson/Serialization/JsonSerializerImpl.hpp
+++ b/include/ArduinoJson/Serialization/JsonSerializerImpl.hpp
--- a/include/ArduinoJson/Serialization/JsonWriter.hpp
+++ b/include/ArduinoJson/Serialization/JsonWriter.hpp
--- a/include/ArduinoJson/Serialization/Prettyfier.hpp
+++ b/include/ArduinoJson/Serialization/Prettyfier.hpp
--- a/include/ArduinoJson/Serialization/StaticStringBuilder.hpp
+++ b/include/ArduinoJson/Serialization/StaticStringBuilder.hpp
--- a/include/ArduinoJson/Serialization/StreamPrintAdapter.hpp
+++ b/include/ArduinoJson/Serialization/StreamPrintAdapter.hpp
--- a/include/ArduinoJson/StaticJsonBuffer.hpp
+++ b/include/ArduinoJson/StaticJsonBuffer.hpp
--- a/include/ArduinoJson/StringTraits/ArduinoStream.hpp
+++ b/include/ArduinoJson/StringTraits/ArduinoStream.hpp
--- a/include/ArduinoJson/StringTraits/CharPointer.hpp
+++ b/include/ArduinoJson/StringTraits/CharPointer.hpp
--- a/include/ArduinoJson/StringTraits/FlashString.hpp
+++ b/include/ArduinoJson/StringTraits/FlashString.hpp
--- a/include/ArduinoJson/StringTraits/StdStream.hpp
+++ b/include/ArduinoJson/StringTraits/StdStream.hpp
--- a/include/ArduinoJson/StringTraits/StdString.hpp
+++ b/include/ArduinoJson/StringTraits/StdString.hpp
--- a/include/ArduinoJson/StringTraits/StringTraits.hpp
+++ b/include/ArduinoJson/StringTraits/StringTraits.hpp
--- a/include/ArduinoJson/TypeTraits/EnableIf.hpp
+++ b/include/ArduinoJson/TypeTraits/EnableIf.hpp
--- a/include/ArduinoJson/TypeTraits/FloatTraits.hpp
+++ b/include/ArduinoJson/TypeTraits/FloatTraits.hpp
--- a/include/ArduinoJson/TypeTraits/IsArray.hpp
+++ b/include/ArduinoJson/TypeTraits/IsArray.hpp
--- a/include/ArduinoJson/TypeTraits/IsBaseOf.hpp
+++ b/include/ArduinoJson/TypeTraits/IsBaseOf.hpp
--- a/include/ArduinoJson/TypeTraits/IsChar.hpp
+++ b/include/ArduinoJson/TypeTraits/IsChar.hpp
--- a/include/ArduinoJson/TypeTraits/IsConst.hpp
+++ b/include/ArduinoJson/TypeTraits/IsConst.hpp
--- a/include/ArduinoJson/TypeTraits/IsFloatingPoint.hpp
+++ b/include/ArduinoJson/TypeTraits/IsFloatingPoint.hpp
--- a/include/ArduinoJson/TypeTraits/IsIntegral.hpp
+++ b/include/ArduinoJson/TypeTraits/IsIntegral.hpp
--- a/include/ArduinoJson/TypeTraits/IsSame.hpp
+++ b/include/ArduinoJson/TypeTraits/IsSame.hpp
--- a/include/ArduinoJson/TypeTraits/IsSignedIntegral.hpp
+++ b/include/ArduinoJson/TypeTraits/IsSignedIntegral.hpp
--- a/include/ArduinoJson/TypeTraits/IsUnsignedIntegral.hpp
+++ b/include/ArduinoJson/TypeTraits/IsUnsignedIntegral.hpp
--- a/include/ArduinoJson/TypeTraits/RemoveConst.hpp
+++ b/include/ArduinoJson/TypeTraits/RemoveConst.hpp
--- a/include/ArduinoJson/TypeTraits/RemoveReference.hpp
+++ b/include/ArduinoJson/TypeTraits/RemoveReference.hpp
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -60,8 +60,6 @@ if(MSVC)
 
				 	)
			
 
				 endif()
			
 
				 
			
 
				-include_directories(${CMAKE_CURRENT_LIST_DIR}/../include)
			
 
				-
			
 
				 add_subdirectory(DynamicJsonBuffer)
			
 
				 add_subdirectory(IntegrationTests)
			
 
				 add_subdirectory(JsonArray)