Fix compatibility with the Blynk libary (fixes #1914)

Ported from 52d8a65cbc

extras/scripts/publish.sh

@@ -46,6 +46,7 @@ update_version_in_source () {
 		-e "s/ARDUINOJSON_VERSION_MAJOR .*$/ARDUINOJSON_VERSION_MAJOR $MAJOR/" \
 		-e "s/ARDUINOJSON_VERSION_MINOR .*$/ARDUINOJSON_VERSION_MINOR $MINOR/" \
 		-e "s/ARDUINOJSON_VERSION_REVISION .*$/ARDUINOJSON_VERSION_REVISION $REVISION/" \
+		-e "s/ARDUINOJSON_VERSION_MACRO .*$/ARDUINOJSON_VERSION_MACRO V$MAJOR$MINOR$REVISION/" \
 		src/ArduinoJson/version.hpp
 	rm src/ArduinoJson/version.hpp*~
 }

extras/tests/Misc/conflicts.cpp

@@ -55,5 +55,8 @@
 // issue #1905
 #define _current
 
+// issue #1914
+#define V7 7
+
 // catch.hpp mutes several warnings, this file also allows to detect them
 #include "ArduinoJson.h"