Skip to content

Commit f674694

Browse files
proppyproppy
committed
Merge pull request FirebaseExtended#115 from proppy/bump-arduino-json-5.3
Bump arduino json 5.3
2 parents e643dcb + ce1bd8f commit f674694

File tree

85 files changed

+582
-753
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+582
-753
lines changed

‎.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ install:
2323
- ( cd ${ARDUINO_ESP8266_ROOT}/tools && python get.py )
2424
before_script:
2525
- mkdir -p ${ARDUINO_HOME}/libraries
26-
- ( cd ${ARDUINO_HOME}/libraries && ln -s ${TRAVIS_BUILD_DIR} firebase-arduino && ln -s ${TRAVIS_BUILD_DIR}/src/third-party/arduino-json-5.2 ArduinoJson && ln -s ${HOME}/SoftwareSerial ./ && ln -s ${HOME}/Adafruit_NeoPixel ./ && ln -s ${HOME}/Adafruit-GFX-Library ./ && ln -s ${HOME}/Adafruit_SSD1306 ./)
26+
- ( cd ${ARDUINO_HOME}/libraries && ln -s ${TRAVIS_BUILD_DIR} firebase-arduino && ln -s ${TRAVIS_BUILD_DIR}/src/third-party/arduino-json-5.3 ArduinoJson && ln -s ${HOME}/SoftwareSerial ./ && ln -s ${HOME}/Adafruit_NeoPixel ./ && ln -s ${HOME}/Adafruit-GFX-Library ./ && ln -s ${HOME}/Adafruit_SSD1306 ./)
2727
script:
2828
- ${ARDUINO_ROOT}/arduino-builder -verbose -hardware ${ARDUINO_ROOT}/hardware/ -tools ${ARDUINO_ESP8266_ROOT}/tools/ -tools ${ARDUINO_ROOT}/tools-builder/ -fqbn esp8266com:esp8266:nodemcuv2 -libraries ${ARDUINO_HOME}/libraries/ -prefs build.flash_ld=${ARDUINO_ESP8266_ROOT}/tools/sdk/ld/eagle.flash.4m.ld -prefs build.flash_freq=40 -prefs build.flash_size=4M examples/FirebaseDemo_ESP8266/FirebaseDemo_ESP8266.ino
2929
- ${ARDUINO_ROOT}/arduino-builder -verbose -hardware ${ARDUINO_ROOT}/hardware/ -tools ${ARDUINO_ESP8266_ROOT}/tools/ -tools ${ARDUINO_ROOT}/tools-builder/ -fqbn esp8266com:esp8266:nodemcuv2 -libraries ${ARDUINO_HOME}/libraries/ -prefs build.flash_ld=${ARDUINO_ESP8266_ROOT}/tools/sdk/ld/eagle.flash.4m.ld -prefs build.flash_freq=40 -prefs build.flash_size=4M examples/FirebaseSerialHost_ESP8266/FirebaseSerialHost_ESP8266.ino

‎src/Firebase.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
// TODO(edcoyne): move this into our mock_arduino fork where we actually do the
2727
// override.
2828
#define ARDUINO_STRING_OVERRIDE
29-
#include "third-party/arduino-json-5.2/include/ArduinoJson.h"
29+
#include "third-party/arduino-json-5.3/include/ArduinoJson.h"
3030

3131
class FirebaseGet;
3232
class FirebaseSet;

‎src/FirebaseObject.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#ifndef FIREBASE_OBJECT_H
1818
#define FIREBASE_OBJECT_H
1919

20-
#include "third-party/arduino-json-5.2/include/ArduinoJson.h"
20+
#include "third-party/arduino-json-5.3/include/ArduinoJson.h"
2121

2222
#define FIREBASE_JSONBUFFER_SIZE 200
2323

‎src/third-party/arduino-json-5.2/examples/IndentedPrintExample/IndentedPrintExample.ino

Lines changed: 0 additions & 35 deletions
This file was deleted.

‎src/third-party/arduino-json-5.2/examples/JsonGeneratorExample/JsonGeneratorExample.ino

Lines changed: 0 additions & 70 deletions
This file was deleted.

‎src/third-party/arduino-json-5.2/examples/JsonHttpClient/JsonHttpClient.ino

Lines changed: 0 additions & 195 deletions
This file was deleted.

‎src/third-party/arduino-json-5.2/examples/JsonParserExample/JsonParserExample.ino

Lines changed: 0 additions & 67 deletions
This file was deleted.

0 commit comments

Comments
 (0)