From: Eric Haszlakiewicz Date: Sat, 12 Aug 2023 19:08:59 +0000 (+0000) Subject: Update the master branch to version 0.17.99 X-Git-Tag: json-c-0.18-20240915~25 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=502522a93d0a111835094e4c62dbb41b64f2aca4;p=thirdparty%2Fjson-c.git Update the master branch to version 0.17.99 --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 983148ce..d0115d45 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,7 +10,7 @@ cmake_policy(SET CMP0048 NEW) # JSON-C library is C only project. # PROJECT_VERSION{,_MAJOR,_MINOR,_PATCH} set by project(): -project(json-c LANGUAGES C VERSION 0.16.99) +project(json-c LANGUAGES C VERSION 0.17.99) # Targets may not link directly to themselves. cmake_policy(SET CMP0038 NEW) @@ -472,7 +472,7 @@ add_library(${PROJECT_NAME} ${JSON_C_HEADERS} ) set_target_properties(${PROJECT_NAME} PROPERTIES - VERSION 5.2.0 + VERSION 5.3.0 SOVERSION 5) list(APPEND CMAKE_TARGETS ${PROJECT_NAME}) # If json-c is used as subroject it set to target correct interface -I flags and allow diff --git a/RELEASE_CHECKLIST.txt b/RELEASE_CHECKLIST.txt index 8720c3e5..6fe4d402 100644 --- a/RELEASE_CHECKLIST.txt +++ b/RELEASE_CHECKLIST.txt @@ -141,12 +141,10 @@ Use ${release}.99 to indicate a version "newer" than anything on the branch: Update the version in json_c_version.h Update the version in CMakeLists.txt -Update RELEASE_CHECKLIST.txt, set release=${release}+1 +Update the set_target_properties() line in CmakeLists.txt to match the release branch. Add a new empty section to the json-c.sym file, for ${release}+1 -Update the set_target_properties() line in CmakeLists.txt to match the release branch. - git commit -a -m "Update the master branch to version ${release}.99" git push diff --git a/json-c.sym b/json-c.sym index c7501bb2..e977171c 100644 --- a/json-c.sym +++ b/json-c.sym @@ -176,3 +176,7 @@ JSONC_0.17 { json_patch_apply; # array_list_insert_idx is intentionally not exported } JSONC_0.16; + +JSONC_0.18 { +# global: +} JSONC_0.17; diff --git a/json_c_version.h b/json_c_version.h index f0e8d67b..8bf2c348 100644 --- a/json_c_version.h +++ b/json_c_version.h @@ -17,11 +17,11 @@ extern "C" { #endif #define JSON_C_MAJOR_VERSION 0 -#define JSON_C_MINOR_VERSION 16 +#define JSON_C_MINOR_VERSION 17 #define JSON_C_MICRO_VERSION 99 #define JSON_C_VERSION_NUM \ ((JSON_C_MAJOR_VERSION << 16) | (JSON_C_MINOR_VERSION << 8) | JSON_C_MICRO_VERSION) -#define JSON_C_VERSION "0.16.99" +#define JSON_C_VERSION "0.17.99" #ifndef JSON_EXPORT #if defined(_MSC_VER) && defined(JSON_C_DLL)