Skip to content

Commit d3b93ef

Browse files
update trait dependencies to support CMake v4 (Thalhammer#379)
* update nlohmann-json to 3.12.0 (fix cmake min version) * Bump fetch ver Needs new md5 * 3.12 md5 * Limit hunter cmake version * bump jsoncpp version to v1.9.6 as well * bump workflow as well as default --------- Co-authored-by: Chris Mc <prince.chrismc@gmail.com>
1 parent 82e5dae commit d3b93ef

File tree

5 files changed

+8
-6
lines changed

5 files changed

+8
-6
lines changed

.github/actions/install/nlohmann-json/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ inputs:
44
version:
55
description: The desired nlohmann-json version to install
66
required: false
7-
default: "3.11.2"
7+
default: "3.12.0"
88
runs:
99
using: composite
1010
steps:

.github/actions/install/open-source-parsers-jsoncpp/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ inputs:
44
version:
55
description: The desired open-source-parsers/jsoncpp version to install
66
required: false
7-
default: "1.9.5"
7+
default: "1.9.6"
88
runs:
99
using: composite
1010
steps:

.github/workflows/cmake.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,8 @@ jobs:
259259
steps:
260260
- uses: actions/checkout@v4
261261
- uses: lukka/get-cmake@latest
262+
with:
263+
cmakeVersion: "~3.25.0" # <--= optional, use most recent 3.25.x version
262264

263265
- name: setup
264266
run: |

.github/workflows/traits.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ jobs:
1515
target:
1616
- { name: "danielaparker-jsoncons", tag: "1.3.2", version: "v1.3.2" }
1717
- { name: "boost-json", tag: "1.78.0", version: "v1.80.0" }
18-
- { name: "nlohmann-json", tag: "3.11.2", version: "v3.11.2" }
18+
- { name: "nlohmann-json", tag: "3.12.0", version: "v3.12.0" }
1919
- { name: "kazuho-picojson", tag: "111c9be5188f7350c2eac9ddaedd8cca3d7bf394", version: "111c9be" }
20-
- { name: "open-source-parsers-jsoncpp", tag: "1.9.5", version: "v1.9.5" }
20+
- { name: "open-source-parsers-jsoncpp", tag: "1.9.6", version: "v1.9.6" }
2121
steps:
2222
- uses: actions/checkout@v4
2323
- uses: lukka/get-cmake@latest

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@ if(JWT_BUILD_EXAMPLES OR JWT_BUILD_TESTS)
8181
message(STATUS "jwt-cpp: using FetchContent for nlohmann-json required for tests")
8282
include(FetchContent)
8383
fetchcontent_declare(nlohmann_json
84-
URL https://github.com/nlohmann/json/releases/download/v3.11.2/json.tar.xz
85-
URL_MD5 127794b2c82c0c5693805feaa2a703e2)
84+
URL https://github.com/nlohmann/json/releases/download/v3.12.0/json.tar.xz
85+
URL_MD5 e155202b2a589137f6804724bd182f12)
8686
fetchcontent_makeavailable(nlohmann_json)
8787
endif()
8888
endif()

0 commit comments

Comments
 (0)