From e9bd26d5686874c497bcae0500277a9cdd3a6ba4 Mon Sep 17 00:00:00 2001 From: Eric Hawicz Date: Sun, 15 Sep 2024 13:06:06 -0400 Subject: [PATCH] Update the master branch to version 0.18.99 --- CMakeLists.txt | 4 ++-- ChangeLog | 15 +++++++++++++++ json-c.sym | 4 ++++ json_c_version.h | 4 ++-- 4 files changed, 23 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3797cba2..55c6e561 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,7 @@ cmake_minimum_required(VERSION 3.9...3.12) # JSON-C library is C only project. # PROJECT_VERSION{,_MAJOR,_MINOR,_PATCH} set by project(): -project(json-c LANGUAGES C VERSION 0.17.99) +project(json-c LANGUAGES C VERSION 0.18.99) # set default build type if not specified by user if(NOT CMAKE_BUILD_TYPE) @@ -470,7 +470,7 @@ add_library(${PROJECT_NAME} ${JSON_C_HEADERS} ) set_target_properties(${PROJECT_NAME} PROPERTIES - VERSION 5.3.0 + VERSION 5.4.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/ChangeLog b/ChangeLog index a5590e09..b30f9401 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +0.18.99 (future release) +======================================== + +Deprecated and removed features: +-------------------------------- +* none yet + +New features +------------ +* none yet + +Significant changes and bug fixes +--------------------------------- +* none yet + 0.18 (up to commit 6bfab90, 2023-09-15) ======================================== diff --git a/json-c.sym b/json-c.sym index e977171c..47b76e4e 100644 --- a/json-c.sym +++ b/json-c.sym @@ -180,3 +180,7 @@ JSONC_0.17 { JSONC_0.18 { # global: } JSONC_0.17; + +JSONC_0.19 { +# global: +} JSONC_0.18; diff --git a/json_c_version.h b/json_c_version.h index 8bf2c348..2bfb6a63 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 17 +#define JSON_C_MINOR_VERSION 18 #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.17.99" +#define JSON_C_VERSION "0.18.99" #ifndef JSON_EXPORT #if defined(_MSC_VER) && defined(JSON_C_DLL) -- 2.47.2