Skip to content
GitLab
Explore
Projects
Groups
Snippets
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Benoît Blanchon
ArduinoJson
Commits
1f735065
Commit
1f735065
authored
4 years ago
by
Benoit Blanchon
Browse files
Options
Download
Email Patches
Plain Diff
Set version to 6.17.0
parent
41132b70
6.x
6.20.x
incremental-deserializer
v6.21.0
v6.20.1
v6.20.0
v6.19.4
v6.19.3
v6.19.2
v6.19.1
v6.19.0
v6.18.5
v6.18.4
v6.18.3
v6.18.2
v6.18.1
v6.18.0
v6.17.3
v6.17.2
v6.17.1
v6.17.0
No related merge requests found
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
CHANGELOG.md
+2
-2
CHANGELOG.md
CMakeLists.txt
+1
-1
CMakeLists.txt
README.md
+1
-1
README.md
appveyor.yml
+1
-1
appveyor.yml
library.json
+1
-1
library.json
library.properties
+1
-1
library.properties
src/ArduinoJson/version.hpp
+3
-3
src/ArduinoJson/version.hpp
with
10 additions
and
10 deletions
+10
-10
CHANGELOG.md
+
2
-
2
View file @
1f735065
ArduinoJson: change log
=======================
HEAD
----
v6.17.0 (2020-10-19)
----
---
*
Added a build failure when nullptr is defined as a macro (issue #1355)
*
Added
`JsonDocument::overflowed()`
which tells if the memory pool was too small (issue #1358)
...
...
This diff is collapsed.
Click to expand it.
CMakeLists.txt
+
1
-
1
View file @
1f735065
...
...
@@ -4,7 +4,7 @@
cmake_minimum_required
(
VERSION 3.0
)
project
(
ArduinoJson VERSION 6.1
6.1
)
project
(
ArduinoJson VERSION 6.1
7.0
)
if
(
CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME
)
include
(
CTest
)
...
...
This diff is collapsed.
Click to expand it.
README.md
+
1
-
1
View file @
1f735065
...
...
@@ -2,7 +2,7 @@
---
[

](https://www.ardu-badge.com/ArduinoJson/6.1
6.1
)
[

](https://www.ardu-badge.com/ArduinoJson/6.1
7.0
)
[

](https://ci.appveyor.com/project/bblanchon/arduinojson/branch/6.x)
[

](https://travis-ci.org/bblanchon/ArduinoJson)
[

](https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:arduinojson)
...
...
This diff is collapsed.
Click to expand it.
appveyor.yml
+
1
-
1
View file @
1f735065
version
:
6.1
6.1
.{build}
version
:
6.1
7.0
.{build}
environment
:
matrix
:
-
APPVEYOR_BUILD_WORKER_IMAGE
:
Visual Studio
2019
...
...
This diff is collapsed.
Click to expand it.
library.json
+
1
-
1
View file @
1f735065
...
...
@@ -7,7 +7,7 @@
"type"
:
"git"
,
"url"
:
"https://github.com/bblanchon/ArduinoJson.git"
},
"version"
:
"6.1
6.1
"
,
"version"
:
"6.1
7.0
"
,
"authors"
:
{
"name"
:
"Benoit Blanchon"
,
"url"
:
"https://blog.benoitblanchon.fr"
...
...
This diff is collapsed.
Click to expand it.
library.properties
+
1
-
1
View file @
1f735065
name
=
ArduinoJson
version
=
6.1
6.1
version
=
6.1
7.0
author
=
Benoit Blanchon <blog.benoitblanchon.fr>
maintainer
=
Benoit Blanchon <blog.benoitblanchon.fr>
sentence
=
A simple and efficient JSON library for embedded C++.
...
...
This diff is collapsed.
Click to expand it.
src/ArduinoJson/version.hpp
+
3
-
3
View file @
1f735065
...
...
@@ -4,7 +4,7 @@
#pragma once
#define ARDUINOJSON_VERSION "6.1
6.1
"
#define ARDUINOJSON_VERSION "6.1
7.0
"
#define ARDUINOJSON_VERSION_MAJOR 6
#define ARDUINOJSON_VERSION_MINOR 1
6
#define ARDUINOJSON_VERSION_REVISION
1
#define ARDUINOJSON_VERSION_MINOR 1
7
#define ARDUINOJSON_VERSION_REVISION
0
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Snippets