From 4fce9cce865a2605c022fa2455dc0ace8c836c89 Mon Sep 17 00:00:00 2001 From: Max Bruckner Date: Fri, 17 Feb 2017 01:42:02 +0100 Subject: [PATCH] Release version 1.3.0 --- CMakeLists.txt | 4 ++-- Makefile | 2 +- cJSON.c | 2 +- cJSON.h | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f464962..e7f2f7e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,8 +8,8 @@ include(GNUInstallDirs) project(cJSON C) set(PROJECT_VERSION_MAJOR 1) -set(PROJECT_VERSION_MINOR 2) -set(PROJECT_VERSION_PATCH 1) +set(PROJECT_VERSION_MINOR 3) +set(PROJECT_VERSION_PATCH 0) 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 59751e4..ace075c 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ UTILS_TEST_SRC = cJSON.c cJSON_Utils.c test_utils.c LDLIBS = -lm -LIBVERSION = 1.2.1 +LIBVERSION = 1.3.0 CJSON_SOVERSION = 1 UTILS_SOVERSION = 1 diff --git a/cJSON.c b/cJSON.c index 9bc94ba..c3d1a4e 100644 --- a/cJSON.c +++ b/cJSON.c @@ -45,7 +45,7 @@ const char *cJSON_GetErrorPtr(void) } /* This is a safeguard to prevent copy-pasters from using incompatible C and header files */ -#if (CJSON_VERSION_MAJOR != 1) || (CJSON_VERSION_MINOR != 2) || (CJSON_VERSION_PATCH != 1) +#if (CJSON_VERSION_MAJOR != 1) || (CJSON_VERSION_MINOR != 3) || (CJSON_VERSION_PATCH != 0) #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 6f371f9..e4a7856 100644 --- a/cJSON.h +++ b/cJSON.h @@ -30,8 +30,8 @@ extern "C" /* project version */ #define CJSON_VERSION_MAJOR 1 -#define CJSON_VERSION_MINOR 2 -#define CJSON_VERSION_PATCH 1 +#define CJSON_VERSION_MINOR 3 +#define CJSON_VERSION_PATCH 0 /* returns the version of cJSON as a string */ extern const char* cJSON_Version(void); -- GitLab