Skip to content

Commit

Permalink
Made the library compatible with platform.io (issue bblanchon#181)
Browse files Browse the repository at this point in the history
  • Loading branch information
ivankravets authored and bblanchon committed Dec 22, 2015
1 parent b54f1ff commit c57e6f3
Show file tree
Hide file tree
Showing 5 changed files with 46 additions and 6 deletions.
7 changes: 7 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,15 @@
sudo: false
language: cpp
cache:
directories:
- "~/.platformio"
env:
- COMPILER=gcc
- COMPILER=clang
- COMPILER=arduino VERSION=1.5.8 BOARD=arduino:avr:uno
- COMPILER=arduino VERSION=1.6.7 BOARD=arduino:avr:uno
- COMPILER=platformio BOARD=uno
- COMPILER=platformio BOARD=due
- COMPILER=platformio BOARD=esp01
- COMPILER=platformio BOARD=teensy31
script: scripts/travis/$COMPILER.sh
14 changes: 14 additions & 0 deletions ArduinoJson.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
// Copyright Benoit Blanchon 2014-2015
// MIT License
//
// Arduino JSON library
// https://github.com/bblanchon/ArduinoJson

// About this file
// ---------------
// This file is here to please the platform.io compile. It must be present in
// the root for the IDE to find it. Feel free to ignore this file if your
// working in another environment.
// ...and yes this is driving me crazy!

#include "include/ArduinoJson.h"
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
ArduinoJson: change log
=======================

HEAD
----

* Made the library compatible with platform.io (issue #181)

v5.0.7
------

Expand Down
16 changes: 10 additions & 6 deletions library.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,20 @@
"name": "Json",
"keywords": "json, rest, http, web",
"description": "An elegant and efficient JSON library for embedded systems",
"repository":
{
"repository": {
"type": "git",
"url": "https://github.com/bblanchon/ArduinoJson.git"
},
"authors":
{
"authors": {
"name": "Benoit Blanchon",
"url": "http://blog.benoitblanchon.fr"
},
"exclude": [
"scripts",
"src/ArduinoJson.h",
"test",
"third-party"
],
"frameworks": "arduino",
"platforms": "atmelavr"
}
"platforms": "*"
}
10 changes: 10 additions & 0 deletions scripts/travis/platformio.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#!/bin/sh -eux

pip install --user platformio

rm -r test

for EXAMPLE in JsonParserExample JsonGeneratorExample
do
platformio ci examples/$EXAMPLE/$EXAMPLE.ino -l '.' -b $BOARD
done

0 comments on commit c57e6f3

Please sign in to comment.