mirror of
				https://github.com/eledio-devices/thirdparty-ArduinoJson.git
				synced 2025-10-31 08:42:39 +01:00 
			
		
		
		
	Made the library compatible with platform.io (issue #181)
This commit is contained in:
		
				
					committed by
					
						 Benoit Blanchon
						Benoit Blanchon
					
				
			
			
				
	
			
			
			
						parent
						
							b54f1ffc1d
						
					
				
				
					commit
					c57e6f3bd8
				
			| @@ -1,8 +1,15 @@ | |||||||
| sudo: false | sudo: false | ||||||
| language: cpp | language: cpp | ||||||
|  | cache: | ||||||
|  |   directories: | ||||||
|  |     - "~/.platformio" | ||||||
| env: | env: | ||||||
|   - COMPILER=gcc |   - COMPILER=gcc | ||||||
|   - COMPILER=clang |   - COMPILER=clang | ||||||
|   - COMPILER=arduino VERSION=1.5.8 BOARD=arduino:avr:uno |   - COMPILER=arduino VERSION=1.5.8 BOARD=arduino:avr:uno | ||||||
|   - COMPILER=arduino VERSION=1.6.7 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 | script: scripts/travis/$COMPILER.sh | ||||||
|   | |||||||
							
								
								
									
										14
									
								
								ArduinoJson.h
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										14
									
								
								ArduinoJson.h
									
									
									
									
									
										Normal file
									
								
							| @@ -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" | ||||||
| @@ -1,6 +1,11 @@ | |||||||
| ArduinoJson: change log | ArduinoJson: change log | ||||||
| ======================= | ======================= | ||||||
|  |  | ||||||
|  | HEAD | ||||||
|  | ---- | ||||||
|  |  | ||||||
|  | * Made the library compatible with platform.io (issue #181) | ||||||
|  |  | ||||||
| v5.0.7 | v5.0.7 | ||||||
| ------ | ------ | ||||||
|  |  | ||||||
|   | |||||||
							
								
								
									
										16
									
								
								library.json
									
									
									
									
									
								
							
							
						
						
									
										16
									
								
								library.json
									
									
									
									
									
								
							| @@ -2,16 +2,20 @@ | |||||||
|   "name": "Json", |   "name": "Json", | ||||||
|   "keywords": "json, rest, http, web", |   "keywords": "json, rest, http, web", | ||||||
|   "description": "An elegant and efficient JSON library for embedded systems", |   "description": "An elegant and efficient JSON library for embedded systems", | ||||||
|   "repository": |   "repository": { | ||||||
|   { |  | ||||||
|     "type": "git", |     "type": "git", | ||||||
|     "url": "https://github.com/bblanchon/ArduinoJson.git" |     "url": "https://github.com/bblanchon/ArduinoJson.git" | ||||||
|   }, |   }, | ||||||
|   "authors": |   "authors": { | ||||||
|   { |  | ||||||
|     "name": "Benoit Blanchon", |     "name": "Benoit Blanchon", | ||||||
|     "url": "http://blog.benoitblanchon.fr" |     "url": "http://blog.benoitblanchon.fr" | ||||||
|   }, |   }, | ||||||
|  |   "exclude": [ | ||||||
|  |     "scripts", | ||||||
|  |     "src/ArduinoJson.h", | ||||||
|  |     "test", | ||||||
|  |     "third-party" | ||||||
|  |   ], | ||||||
|   "frameworks": "arduino", |   "frameworks": "arduino", | ||||||
|   "platforms": "atmelavr"   |   "platforms": "*" | ||||||
| } | } | ||||||
|   | |||||||
							
								
								
									
										10
									
								
								scripts/travis/platformio.sh
									
									
									
									
									
										Executable file
									
								
							
							
						
						
									
										10
									
								
								scripts/travis/platformio.sh
									
									
									
									
									
										Executable file
									
								
							| @@ -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 | ||||||
		Reference in New Issue
	
	Block a user