From 81b2fc9262909e37c7e53b1e2ea07dfd75f61117 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Rombauts?= Date: Sun, 27 Aug 2023 22:58:46 +0200 Subject: [PATCH 1/2] Update project version to 3.3.1 --- CMakeLists.txt | 2 +- Doxyfile | 2 +- include/SQLiteCpp/SQLiteCpp.h | 4 ++-- meson.build | 2 +- package.xml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e45d2331..898f71f7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,7 +6,7 @@ # or copy at http://opensource.org/licenses/MIT) cmake_minimum_required(VERSION 3.5) list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") # custom CMake modules like FindSQLiteCpp -project(SQLiteCpp VERSION 3.3.0) +project(SQLiteCpp VERSION 3.3.1) # SQLiteC++ 3.x requires C++11 features if (NOT CMAKE_CXX_STANDARD) diff --git a/Doxyfile b/Doxyfile index 749b68ab..b9467422 100644 --- a/Doxyfile +++ b/Doxyfile @@ -38,7 +38,7 @@ PROJECT_NAME = SQLiteC++ # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 3.3.0 +PROJECT_NUMBER = 3.3.1 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a diff --git a/include/SQLiteCpp/SQLiteCpp.h b/include/SQLiteCpp/SQLiteCpp.h index f52d520b..c817e980 100644 --- a/include/SQLiteCpp/SQLiteCpp.h +++ b/include/SQLiteCpp/SQLiteCpp.h @@ -41,6 +41,6 @@ * * WARNING: shall always be updated in sync with PROJECT_VERSION in CMakeLists.txt */ -#define SQLITECPP_VERSION "3.03.00" // 3.3.0 -#define SQLITECPP_VERSION_NUMBER 3003000 // 3.3.0 +#define SQLITECPP_VERSION "3.03.01" // 3.3.1 +#define SQLITECPP_VERSION_NUMBER 3003001 // 3.3.1 diff --git a/meson.build b/meson.build index af8a5e03..24eeb731 100644 --- a/meson.build +++ b/meson.build @@ -3,7 +3,7 @@ project( # SQLiteCpp requires C++11 support default_options: ['cpp_std=c++11', 'warning_level=3'], license: 'MIT', - version: '3.3.0', + version: '3.3.1', ) cxx = meson.get_compiler('cpp') diff --git a/package.xml b/package.xml index fe1e721e..9d3f51f7 100644 --- a/package.xml +++ b/package.xml @@ -1,7 +1,7 @@ SQLiteCpp - 3.3.0 + 3.3.1 A smart and easy to use C++ SQLite3 wrapper. Sébastien Rombauts From b8a347b8f29f9b27e23bb630b2919b99fdafb371 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Rombauts?= Date: Sun, 27 Aug 2023 22:19:56 +0200 Subject: [PATCH 2/2] Update changelog for release 3.3.1 --- CHANGELOG.md | 75 ++++++++++++++++++++++++++++++---------------------- 1 file changed, 44 insertions(+), 31 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d376cbc2..0beb9a95 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -217,36 +217,49 @@ Version 3.2.0 - 2022 Septembre 18 - #360 Small improvements and code cleaning from Kacperos155/small_improvements Versions 3.2.1 - 2022 Decembre 12 -- Merge pull request #383 Update SQLite from 3.39.3 to 3.40.0 (2022-11-16) from SRombauts/update-sqlite-340 -- Merge pull request #370 Don't link anymore with Visual Studio's static runtime by default from SRombauts/dont-enforce-static-linking -- Merge pull request #371 from SRombauts/appveyor-vs-2022 -- Merge pull request #277 from cuberite/cmake-scoping -- Merge pull request #374 Update googletest from vuhailongkl97/master -- Merge pull request #377 Some documentation fixes from cbielow/fix_doc -- Merge pull request #380 [Meson] fixes for meson project from ninjaoflight/windows-support -- Merge pull request #387 Ensure that TEXT column is UTF-8 encoded before using sqlite3_column_blob() from dougnazar -- Merge pull request #385 disable SQLITECPP_USE_STACK_PROTECTION when on MinGW from SRombauts/mingw-disable-stack-protection -- Merge pull request #386 [meson] Update SQLite from 3.39.3 to 3.40.0 from ninjaoflight/sqlite-meson-update -- Merge pull request #389 [meson] add missing compile options from ninjaoflight/meson-fixes +- #383 Update SQLite from 3.39.3 to 3.40.0 (2022-11-16) from SRombauts/update-sqlite-340 +- #370 Don't link anymore with Visual Studio's static runtime by default from SRombauts/dont-enforce-static-linking +- #371 from SRombauts/appveyor-vs-2022 +- #277 from cuberite/cmake-scoping +- #374 Update googletest from vuhailongkl97/master +- #377 Some documentation fixes from cbielow/fix_doc +- #380 [Meson] fixes for meson project from ninjaoflight/windows-support +- #387 Ensure that TEXT column is UTF-8 encoded before using sqlite3_column_blob() from dougnazar +- #385 disable SQLITECPP_USE_STACK_PROTECTION when on MinGW from SRombauts/mingw-disable-stack-protection +- #386 [meson] Update SQLite from 3.39.3 to 3.40.0 from ninjaoflight/sqlite-meson-update +- #389 [meson] add missing compile options from ninjaoflight/meson-fixes Version 3.3.0 - 2023 May 24 -- Merge pull request #393 Fix preprocessor issues from jowr/fix_preprocessor_issues -- Merge pull request #394 check if SQLITE_OPEN_NOFOLLOW is defined from ninjaoflight/macos-11-fix -- Merge pull request #391 meson project changes based on wrap submission review from ninjaoflight/meson-macos-fix -- Merge pull request #390 fix incorrect work of savepoint from spoyler/save_point Sébastien Rombauts 12/15/2022 01:12 PM -- Merge pull request #396 Rename Savepoint RollbackTo() and fix class comments and formatting from SRombauts/rename-savepoint-rollback-to -- Merge pull request #384 Add Mingw GitHub actions from SRombauts/mingw-github-actions -- Merge pull request #397 Add a Transaction::rollback() method from SRombauts/add-transaction-rollback -- Merge pull request #395 add meson usage guide from ninjaoflight/meson-readme-guide -- Merge pull request #401 Fix meson installation from dougnazar/fix_meson_install -- Merge pull request #400 CMakr/meson Lint corrections from ninjaoflight/lint-corrections -- Merge pull request #404 Add documentation for prepared statements in transactions from ewarchul/query_transactions_example -- Merge pull request #399 add disable option for sqlite3_expanded_sql from ninjaoflight/optional-sqlite3_expanded_sql -- Merge pull request #408 correct executable name in meson from ninjaoflight/patch-2 -- Merge pull request #407 Create Meson CI from ninjaoflight/patch-1 -- Merge pull request #409 Update package.xml from poshul/patch-1 -- Merge pull request #410 use checkout@v3 in CMake CI from ninjaoflight/fix-nodejs-warnings -- Merge pull request #406 Dllexport import from pierre-aimi/dllexport_import -- Merge pull request #415 Remove mismatched else condition in CMakeLists.txt from Timmmm/patch-1 -- Merge pull request #413 Fix compiler warnings warning from ninjaoflight/fix-visibility-warning -- Merge pull request #423 Update SQLite from 3.40.0 to 3.42.0 (2023-05-16) from SRombauts/update-sqlite +- #393 Fix preprocessor issues from jowr/fix_preprocessor_issues +- #394 check if SQLITE_OPEN_NOFOLLOW is defined from ninjaoflight/macos-11-fix +- #391 meson project changes based on wrap submission review from ninjaoflight/meson-macos-fix +- #390 fix incorrect work of savepoint from spoyler/save_point Sébastien Rombauts 12/15/2022 01:12 PM +- #396 Rename Savepoint RollbackTo() and fix class comments and formatting from SRombauts/rename-savepoint-rollback-to +- #384 Add Mingw GitHub actions from SRombauts/mingw-github-actions +- #397 Add a Transaction::rollback() method from SRombauts/add-transaction-rollback +- #395 add meson usage guide from ninjaoflight/meson-readme-guide +- #401 Fix meson installation from dougnazar/fix_meson_install +- #400 CMakr/meson Lint corrections from ninjaoflight/lint-corrections +- #404 Add documentation for prepared statements in transactions from ewarchul/query_transactions_example +- #399 add disable option for sqlite3_expanded_sql from ninjaoflight/optional-sqlite3_expanded_sql +- #408 correct executable name in meson from ninjaoflight/patch-2 +- #407 Create Meson CI from ninjaoflight/patch-1 +- #409 Update package.xml from poshul/patch-1 +- #410 use checkout@v3 in CMake CI from ninjaoflight/fix-nodejs-warnings +- #406 DLL export/import using BUILD_SHARED_LIBS from pierre-aimi/dllexport_import +- #415 Remove mismatched else condition in CMakeLists.txt from Timmmm/patch-1 +- #413 Fix compiler warnings from ninjaoflight/fix-visibility-warning +- #423 Update SQLite from 3.40.0 to 3.42.0 (2023-05-16) from SRombauts/update-sqlite + +Version 3.3.1 - 2023 Aug 27 + +- #428 Add CMake option SQLITE_ENABLE_DBSTAT_VTAB and SQLITE_ENABLE_RTREE from SRombauts/cmake-sqlite-enable-dbstat-vtab +- #434 Define SQLITECPP_COMPILE_DLL as PUBLIC from calumr/fix-dll-import +- #439 Update CMake minimum version to 3.5 to get rid of a new deprecation warning with CMake 3.27 from SRombauts/cmake-update-minimum-version +- #441 Cleanup of the Github "build" workflow from SRombauts/github-actions-improvements +- Update usage of SQLITECPP_USE_STATIC_RUNTIME (#438) +- Don't build the googlemock subproject, only the main googletest library +- Declare BUILD_SHARED_LIBS option for discoverability (#440) +- Set -DBUILD_SHARED_LIBS=ON by default on scripts and CI/CD (#442) +- Update SQLite from 3.42.0 to 3.43.0 (2023-08-24) (#443) +- Rename the original build.yml to cmake.yml vs meson.yml (#444)