Commit 0dd087e4 authored by Thomas Haller's avatar Thomas Haller

release: bump version to 1.21.0 (development)

parent e5912389
Pipeline #52014 passed with stage
in 47 minutes and 5 seconds
...@@ -7,8 +7,8 @@ dnl - add corresponding NM_VERSION_x_y_z macros in ...@@ -7,8 +7,8 @@ dnl - add corresponding NM_VERSION_x_y_z macros in
dnl "shared/nm-version-macros.h.in" dnl "shared/nm-version-macros.h.in"
dnl - update number in meson.build dnl - update number in meson.build
m4_define([nm_major_version], [1]) m4_define([nm_major_version], [1])
m4_define([nm_minor_version], [19]) m4_define([nm_minor_version], [21])
m4_define([nm_micro_version], [90]) m4_define([nm_micro_version], [0])
m4_define([nm_version], m4_define([nm_version],
[nm_major_version.nm_minor_version.nm_micro_version]) [nm_major_version.nm_minor_version.nm_micro_version])
......
...@@ -215,4 +215,18 @@ ...@@ -215,4 +215,18 @@
# define NM_AVAILABLE_IN_1_20 # define NM_AVAILABLE_IN_1_20
#endif #endif
#if NM_VERSION_MIN_REQUIRED >= NM_VERSION_1_22
# define NM_DEPRECATED_IN_1_22 G_DEPRECATED
# define NM_DEPRECATED_IN_1_22_FOR(f) G_DEPRECATED_FOR(f)
#else
# define NM_DEPRECATED_IN_1_22
# define NM_DEPRECATED_IN_1_22_FOR(f)
#endif
#if NM_VERSION_MAX_ALLOWED < NM_VERSION_1_22
# define NM_AVAILABLE_IN_1_22 G_UNAVAILABLE(1,22)
#else
# define NM_AVAILABLE_IN_1_22
#endif
#endif /* NM_VERSION_H */ #endif /* NM_VERSION_H */
...@@ -4,7 +4,7 @@ project( ...@@ -4,7 +4,7 @@ project(
# - add corresponding NM_VERSION_x_y_z macros in # - add corresponding NM_VERSION_x_y_z macros in
# "shared/nm-version-macros.h.in" # "shared/nm-version-macros.h.in"
# - update number in configure.ac # - update number in configure.ac
version: '1.19.90', version: '1.21.0',
license: 'GPL2+', license: 'GPL2+',
default_options: [ default_options: [
'buildtype=debugoptimized', 'buildtype=debugoptimized',
......
...@@ -76,6 +76,7 @@ ...@@ -76,6 +76,7 @@
#define NM_VERSION_1_16 (NM_ENCODE_VERSION (1, 16, 0)) #define NM_VERSION_1_16 (NM_ENCODE_VERSION (1, 16, 0))
#define NM_VERSION_1_18 (NM_ENCODE_VERSION (1, 18, 0)) #define NM_VERSION_1_18 (NM_ENCODE_VERSION (1, 18, 0))
#define NM_VERSION_1_20 (NM_ENCODE_VERSION (1, 20, 0)) #define NM_VERSION_1_20 (NM_ENCODE_VERSION (1, 20, 0))
#define NM_VERSION_1_22 (NM_ENCODE_VERSION (1, 22, 0))
/* For releases, NM_API_VERSION is equal to NM_VERSION. /* For releases, NM_API_VERSION is equal to NM_VERSION.
* *
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment