diff --git a/arduino/library-arduino.json b/arduino/library-arduino.json index 1798ead5..6a28cfc3 100644 --- a/arduino/library-arduino.json +++ b/arduino/library-arduino.json @@ -1,6 +1,7 @@ { "name": "Embedded Template Library - Arduino", - "version": "20.27.2", + "version": "20.27.2 +", "authors": { "name": "John Wellbelove", "email": "john.wellbelove@etlcpp.com" diff --git a/arduino/library-arduino.properties b/arduino/library-arduino.properties index 227f2137..cbc8aa5f 100644 --- a/arduino/library-arduino.properties +++ b/arduino/library-arduino.properties @@ -1,5 +1,6 @@ name=Embedded Template Library - Arduino version=20.27.2 + author= John Wellbelove maintainer=John Wellbelove license=MIT diff --git a/include/etl/version.h b/include/etl/version.h index 585c5ac8..0a393319 100644 --- a/include/etl/version.h +++ b/include/etl/version.h @@ -39,7 +39,9 @@ SOFTWARE. #define ETL_VERSION_MAJOR 20 #define ETL_VERSION_MINOR 27 -#define ETL_VERSION_PATCH 1 +#define ETL_VERSION_PATCH 2 + + #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 67f96961..8ef2d059 100644 --- a/library.json +++ b/library.json @@ -1,6 +1,7 @@ { "name": "Embedded Template Library", - "version": "20.27.2", + "version": "20.27.2 +", "authors": { "name": "John Wellbelove", "email": "john.wellbelove@etlcpp.com" diff --git a/library.properties b/library.properties index d8a8267d..4f9b9921 100644 --- a/library.properties +++ b/library.properties @@ -1,5 +1,6 @@ name=Embedded Template Library version=20.27.2 + author= John Wellbelove maintainer=John Wellbelove license=MIT diff --git a/scripts/update_release.py b/scripts/update_release.py index 18a2ffce..3e95cd8d 100644 --- a/scripts/update_release.py +++ b/scripts/update_release.py @@ -137,7 +137,7 @@ def update_version_h(): version_h = os.path.join(headers_dir, 'version.h') with open(version_h) as f: - text = f.readlines() + text = f.read().splitlines() search_major = '#define ETL_VERSION_MAJOR ' search_minor = '#define ETL_VERSION_MINOR ' @@ -162,6 +162,12 @@ def update_version_h(): index = text[i].find(search_patch) if index != -1: text[i] = text[i][index:length_patch] + patch_version + print(text[i]) + + with open(version_h, 'w') as f: + for line in text: + f.write(line) + f.write('\n') #------------------------------------------------------------------------------ def update_library_json(filename): diff --git a/test/test_etl_traits.cpp b/test/test_etl_traits.cpp index ea2dfb50..ea3347b4 100644 --- a/test/test_etl_traits.cpp +++ b/test/test_etl_traits.cpp @@ -31,7 +31,8 @@ SOFTWARE. #include "unit_test_framework.h" #include "etl/platform.h" - +#include "etl/version.h" +#include "etl/char_traits.h" namespace { SUITE(test_etl_traits) @@ -70,6 +71,14 @@ namespace CHECK_EQUAL((ETL_HAS_MUTABLE_ARRAY_VIEW == 1), etl::traits::has_mutable_array_view); CHECK_EQUAL((ETL_IS_DEBUG_BUILD == 1), etl::traits::is_debug_build); CHECK_EQUAL(__cplusplus, etl::traits::cplusplus); + CHECK_EQUAL(ETL_VERSION_MAJOR, etl::traits::version_major); + CHECK_EQUAL(ETL_VERSION_MINOR, etl::traits::version_minor); + CHECK_EQUAL(ETL_VERSION_PATCH, etl::traits::version_patch); + CHECK_EQUAL(ETL_VERSION_VALUE, etl::traits::version); + CHECK_ARRAY_EQUAL(ETL_VERSION, etl::traits::version_string, etl::strlen(ETL_VERSION)); + CHECK_ARRAY_EQUAL(ETL_VERSION, etl::traits::version_wstring, etl::strlen(ETL_VERSION_W)); + CHECK_ARRAY_EQUAL(ETL_VERSION, etl::traits::version_u16string, etl::strlen(ETL_VERSION_U16)); + CHECK_ARRAY_EQUAL(ETL_VERSION, etl::traits::version_u32string, etl::strlen(ETL_VERSION_U32)); } }; }