Merge branch '4.0'

Conflicts: JsonGenerator.cpp JsonGenerator.h JsonGenerator/EscapedString.cpp JsonGenerator/EscapedString.h JsonGenerator/IndentedPrint.cpp JsonGenerator/IndentedPrint.h JsonGenerator/JsonArray.h JsonGenerator/JsonArrayBase.cpp JsonGenerator/JsonArrayBase.h JsonGenerator/JsonObject.h JsonGenerator/JsonObjectBase.cpp JsonGenerator/JsonObjectBase.h JsonGenerator/JsonPrettyPrint.cpp JsonGenerator/JsonPrettyPrint.h JsonGenerator/JsonPrintable.cpp JsonGenerator/JsonPrintable.h JsonGenerator/JsonValue.cpp JsonGenerator/JsonValue.h JsonGenerator/Print.cpp JsonGenerator/Print.h JsonGenerator/Printable.h JsonGenerator/StringBuilder.cpp JsonGenerator/StringBuilder.h JsonGeneratorTests/EscapedStringTests.cpp JsonGeneratorTests/Issue10.cpp JsonGeneratorTests/JsonArrayTests.cpp JsonGeneratorTests/JsonObject_Indexer_Tests.cpp JsonGeneratorTests/JsonObject_PrintTo_Tests.cpp JsonGeneratorTests/JsonValue_Cast_Tests.cpp JsonGeneratorTests/JsonValue_PrintTo_Tests.cpp JsonGeneratorTests/PrettyPrint_Array_Tests.cpp JsonGeneratorTests/PrettyPrint_Object_Tests.cpp JsonGeneratorTests/PrettyPrint_String_Tests.cpp JsonGeneratorTests/StringBuilderTests.cpp JsonParser.cpp JsonParser.h JsonParser/JsonArray.cpp JsonParser/JsonArray.h JsonParser/JsonArrayIterator.h JsonParser/JsonObject.cpp JsonParser/JsonObject.h JsonParser/JsonObjectIterator.h JsonParser/JsonPair.h JsonParser/JsonParser.h JsonParser/JsonParserBase.cpp JsonParser/JsonParserBase.h JsonParser/JsonToken.cpp JsonParser/JsonToken.h JsonParser/JsonValue.cpp JsonParser/JsonValue.h JsonParser/README.md JsonParserTests/GbathreeBug.cpp JsonParserTests/JsonArrayIteratorTests.cpp JsonParserTests/JsonArrayTests.cpp JsonParserTests/JsonObjectIteratorTests.cpp JsonParserTests/JsonObjectTests.cpp JsonParserTests/JsonStringTests.cpp JsonParserTests/TestHashGenerator.cpp README.md library.json
bblanchon · Nov 29, 2014 · 348357e · 348357e
2 parents 3dc533f + 69f6967
commit 348357e
Show file tree

Hide file tree

Showing 346 changed files with 150,151 additions and 5,519 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,5 @@
-*.sdf
-*.user
-*.suo
-Debug
-ipch
-*.opensdf
+.DS_Store
+/.idea
+/build
+/bin
+/lib
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,6 @@
+language: c++
+compiler:
+  - gcc
+  - clang
+before_script: cmake .
+script: make && make test
diff --git a/ArduinoJson.sln b/ArduinoJson.sln
diff --git a/BuildArduinoPackage.sh b/BuildArduinoPackage.sh
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,15 @@
 Arduino JSON: change log
 ========================
 
+v4.0
+----
+
+* Unified parser and generator API (issue #23)
+* Updated library layout, now requires Arduino 1.0.6 or newer
+
+**BREAKING CHANGE**: API changed significantly, see `doc/Migrating to the new API.md`.
+
+
 v3.4
 ----
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -0,0 +1,15 @@
+cmake_minimum_required(VERSION 2.8.4)
+project(ArduinoJson)
+
+enable_testing()
+
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/lib)
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/lib)
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin)
+
+if(MSVC)
+	add_definitions(-D_CRT_SECURE_NO_WARNINGS -W4)
+endif()
+
+add_subdirectory(src)
+add_subdirectory(test)
diff --git a/FixEndOfFile.sh b/FixEndOfFile.sh
diff --git a/JsonGenerator.cpp b/JsonGenerator.cpp
diff --git a/JsonGenerator.h b/JsonGenerator.h
diff --git a/JsonGenerator/EscapedString.cpp b/JsonGenerator/EscapedString.cpp
diff --git a/JsonGenerator/EscapedString.h b/JsonGenerator/EscapedString.h
diff --git a/JsonGenerator/IndentedPrint.cpp b/JsonGenerator/IndentedPrint.cpp
diff --git a/JsonGenerator/IndentedPrint.h b/JsonGenerator/IndentedPrint.h
diff --git a/JsonGenerator/JsonArray.h b/JsonGenerator/JsonArray.h
diff --git a/JsonGenerator/JsonArrayBase.cpp b/JsonGenerator/JsonArrayBase.cpp