Skip to content

update trait dependencies to support CMake v4 #379

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
May 13, 2025
Merged

update trait dependencies to support CMake v4 #379

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e02651b
update nlohmann-json to 3.12.0 (fix cmake min version)
dmazzella Apr 18, 2025
2f201fe
Bump fetch ver
prince-chrismc Apr 23, 2025
e5d6394
3.12 md5
prince-chrismc Apr 23, 2025
3c88b17
Limit hunter cmake version
prince-chrismc Apr 23, 2025
d988cfc
Merge branch 'master' into patch-2
prince-chrismc May 13, 2025
30ec292
bump jsoncpp version as well
prince-chrismc May 13, 2025
fbb9453
bump workflow as well as default
prince-chrismc May 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/actions/install/nlohmann-json/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ inputs:
version:
description: The desired nlohmann-json version to install
required: false
default: "3.11.2"
default: "3.12.0"
runs:
using: composite
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/install/open-source-parsers-jsoncpp/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ inputs:
version:
description: The desired open-source-parsers/jsoncpp version to install
required: false
default: "1.9.5"
default: "1.9.6"
runs:
using: composite
steps:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/cmake.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,8 @@ jobs:
steps:
- uses: actions/checkout@v4
- uses: lukka/get-cmake@latest
with:
cmakeVersion: "~3.25.0" # <--= optional, use most recent 3.25.x version

- name: setup
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/traits.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ jobs:
target:
- { name: "danielaparker-jsoncons", tag: "1.3.2", version: "v1.3.2" }
- { name: "boost-json", tag: "1.78.0", version: "v1.80.0" }
- { name: "nlohmann-json", tag: "3.11.2", version: "v3.11.2" }
- { name: "nlohmann-json", tag: "3.12.0", version: "v3.12.0" }
- { name: "kazuho-picojson", tag: "111c9be5188f7350c2eac9ddaedd8cca3d7bf394", version: "111c9be" }
- { name: "open-source-parsers-jsoncpp", tag: "1.9.5", version: "v1.9.5" }
- { name: "open-source-parsers-jsoncpp", tag: "1.9.6", version: "v1.9.6" }
steps:
- uses: actions/checkout@v4
- uses: lukka/get-cmake@latest
Expand Down
4 changes: 2 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,8 @@ if(JWT_BUILD_EXAMPLES OR JWT_BUILD_TESTS)
message(STATUS "jwt-cpp: using FetchContent for nlohmann-json required for tests")
include(FetchContent)
fetchcontent_declare(nlohmann_json
URL https://github.com/nlohmann/json/releases/download/v3.11.2/json.tar.xz
URL_MD5 127794b2c82c0c5693805feaa2a703e2)
URL https://github.com/nlohmann/json/releases/download/v3.12.0/json.tar.xz
URL_MD5 e155202b2a589137f6804724bd182f12)
fetchcontent_makeavailable(nlohmann_json)
endif()
endif()
Expand Down
Loading