Skip to content

bumped jsonlogic version #41

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
sbromberger merged 3 commits into from
Mar 7, 2026
Merged

bumped jsonlogic version #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9ac4e00
bumped jsonlogic version
sbromberger Mar 5, 2026
ab6f68e
devcontainer + 0.5.2 version
sbromberger Mar 7, 2026
c7d1fd0
0.2.3
sbromberger Mar 7, 2026
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
17 changes: 13 additions & 4 deletions .devcontainer/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,19 @@
"vscode": {
"extensions": [
"llvm-vs-code-extensions.vscode-clangd",
"ms-python.python"
// add other extensions as needed
]
"ms-vscode.cmake-tools",
"ms-python.python",
"charliermarsh.ruff"
],
"settings": {
"[cpp]": {
"editor.defaultFormatter": "llvm-vs-code-extensions.vscode-clangd"
},
"clangd.checkUpdates": true,
"cmake.debugConfig": { "MIMode": "lldb" },
"cmake.options.statusBarVisibility": "compact"
}
}
},
}
//"postCreateCommand": "pip install --break-system-packages -r ${containerWorkspaceFolder}/test/requirements.txt"
}
9 changes: 5 additions & 4 deletions cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ cmake_policy(SET CMP0135 NEW)
endif()

project(CLIPPy
VERSION 0.5.1
VERSION 0.5.2
DESCRIPTION "Command Line Interface Plus Python"
LANGUAGES CXX)

Expand Down Expand Up @@ -59,7 +59,7 @@ set(JSONLOGIC_FETCH_GIT
"https://github.com/LLNL/jsonlogic.git"
CACHE STRING "GIT to fetch JsonLogic")

set(BOOST_INCLUDE_LIBRARIES json lexical_cast range)
set(BOOST_INCLUDE_LIBRARIES json lexical_cast range regex)
set(BUILD_SHARED_LIBS ON)
FetchContent_Declare(
Boost
Expand All @@ -69,11 +69,12 @@ FetchContent_MakeAvailable(Boost)

#
# JSONLogic
set(Boost_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/boost-install) # needed for jsonlogic
# set(Boost_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/boost-install) # needed for jsonlogic
set(Boost_INCLUDE_DIR ${boost_SOURCE_DIR})

FetchContent_Declare(jsonlogic
GIT_REPOSITORY ${JSONLOGIC_FETCH_GIT}
GIT_TAG v0.2.0
GIT_TAG v0.2.3
SOURCE_SUBDIR cpp
)
# set(jsonlogic_INCLUDE_DIR ${jsonlogic_SOURCE_DIR}/cpp/include/jsonlogic)
Expand Down
2 changes: 1 addition & 1 deletion cpp/examples/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ function ( add_test class_name method_name )
include/
${jsonlogic_SOURCE_DIR}/cpp/include
)
target_link_libraries(${target} PRIVATE Boost::json)
target_link_libraries(${target} PRIVATE Boost::json Boost::regex)
endfunction()


Expand Down
2 changes: 1 addition & 1 deletion py/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"

[project]
name = "llnl-clippy"
version = "0.5.1"
version = "0.5.2"
authors = [
{ name="Roger Pearce"}, { name="Seth Bromberger"}
]
Expand Down
2 changes: 1 addition & 1 deletion py/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
semver >= 3.0
jsonlogic-py == 0.2.1
jsonlogic-py == 0.2.3
Loading