[sqlite-orm] Update SQLite ORM to 1.8 (#28988)

* [sqlite-orm] Update to 1.8.0 * [sqlite-orm] Added "license" field to manifest * [sqlite-orm] Update to 1.8.1 * [sqlite-orm] Corrected deprecated license * [sqlite-orm] Removed unmerged 1.8.0 version from versions file * [sqlite-orm] Revert: Removed unmerged 1.8.0 version from versions file This reverts commit ebd658f. * [sqlite-orm] Ran `.\vcpkg x-add-version sqlite-orm` again * [sqlite-orm] Removed unmerged 1.8.0 version from versions file
microsoft · Jan 31, 2023 · b4f29c5 · b4f29c5
1 parent e9dbd36
commit b4f29c5
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 20 deletions.
diff --git a/ports/sqlite-orm/fix-dependency.patch b/ports/sqlite-orm/fix-dependency.patch
@@ -1,5 +1,5 @@
 diff --git a/cmake/SqliteOrmConfig.cmake.in b/cmake/SqliteOrmConfig.cmake.in
-index e0635d2..30403cd 100644
+index e0635d28a..30403cd41 100644
 --- a/cmake/SqliteOrmConfig.cmake.in
 +++ b/cmake/SqliteOrmConfig.cmake.in
 @@ -1,4 +1,4 @@

diff --git a/ports/sqlite-orm/fix-features-build-error.patch b/ports/sqlite-orm/fix-features-build-error.patch
@@ -1,7 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 436d30a6d..d64f3cbb7 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -31,15 +31,14 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
+@@ -35,15 +35,14 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
  include(CTest)
 
  ### Dependencies
@@ -20,7 +21,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
  target_sources(sqlite_orm INTERFACE $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include/sqlite_orm/sqlite_orm.h>)
 
 diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
-index 2857b65..3ee46e6 100644
+index 2857b659e..3ee46e625 100644
 --- a/examples/CMakeLists.txt
 +++ b/examples/CMakeLists.txt
 @@ -4,5 +4,5 @@ file(GLOB files "*.cpp")
@@ -30,16 +31,3 @@ index 2857b65..3ee46e6 100644
 -    target_link_libraries(${file_basename} PRIVATE sqlite_orm sqlite3)
 +    target_link_libraries(${file_basename} PRIVATE sqlite_orm)
  endforeach()
-diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
-index fd41e70..8087899 100644
---- a/tests/CMakeLists.txt
-+++ b/tests/CMakeLists.txt
-@@ -0,6 +0,8 @@
- cmake_minimum_required (VERSION 3.2)
-
- option(SQLITE_ORM_OMITS_CODECVT "Omits codec testing" OFF)
-+
-+find_package(Catch2 CONFIG REQUIRED)
-
- add_executable(unit_tests
- 	tests.cpp
diff --git a/ports/sqlite-orm/portfile.cmake b/ports/sqlite-orm/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO fnc12/sqlite_orm
-    REF v1.7.1
-    SHA512 ab934959245e8e0aaefd543ef0c1ab336547e4c311aff9dda916c7577c006622dec917313350d0d8bde4366d42b458c915fc2ea2fb927c01910fe429e55c8bbc
+    REF v1.8.1
+    SHA512 ada0571a5fb5f8eaec24b5046b9b7eb4de4656ebf5b9e413be8e7348d2169b34111a423c8af3128baaed48dbc945bbce0b1794527f737818b1c9153a13bbcb9a
     HEAD_REF master
     PATCHES 
         fix-features-build-error.patch
@@ -22,6 +22,7 @@ vcpkg_cmake_configure(
     OPTIONS
         ${FEATURE_OPTIONS}
         -DSQLITE_ORM_ENABLE_CXX_17=OFF
+        -DSQLITE_ORM_ENABLE_CXX_20=OFF
 )
 
 vcpkg_cmake_install()

diff --git a/ports/sqlite-orm/vcpkg.json b/ports/sqlite-orm/vcpkg.json
@@ -1,8 +1,9 @@
 {
   "name": "sqlite-orm",
-  "version": "1.7.1",
+  "version": "1.8.1",
   "description": "SQLite ORM light header only library for modern C++",
   "homepage": "https://github.com/fnc12/sqlite_orm",
+  "license": "AGPL-3.0-or-later OR MIT",
   "dependencies": [
     "sqlite3",
     {

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -7325,7 +7325,7 @@
       "port-version": 1
     },
     "sqlite-orm": {
-      "baseline": "1.7.1",
+      "baseline": "1.8.1",
       "port-version": 0
     },
     "sqlite3": {

diff --git a/versions/s-/sqlite-orm.json b/versions/s-/sqlite-orm.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "cbb80bd62fb69f81d00cc551f1033b31df52ca2d",
+      "version": "1.8.1",
+      "port-version": 0
+    },
     {
       "git-tree": "a065a6f10e3d75198b433530fd91853eb691c325",
       "version": "1.7.1",