[json-glib/get-with-default: 1/2] Open the development cycle towards 1.6



commit ce0f83a46317482255e5e6afe9b9d57422c6bffb
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Tue Nov 14 15:59:31 2017 +0000

    Open the development cycle towards 1.6

 NEWS                            |  4 ++++
 json-glib/json-version-macros.h | 20 ++++++++++++++++++++
 meson.build                     |  2 +-
 3 files changed, 25 insertions(+), 1 deletion(-)
---
diff --git a/NEWS b/NEWS
index ec31653..5157c09 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+Overview of changes for 1.6
+==============================
+• TBD
+
 Overview of changes for 1.4
 ==============================
 • Use Meson as the only build system
diff --git a/json-glib/json-version-macros.h b/json-glib/json-version-macros.h
index fdbcea9..c1c269c 100644
--- a/json-glib/json-version-macros.h
+++ b/json-glib/json-version-macros.h
@@ -47,6 +47,8 @@
 
 #define JSON_VERSION_1_4        (G_ENCODE_VERSION (1, 4))
 
+#define JSON_VERSION_1_6        (G_ENCODE_VERSION (1, 6))
+
 /* evaluates to the current stable version; for development cycles,
  * this means the next stable target
  */
@@ -122,6 +124,7 @@
 
 /* XXX: Every new stable minor release should add a set of macros here */
 
+/* 1.0 */
 #if JSON_VERSION_MIN_REQUIRED >= JSON_VERSION_1_0
 # define JSON_DEPRECATED_IN_1_0                JSON_DEPRECATED
 # define JSON_DEPRECATED_IN_1_0_FOR(f)         JSON_DEPRECATED_FOR(f)
@@ -136,6 +139,7 @@
 # define JSON_AVAILABLE_IN_1_0                 _JSON_EXTERN
 #endif
 
+/* 1.2 */
 #if JSON_VERSION_MIN_REQUIRED >= JSON_VERSION_1_2
 # define JSON_DEPRECATED_IN_1_2                JSON_DEPRECATED
 # define JSON_DEPRECATED_IN_1_2_FOR(f)         JSON_DEPRECATED_FOR(f)
@@ -150,6 +154,7 @@
 # define JSON_AVAILABLE_IN_1_2                 _JSON_EXTERN
 #endif
 
+/* 1.4 */
 #if JSON_VERSION_MIN_REQUIRED >= JSON_VERSION_1_4
 # define JSON_DEPRECATED_IN_1_4                JSON_DEPRECATED
 # define JSON_DEPRECATED_IN_1_4_FOR(f)         JSON_DEPRECATED_FOR(f)
@@ -164,4 +169,19 @@
 # define JSON_AVAILABLE_IN_1_4                 _JSON_EXTERN
 #endif
 
+/* 1.6 */
+#if JSON_VERSION_MIN_REQUIRED >= JSON_VERSION_1_6
+# define JSON_DEPRECATED_IN_1_6                JSON_DEPRECATED
+# define JSON_DEPRECATED_IN_1_6_FOR(f)         JSON_DEPRECATED_FOR(f)
+#else
+# define JSON_DEPRECATED_IN_1_6                _JSON_EXTERN
+# define JSON_DEPRECATED_IN_1_6_FOR(f)         _JSON_EXTERN
+#endif
+
+#if JSON_VERSION_MAX_ALLOWED < JSON_VERSION_1_6
+# define JSON_AVAILABLE_IN_1_6                 JSON_UNAVAILABLE(1, 6)
+#else
+# define JSON_AVAILABLE_IN_1_6                 _JSON_EXTERN
+#endif
+
 #endif /* __JSON_VERSION_MACROS_H__ */
diff --git a/meson.build b/meson.build
index 06048e2..67716cb 100644
--- a/meson.build
+++ b/meson.build
@@ -1,4 +1,4 @@
-project('json-glib', 'c', version: '1.4.3',
+project('json-glib', 'c', version: '1.5.1',
         license: 'LGPLv2.1+',
         default_options: [
           'warning_level=1',


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]