From 8e357f825b12a91931a518949e24b77685ee609b Mon Sep 17 00:00:00 2001 From: Alanscut Date: Thu, 3 Sep 2020 17:07:49 +0800 Subject: [PATCH 1/2] Update version to 1.7.14 --- CMakeLists.txt | 2 +- Makefile | 2 +- cJSON.c | 2 +- cJSON.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4c36940..e8c9634 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,7 @@ include(GNUInstallDirs) set(PROJECT_VERSION_MAJOR 1) set(PROJECT_VERSION_MINOR 7) -set(PROJECT_VERSION_PATCH 13) +set(PROJECT_VERSION_PATCH 14) set(CJSON_VERSION_SO 1) set(CJSON_UTILS_VERSION_SO 1) set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}") diff --git a/Makefile b/Makefile index 4e727b7..b143230 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ CJSON_TEST_SRC = cJSON.c test.c LDLIBS = -lm -LIBVERSION = 1.7.13 +LIBVERSION = 1.7.14 CJSON_SOVERSION = 1 UTILS_SOVERSION = 1 diff --git a/cJSON.c b/cJSON.c index 0acf487..4c6a308 100644 --- a/cJSON.c +++ b/cJSON.c @@ -113,7 +113,7 @@ CJSON_PUBLIC(double) cJSON_GetNumberValue(const cJSON * const item) } /* This is a safeguard to prevent copy-pasters from using incompatible C and header files */ -#if (CJSON_VERSION_MAJOR != 1) || (CJSON_VERSION_MINOR != 7) || (CJSON_VERSION_PATCH != 13) +#if (CJSON_VERSION_MAJOR != 1) || (CJSON_VERSION_MINOR != 7) || (CJSON_VERSION_PATCH != 14) #error cJSON.h and cJSON.c have different versions. Make sure that both have the same. #endif diff --git a/cJSON.h b/cJSON.h index b5ceb29..e97e5f4 100644 --- a/cJSON.h +++ b/cJSON.h @@ -81,7 +81,7 @@ then using the CJSON_API_VISIBILITY flag to "export" the same symbols the way CJ /* project version */ #define CJSON_VERSION_MAJOR 1 #define CJSON_VERSION_MINOR 7 -#define CJSON_VERSION_PATCH 13 +#define CJSON_VERSION_PATCH 14 #include From 8e84db4c4e631c5578a1d2365bbcc9d814ab8a51 Mon Sep 17 00:00:00 2001 From: Alanscut Date: Thu, 3 Sep 2020 17:11:02 +0800 Subject: [PATCH 2/2] Update changelog and contributors --- CHANGELOG.md | 8 ++++++++ CONTRIBUTORS.md | 4 ++++ 2 files changed, 12 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ec63a51..ff0f5b2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +1.7.14 (Sep 3, 2020) +====== +Fixes: +------ +* optimize the way to find tail node, see [#503](https://github.com/DaveGamble/cJSON/pull/503) +* Fix WError error on macosx because NAN is a float. Thanks @sappo, see [#484](https://github.com/DaveGamble/cJSON/pull/484) +* Fix some bugs in detach and replace. Thanks @miaoerduo, see [#456](https://github.com/DaveGamble/cJSON/pull/456) + 1.7.13 (Apr 2, 2020) ====== Features: diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 0552025..f113ab2 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -29,6 +29,7 @@ Contributors: * [Fabrice Fontaine](https://github.com/ffontaine) * Ian Mobley * Irwan Djadjadi +* [HuKeping](https://github.com/HuKeping) * [IvanVoid](https://github.com/npi3pak) * [Jakub Wilk](https://github.com/jwilk) * [Jiri Zouhar](https://github.com/loigu) @@ -36,12 +37,15 @@ Contributors: * [Julian Ste](https://github.com/julian-st) * [Julián Vásquez](https://github.com/juvasquezg) * [Kevin Branigan](https://github.com/kbranigan) +* [Kevin Sapper](https://github.com/sappo) * [Kyle Chisholm](https://github.com/ChisholmKyle) * [Linus Wallgren](https://github.com/ecksun) * [Mateusz Szafoni](https://github.com/raiden00pl) * Mike Pontillo +* [miaoerduo](https://github.com/miaoerduo) * [Mike Jerris](https://github.com/mjerris) * [Mike Robinson](https://github.com/mhrobinson) +* [Moorthy](https://github.com/moorthy-bs) * [myd7349](https://github.com/myd7349) * [NancyLi1013](https://github.com/NancyLi1013) * Paulo Antonio Alvarez