Skip to content

Commit 310fd32

Browse files
authored
Merge pull request #149 from JohanMabille/upgrade
Upgraded dependencies and GHA runners
2 parents e125e69 + 7adf843 commit 310fd32

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
strategy:
2323
fail-fast: false
2424
matrix:
25-
os: [ubuntu-20.04, ubuntu-22.04, macos-13, macos-14]
25+
os: [ubuntu-22.04, ubuntu-24.04, macos-13, macos-14]
2626
build_type: [static_build, shared_build]
2727

2828
steps:

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
# The full license is in the file LICENSE, distributed with this software. #
88
############################################################################
99

10-
cmake_minimum_required(VERSION 3.4.3)
10+
cmake_minimum_required(VERSION 3.20)
1111
project(xeus-sqlite)
1212

1313
set(XEUS_SQLITE_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include)
@@ -379,4 +379,4 @@ if(EMSCRIPTEN)
379379
"$<TARGET_FILE_DIR:xsqlite>/xsqlite.js"
380380
"$<TARGET_FILE_DIR:xsqlite>/xsqlite.wasm"
381381
DESTINATION ${CMAKE_INSTALL_BINDIR})
382-
endif()
382+
endif()

environment-dev.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ dependencies:
77
- cxx-compiler
88
# Host dependencies
99
- nlohmann_json
10-
- xeus-zmq>=3.0.0,<=4.0
10+
- xeus-zmq>=3.1.1,<=4.0
1111
- sqlite
1212
- sqlitecpp
1313
- cpp-tabulate=1.5
14-
- xvega>=0.1.0
15-
- xproperty>=0.12.0
16-
- xvega-bindings>=0.1.0
14+
- xvega>=0.1.3
15+
- xproperty>=0.12.1
16+
- xvega-bindings>=0.1.1
1717
# Test dependencies
1818
- pytest
1919
- jupyter_kernel_test

test/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.1)
1+
cmake_minimum_required(VERSION 3.20)
22

33
if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
44
project(xeus_sqlite-test)

test/downloadGTest.cmake.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
# The full license is in the file LICENSE, distributed with this software. #
77
############################################################################
88

9-
cmake_minimum_required(VERSION 2.8.2)
9+
cmake_minimum_required(VERSION 3.20)
1010

1111
project(googletest-download NONE)
1212

1313
include(ExternalProject)
1414
ExternalProject_Add(googletest
1515
GIT_REPOSITORY https://github.com/google/googletest.git
16-
GIT_TAG release-1.8.0
16+
GIT_TAG v1.17.0
1717
SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/googletest-src"
1818
BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/googletest-build"
1919
CONFIGURE_COMMAND ""

0 commit comments

Comments
 (0)