diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9618233..4d93f5b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -22,7 +22,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-20.04, ubuntu-22.04, macos-13, macos-14] + os: [ubuntu-22.04, ubuntu-24.04, macos-13, macos-14] build_type: [static_build, shared_build] steps: diff --git a/CMakeLists.txt b/CMakeLists.txt index 1ebc4bb..15af51c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,7 @@ # The full license is in the file LICENSE, distributed with this software. # ############################################################################ -cmake_minimum_required(VERSION 3.4.3) +cmake_minimum_required(VERSION 3.20) project(xeus-sqlite) set(XEUS_SQLITE_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include) @@ -379,4 +379,4 @@ if(EMSCRIPTEN) "$/xsqlite.js" "$/xsqlite.wasm" DESTINATION ${CMAKE_INSTALL_BINDIR}) -endif() \ No newline at end of file +endif() diff --git a/environment-dev.yml b/environment-dev.yml index aa4e423..fc041e4 100644 --- a/environment-dev.yml +++ b/environment-dev.yml @@ -7,13 +7,13 @@ dependencies: - cxx-compiler # Host dependencies - nlohmann_json - - xeus-zmq>=3.0.0,<=4.0 + - xeus-zmq>=3.1.1,<=4.0 - sqlite - sqlitecpp - cpp-tabulate=1.5 - - xvega>=0.1.0 - - xproperty>=0.12.0 - - xvega-bindings>=0.1.0 + - xvega>=0.1.3 + - xproperty>=0.12.1 + - xvega-bindings>=0.1.1 # Test dependencies - pytest - jupyter_kernel_test diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 7c93015..ee60754 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.1) +cmake_minimum_required(VERSION 3.20) if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR) project(xeus_sqlite-test) diff --git a/test/downloadGTest.cmake.in b/test/downloadGTest.cmake.in index 67e7cb7..3613494 100644 --- a/test/downloadGTest.cmake.in +++ b/test/downloadGTest.cmake.in @@ -6,14 +6,14 @@ # The full license is in the file LICENSE, distributed with this software. # ############################################################################ -cmake_minimum_required(VERSION 2.8.2) +cmake_minimum_required(VERSION 3.20) project(googletest-download NONE) include(ExternalProject) ExternalProject_Add(googletest GIT_REPOSITORY https://github.com/google/googletest.git - GIT_TAG release-1.8.0 + GIT_TAG v1.17.0 SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/googletest-src" BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/googletest-build" CONFIGURE_COMMAND ""