diff --git a/conanfile.py b/conanfile.py index ed7e38ed..100decc6 100755 --- a/conanfile.py +++ b/conanfile.py @@ -18,12 +18,12 @@ def get_version_from_git_tag(): class EmbeddedTemplateLibraryConan(ConanFile): name = "embedded-template-library" - version = "18.20.0" + version = get_version_from_git_tag() license = "MIT" author = "John Wellbelove " url = "https://github.com/ETLCPP/etl" description = "A C++ template library for embedded applications" - topics = ("embedded", "template", "container") + topics = ("C++", "embedded", "template", "container", "utility", "framework", "messaging") # Source info scm = { diff --git a/include/etl/version.h b/include/etl/version.h index bce0a92e..4fc178e9 100644 --- a/include/etl/version.h +++ b/include/etl/version.h @@ -39,7 +39,7 @@ SOFTWARE. #define ETL_VERSION_MAJOR 19 #define ETL_VERSION_MINOR 2 -#define ETL_VERSION_PATCH 0 +#define ETL_VERSION_PATCH 1 #define ETL_VERSION ETL_STRINGIFY(ETL_VERSION_MAJOR) "." ETL_STRINGIFY(ETL_VERSION_MINOR) "." ETL_STRINGIFY(ETL_VERSION_PATCH) #define ETL_VERSION_W ETL_STRINGIFY(ETL_VERSION_MAJOR) L"." ETL_STRINGIFY(ETL_VERSION_MINOR) L"." ETL_STRINGIFY(ETL_VERSION_PATCH) #define ETL_VERSION_U16 ETL_STRINGIFY(ETL_VERSION_MAJOR) u"." ETL_STRINGIFY(ETL_VERSION_MINOR) u"." ETL_STRINGIFY(ETL_VERSION_PATCH) diff --git a/library.json b/library.json index 28ed610d..7e806eb3 100644 --- a/library.json +++ b/library.json @@ -1,6 +1,6 @@ { "name": "Embedded Template Library", - "version": "19.2.0", + "version": "19.2.1", "author s": { "name": "John Wellbelove", "email": "john.wellbelove@etlcpp.com" diff --git a/library.properties b/library.properties index 3625eedf..0fccaa3f 100644 --- a/library.properties +++ b/library.properties @@ -1,5 +1,5 @@ name=Embedded Template Library -version=19.2.0 +version=19.2.1 author= John Wellbelove maintainer=John Wellbelove license=MIT diff --git a/support/Release notes.txt b/support/Release notes.txt index 7b0bb26e..251c4710 100644 --- a/support/Release notes.txt +++ b/support/Release notes.txt @@ -1,3 +1,7 @@ +=============================================================================== +19.2.1 +Fixed version number retrieval from Github. + =============================================================================== 19.2.0 Security flag for a string is copied on assignment or copy constructor. diff --git a/test/vs2019/etl.vcxproj b/test/vs2019/etl.vcxproj index 2c947ac9..7fae2640 100644 --- a/test/vs2019/etl.vcxproj +++ b/test/vs2019/etl.vcxproj @@ -1981,6 +1981,7 @@ + diff --git a/test/vs2019/etl.vcxproj.filters b/test/vs2019/etl.vcxproj.filters index 3bc8262b..2c69e527 100644 --- a/test/vs2019/etl.vcxproj.filters +++ b/test/vs2019/etl.vcxproj.filters @@ -1501,6 +1501,9 @@ Source Files + + Resource Files +