Skip to content

Commit c57e6f3

Browse files
ivankravetsbblanchon
authored andcommitted
Made the library compatible with platform.io (issue bblanchon#181)
1 parent b54f1ff commit c57e6f3

File tree

5 files changed

+46
-6
lines changed

5 files changed

+46
-6
lines changed

.travis.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,15 @@
11
sudo: false
22
language: cpp
3+
cache:
4+
directories:
5+
- "~/.platformio"
36
env:
47
- COMPILER=gcc
58
- COMPILER=clang
69
- COMPILER=arduino VERSION=1.5.8 BOARD=arduino:avr:uno
710
- COMPILER=arduino VERSION=1.6.7 BOARD=arduino:avr:uno
11+
- COMPILER=platformio BOARD=uno
12+
- COMPILER=platformio BOARD=due
13+
- COMPILER=platformio BOARD=esp01
14+
- COMPILER=platformio BOARD=teensy31
815
script: scripts/travis/$COMPILER.sh

ArduinoJson.h

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
// Copyright Benoit Blanchon 2014-2015
2+
// MIT License
3+
//
4+
// Arduino JSON library
5+
// https://github.com/bblanchon/ArduinoJson
6+
7+
// About this file
8+
// ---------------
9+
// This file is here to please the platform.io compile. It must be present in
10+
// the root for the IDE to find it. Feel free to ignore this file if your
11+
// working in another environment.
12+
// ...and yes this is driving me crazy!
13+
14+
#include "include/ArduinoJson.h"

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
ArduinoJson: change log
22
=======================
33

4+
HEAD
5+
----
6+
7+
* Made the library compatible with platform.io (issue #181)
8+
49
v5.0.7
510
------
611

library.json

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,20 @@
22
"name": "Json",
33
"keywords": "json, rest, http, web",
44
"description": "An elegant and efficient JSON library for embedded systems",
5-
"repository":
6-
{
5+
"repository": {
76
"type": "git",
87
"url": "https://github.com/bblanchon/ArduinoJson.git"
98
},
10-
"authors":
11-
{
9+
"authors": {
1210
"name": "Benoit Blanchon",
1311
"url": "http://blog.benoitblanchon.fr"
1412
},
13+
"exclude": [
14+
"scripts",
15+
"src/ArduinoJson.h",
16+
"test",
17+
"third-party"
18+
],
1519
"frameworks": "arduino",
16-
"platforms": "atmelavr"
17-
}
20+
"platforms": "*"
21+
}

scripts/travis/platformio.sh

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
#!/bin/sh -eux
2+
3+
pip install --user platformio
4+
5+
rm -r test
6+
7+
for EXAMPLE in JsonParserExample JsonGeneratorExample
8+
do
9+
platformio ci examples/$EXAMPLE/$EXAMPLE.ino -l '.' -b $BOARD
10+
done

0 commit comments

Comments
 (0)