diff --git a/CHANGELOG.md b/CHANGELOG.md index 0beb9a95..d91e401e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -263,3 +263,14 @@ Version 3.3.1 - 2023 Aug 27 - 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) + +Version 3.3.2 - 2024 Aug 16 + +- Fix and update Travis CI workflow (#450) +- Update Googletest to v1.15.2 (#451) and (#478) +- [Meson] update meson dependencies (#448) +- Macos ci fix (#476) +- Update meson dependencies [Meson only] (#475) +- Update SQLite from 3.43.0 to 3.46.1 (2024-08-13) (#461) and (#477) +- Explicitly =delete; Statement::bindNoCopy(..., std::string&&) (#469) + diff --git a/CMakeLists.txt b/CMakeLists.txt index 898f71f7..8c443217 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,12 +1,12 @@ # Main CMake file for compiling the library itself, examples and tests. # -# Copyright (c) 2012-2023 Sebastien Rombauts (sebastien.rombauts@gmail.com) +# Copyright (c) 2012-2024 Sebastien Rombauts (sebastien.rombauts@gmail.com) # # Distributed under the MIT License (MIT) (See accompanying file LICENSE.txt # 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.1) +project(SQLiteCpp VERSION 3.3.2) # SQLiteC++ 3.x requires C++11 features if (NOT CMAKE_CXX_STANDARD) diff --git a/Doxyfile b/Doxyfile index b9467422..25c4af6d 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.1 +PROJECT_NUMBER = 3.3.2 # 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/LICENSE.txt b/LICENSE.txt index c060d7f5..468fc09e 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2012-2023 Sebastien Rombauts (sebastien.rombauts@gmail.com) +Copyright (c) 2012-2024 Sebastien Rombauts (sebastien.rombauts@gmail.com) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index f31c6d00..ae219548 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ with a few intuitive and well documented C++ classes. ### License: -Copyright (c) 2012-2023 Sébastien Rombauts (sebastien.rombauts@gmail.com) +Copyright (c) 2012-2024 Sébastien Rombauts (sebastien.rombauts@gmail.com) Distributed under the MIT License (MIT) (See accompanying file LICENSE.txt diff --git a/appveyor.yml b/appveyor.yml index 07928313..b74715c3 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2012-2023 Sebastien Rombauts (sebastien.rombauts@gmail.com) +# Copyright (c) 2012-2024 Sebastien Rombauts (sebastien.rombauts@gmail.com) # build format version: "{build}" diff --git a/build.bat b/build.bat index aea7e94e..705a6f60 100644 --- a/build.bat +++ b/build.bat @@ -1,4 +1,4 @@ -@REM Copyright (c) 2012-2023 Sebastien Rombauts (sebastien.rombauts@gmail.com) +@REM Copyright (c) 2012-2024 Sebastien Rombauts (sebastien.rombauts@gmail.com) @REM @REM Distributed under the MIT License (MIT) (See accompanying file LICENSE.txt @REM or copy at http://opensource.org/licenses/MIT) diff --git a/build.sh b/build.sh index 67aa15c4..ece1cc9e 100755 --- a/build.sh +++ b/build.sh @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (c) 2012-2023 Sébastien Rombauts (sebastien.rombauts@gmail.com) +# Copyright (c) 2012-2024 Sébastien Rombauts (sebastien.rombauts@gmail.com) # # Distributed under the MIT License (MIT) (See accompanying file LICENSE.txt # or copy at http://opensource.org/licenses/MIT) diff --git a/examples/example1/main.cpp b/examples/example1/main.cpp index 80885cdc..9c2b3616 100644 --- a/examples/example1/main.cpp +++ b/examples/example1/main.cpp @@ -4,7 +4,7 @@ * * Demonstrates how-to use the SQLite++ wrapper * - * Copyright (c) 2012-2023 Sebastien Rombauts (sebastien.rombauts@gmail.com) + * Copyright (c) 2012-2024 Sebastien Rombauts (sebastien.rombauts@gmail.com) * * Distributed under the MIT License (MIT) (See accompanying file LICENSE.txt * or copy at http://opensource.org/licenses/MIT) diff --git a/include/SQLiteCpp/Assertion.h b/include/SQLiteCpp/Assertion.h index 3d404e2d..96db4cb8 100644 --- a/include/SQLiteCpp/Assertion.h +++ b/include/SQLiteCpp/Assertion.h @@ -3,7 +3,7 @@ * @ingroup SQLiteCpp * @brief Definition of the SQLITECPP_ASSERT() macro. * - * Copyright (c) 2012-2023 Sebastien Rombauts (sebastien.rombauts@gmail.com) + * Copyright (c) 2012-2024 Sebastien Rombauts (sebastien.rombauts@gmail.com) * * Distributed under the MIT License (MIT) (See accompanying file LICENSE.txt * or copy at http://opensource.org/licenses/MIT) diff --git a/include/SQLiteCpp/Backup.h b/include/SQLiteCpp/Backup.h index aa685fb0..20aab8c9 100644 --- a/include/SQLiteCpp/Backup.h +++ b/include/SQLiteCpp/Backup.h @@ -4,7 +4,7 @@ * @brief Backup is used to backup a database file in a safe and online way. * * Copyright (c) 2015 Shibao HONG (shibaohong@outlook.com) - * Copyright (c) 2015-2023 Sebastien Rombauts (sebastien.rombauts@gmail.com) + * Copyright (c) 2015-2024 Sebastien Rombauts (sebastien.rombauts@gmail.com) * * Distributed under the MIT License (MIT) (See accompanying file LICENSE.txt * or copy at http://opensource.org/licenses/MIT) diff --git a/include/SQLiteCpp/Column.h b/include/SQLiteCpp/Column.h index 81af4042..fea069d0 100644 --- a/include/SQLiteCpp/Column.h +++ b/include/SQLiteCpp/Column.h @@ -3,7 +3,7 @@ * @ingroup SQLiteCpp * @brief Encapsulation of a Column in a row of the result pointed by the prepared SQLite::Statement. * - * Copyright (c) 2012-2023 Sebastien Rombauts (sebastien.rombauts@gmail.com) + * Copyright (c) 2012-2024 Sebastien Rombauts (sebastien.rombauts@gmail.com) * * Distributed under the MIT License (MIT) (See accompanying file LICENSE.txt * or copy at http://opensource.org/licenses/MIT) diff --git a/include/SQLiteCpp/Database.h b/include/SQLiteCpp/Database.h index 4475324f..2c0f767b 100644 --- a/include/SQLiteCpp/Database.h +++ b/include/SQLiteCpp/Database.h @@ -3,7 +3,7 @@ * @ingroup SQLiteCpp * @brief Management of a SQLite Database Connection. * - * Copyright (c) 2012-2023 Sebastien Rombauts (sebastien.rombauts@gmail.com) + * Copyright (c) 2012-2024 Sebastien Rombauts (sebastien.rombauts@gmail.com) * * Distributed under the MIT License (MIT) (See accompanying file LICENSE.txt * or copy at http://opensource.org/licenses/MIT) diff --git a/include/SQLiteCpp/Exception.h b/include/SQLiteCpp/Exception.h index b8231cd1..aeb09dc6 100644 --- a/include/SQLiteCpp/Exception.h +++ b/include/SQLiteCpp/Exception.h @@ -3,7 +3,7 @@ * @ingroup SQLiteCpp * @brief Encapsulation of the error message from SQLite3 on a std::runtime_error. * - * Copyright (c) 2012-2023 Sebastien Rombauts (sebastien.rombauts@gmail.com) + * Copyright (c) 2012-2024 Sebastien Rombauts (sebastien.rombauts@gmail.com) * * Distributed under the MIT License (MIT) (See accompanying file LICENSE.txt * or copy at http://opensource.org/licenses/MIT) diff --git a/include/SQLiteCpp/ExecuteMany.h b/include/SQLiteCpp/ExecuteMany.h index b5de3a23..9cb8c27b 100644 --- a/include/SQLiteCpp/ExecuteMany.h +++ b/include/SQLiteCpp/ExecuteMany.h @@ -4,7 +4,7 @@ * @brief Convenience function to execute a Statement with multiple Parameter sets * * Copyright (c) 2019 Maximilian Bachmann (contact@maxbachmann.de) - * Copyright (c) 2019-2023 Sebastien Rombauts (sebastien.rombauts@gmail.com) + * Copyright (c) 2019-2024 Sebastien Rombauts (sebastien.rombauts@gmail.com) * * Distributed under the MIT License (MIT) (See accompanying file LICENSE.txt * or copy at http://opensource.org/licenses/MIT) diff --git a/include/SQLiteCpp/SQLiteCpp.h b/include/SQLiteCpp/SQLiteCpp.h index c817e980..042af01f 100644 --- a/include/SQLiteCpp/SQLiteCpp.h +++ b/include/SQLiteCpp/SQLiteCpp.h @@ -5,7 +5,7 @@ * * Include this main header file in your project to gain access to all functionality provided by the wrapper. * - * Copyright (c) 2012-2023 Sebastien Rombauts (sebastien.rombauts@gmail.com) + * Copyright (c) 2012-2024 Sebastien Rombauts (sebastien.rombauts@gmail.com) * * Distributed under the MIT License (MIT) (See accompanying file LICENSE.txt * or copy at http://opensource.org/licenses/MIT) @@ -41,6 +41,6 @@ * * WARNING: shall always be updated in sync with PROJECT_VERSION in CMakeLists.txt */ -#define SQLITECPP_VERSION "3.03.01" // 3.3.1 -#define SQLITECPP_VERSION_NUMBER 3003001 // 3.3.1 +#define SQLITECPP_VERSION "3.03.02" // 3.3.2 +#define SQLITECPP_VERSION_NUMBER 3003002 // 3.3.2 diff --git a/include/SQLiteCpp/Savepoint.h b/include/SQLiteCpp/Savepoint.h index 8dd5e894..fe8a8ddf 100644 --- a/include/SQLiteCpp/Savepoint.h +++ b/include/SQLiteCpp/Savepoint.h @@ -5,7 +5,7 @@ * secured operation. Similar to a transaction while allowing child savepoints. * * Copyright (c) 2020 Kelvin Hammond (hammond.kelvin@gmail.com) - * Copyright (c) 2020-2023 Sebastien Rombauts (sebastien.rombauts@gmail.com) + * Copyright (c) 2020-2024 Sebastien Rombauts (sebastien.rombauts@gmail.com) * * Distributed under the MIT License (MIT) (See accompanying file LICENSE.txt or * copy at http://opensource.org/licenses/MIT) diff --git a/include/SQLiteCpp/Statement.h b/include/SQLiteCpp/Statement.h index 8eade34f..bb62a9f9 100644 --- a/include/SQLiteCpp/Statement.h +++ b/include/SQLiteCpp/Statement.h @@ -3,7 +3,7 @@ * @ingroup SQLiteCpp * @brief A prepared SQLite Statement is a compiled SQL query ready to be executed, pointing to a row of result. * - * Copyright (c) 2012-2023 Sebastien Rombauts (sebastien.rombauts@gmail.com) + * Copyright (c) 2012-2024 Sebastien Rombauts (sebastien.rombauts@gmail.com) * * Distributed under the MIT License (MIT) (See accompanying file LICENSE.txt * or copy at http://opensource.org/licenses/MIT) diff --git a/include/SQLiteCpp/Transaction.h b/include/SQLiteCpp/Transaction.h index 305de30a..84773063 100644 --- a/include/SQLiteCpp/Transaction.h +++ b/include/SQLiteCpp/Transaction.h @@ -3,7 +3,7 @@ * @ingroup SQLiteCpp * @brief A Transaction is way to group multiple SQL statements into an atomic secured operation. * - * Copyright (c) 2012-2023 Sebastien Rombauts (sebastien.rombauts@gmail.com) + * Copyright (c) 2012-2024 Sebastien Rombauts (sebastien.rombauts@gmail.com) * * Distributed under the MIT License (MIT) (See accompanying file LICENSE.txt * or copy at http://opensource.org/licenses/MIT) diff --git a/include/SQLiteCpp/VariadicBind.h b/include/SQLiteCpp/VariadicBind.h index 3261da4d..77af5551 100644 --- a/include/SQLiteCpp/VariadicBind.h +++ b/include/SQLiteCpp/VariadicBind.h @@ -4,7 +4,7 @@ * @brief Convenience function for Statement::bind(...) * * Copyright (c) 2016 Paul Dreik (github@pauldreik.se) - * Copyright (c) 2016-2023 Sebastien Rombauts (sebastien.rombauts@gmail.com) + * Copyright (c) 2016-2024 Sebastien Rombauts (sebastien.rombauts@gmail.com) * Copyright (c) 2019 Maximilian Bachmann (contact@maxbachmann.de) * * Distributed under the MIT License (MIT) (See accompanying file LICENSE.txt diff --git a/meson.build b/meson.build index 2aac5cc4..5655f045 100644 --- a/meson.build +++ b/meson.build @@ -4,7 +4,7 @@ project( # however newer versions of gtest requires C++14 default_options: ['cpp_std=c++14', 'warning_level=3'], license: 'MIT', - version: '3.3.1', + version: '3.3.2', ) cxx = meson.get_compiler('cpp') diff --git a/package.xml b/package.xml index 9d3f51f7..065ebf15 100644 --- a/package.xml +++ b/package.xml @@ -1,7 +1,7 @@ SQLiteCpp - 3.3.1 + 3.3.2 A smart and easy to use C++ SQLite3 wrapper. Sébastien Rombauts diff --git a/sqlite3/CMakeLists.txt b/sqlite3/CMakeLists.txt index 0695c715..5c34514a 100644 --- a/sqlite3/CMakeLists.txt +++ b/sqlite3/CMakeLists.txt @@ -1,6 +1,6 @@ # CMake file for compiling the sqlite3 static library under Windows (for ease of use) # -# Copyright (c) 2012-2023 Sebastien Rombauts (sebastien.rombauts@gmail.com) +# Copyright (c) 2012-2024 Sebastien Rombauts (sebastien.rombauts@gmail.com) # # Distributed under the MIT License (MIT) (See accompanying file LICENSE.txt # or copy at http://opensource.org/licenses/MIT) diff --git a/src/Backup.cpp b/src/Backup.cpp index a2bc23ee..8e846c73 100644 --- a/src/Backup.cpp +++ b/src/Backup.cpp @@ -4,7 +4,7 @@ * @brief Backup is used to backup a database file in a safe and online way. * * Copyright (c) 2015 Shibao HONG (shibaohong@outlook.com) - * Copyright (c) 2015-2023 Sebastien Rombauts (sebastien.rombauts@gmail.com) + * Copyright (c) 2015-2024 Sebastien Rombauts (sebastien.rombauts@gmail.com) * * Distributed under the MIT License (MIT) (See accompanying file LICENSE.txt * or copy at http://opensource.org/licenses/MIT) diff --git a/src/Column.cpp b/src/Column.cpp index 436cfd2d..dfc6788f 100644 --- a/src/Column.cpp +++ b/src/Column.cpp @@ -3,7 +3,7 @@ * @ingroup SQLiteCpp * @brief Encapsulation of a Column in a row of the result pointed by the prepared SQLite::Statement. * - * Copyright (c) 2012-2023 Sebastien Rombauts (sebastien.rombauts@gmail.com) + * Copyright (c) 2012-2024 Sebastien Rombauts (sebastien.rombauts@gmail.com) * * Distributed under the MIT License (MIT) (See accompanying file LICENSE.txt * or copy at http://opensource.org/licenses/MIT) diff --git a/src/Database.cpp b/src/Database.cpp index f0d8d282..320695ff 100644 --- a/src/Database.cpp +++ b/src/Database.cpp @@ -3,7 +3,7 @@ * @ingroup SQLiteCpp * @brief Management of a SQLite Database Connection. * - * Copyright (c) 2012-2023 Sebastien Rombauts (sebastien.rombauts@gmail.com) + * Copyright (c) 2012-2024 Sebastien Rombauts (sebastien.rombauts@gmail.com) * * Distributed under the MIT License (MIT) (See accompanying file LICENSE.txt * or copy at http://opensource.org/licenses/MIT) diff --git a/src/Exception.cpp b/src/Exception.cpp index 8f21f406..2a3d048d 100644 --- a/src/Exception.cpp +++ b/src/Exception.cpp @@ -3,7 +3,7 @@ * @ingroup SQLiteCpp * @brief Encapsulation of the error message from SQLite3 on a std::runtime_error. * - * Copyright (c) 2012-2023 Sebastien Rombauts (sebastien.rombauts@gmail.com) + * Copyright (c) 2012-2024 Sebastien Rombauts (sebastien.rombauts@gmail.com) * * Distributed under the MIT License (MIT) (See accompanying file LICENSE.txt * or copy at http://opensource.org/licenses/MIT) diff --git a/src/Savepoint.cpp b/src/Savepoint.cpp index c66bf5f9..54004986 100644 --- a/src/Savepoint.cpp +++ b/src/Savepoint.cpp @@ -5,7 +5,7 @@ * secured operation. Similar to a transaction while allowing child savepoints. * * Copyright (c) 2020 Kelvin Hammond (hammond.kelvin@gmail.com) - * Copyright (c) 2020-2023 Sebastien Rombauts (sebastien.rombauts@gmail.com) + * Copyright (c) 2020-2024 Sebastien Rombauts (sebastien.rombauts@gmail.com) * * Distributed under the MIT License (MIT) (See accompanying file LICENSE.txt or * copy at http://opensource.org/licenses/MIT) diff --git a/src/Statement.cpp b/src/Statement.cpp index 50ebe7a9..96f25d03 100644 --- a/src/Statement.cpp +++ b/src/Statement.cpp @@ -3,7 +3,7 @@ * @ingroup SQLiteCpp * @brief A prepared SQLite Statement is a compiled SQL query ready to be executed, pointing to a row of result. * - * Copyright (c) 2012-2023 Sebastien Rombauts (sebastien.rombauts@gmail.com) + * Copyright (c) 2012-2024 Sebastien Rombauts (sebastien.rombauts@gmail.com) * * Distributed under the MIT License (MIT) (See accompanying file LICENSE.txt * or copy at http://opensource.org/licenses/MIT) diff --git a/src/Transaction.cpp b/src/Transaction.cpp index 9beca3b4..be357e30 100644 --- a/src/Transaction.cpp +++ b/src/Transaction.cpp @@ -3,7 +3,7 @@ * @ingroup SQLiteCpp * @brief A Transaction is way to group multiple SQL statements into an atomic secured operation. * - * Copyright (c) 2012-2023 Sebastien Rombauts (sebastien.rombauts@gmail.com) + * Copyright (c) 2012-2024 Sebastien Rombauts (sebastien.rombauts@gmail.com) * * Distributed under the MIT License (MIT) (See accompanying file LICENSE.txt * or copy at http://opensource.org/licenses/MIT) diff --git a/tests/Column_test.cpp b/tests/Column_test.cpp index ed23bf03..4417cb17 100644 --- a/tests/Column_test.cpp +++ b/tests/Column_test.cpp @@ -3,7 +3,7 @@ * @ingroup tests * @brief Test of a SQLiteCpp Column. * - * Copyright (c) 2012-2023 Sebastien Rombauts (sebastien.rombauts@gmail.com) + * Copyright (c) 2012-2024 Sebastien Rombauts (sebastien.rombauts@gmail.com) * * Distributed under the MIT License (MIT) (See accompanying file LICENSE.txt * or copy at http://opensource.org/licenses/MIT) diff --git a/tests/Database_test.cpp b/tests/Database_test.cpp index 87eadb53..ec9adefa 100644 --- a/tests/Database_test.cpp +++ b/tests/Database_test.cpp @@ -3,7 +3,7 @@ * @ingroup tests * @brief Test of a SQLiteCpp Database. * - * Copyright (c) 2012-2023 Sebastien Rombauts (sebastien.rombauts@gmail.com) + * Copyright (c) 2012-2024 Sebastien Rombauts (sebastien.rombauts@gmail.com) * * Distributed under the MIT License (MIT) (See accompanying file LICENSE.txt * or copy at http://opensource.org/licenses/MIT)