diff --git a/Changelog.md b/Changelog.md index 6205e72b1..48257696d 100644 --- a/Changelog.md +++ b/Changelog.md @@ -23,6 +23,10 @@ AST Changes: * AST: add the ``internalFunctionID`` field to the AST nodes of functions that may be called via the internal dispatch. These IDs are always generated, but they are only used in via-IR code generation. +Build System: + * Update internal dependency of jsoncpp to 1.9.5. + + ### 0.8.19 (2023-02-22) Language Features: diff --git a/cmake/jsoncpp.cmake b/cmake/jsoncpp.cmake index 29b8f5f05..6a42b8a3f 100644 --- a/cmake/jsoncpp.cmake +++ b/cmake/jsoncpp.cmake @@ -43,9 +43,9 @@ endif() ExternalProject_Add(jsoncpp-project PREFIX "${prefix}" DOWNLOAD_DIR "${CMAKE_SOURCE_DIR}/deps/downloads" - DOWNLOAD_NAME jsoncpp-1.9.3.tar.gz - URL https://github.com/open-source-parsers/jsoncpp/archive/1.9.3.tar.gz - URL_HASH SHA256=8593c1d69e703563d94d8c12244e2e18893eeb9a8a9f8aa3d09a327aa45c8f7d + DOWNLOAD_NAME jsoncpp-1.9.5.tar.gz + URL https://github.com/open-source-parsers/jsoncpp/archive/1.9.5.tar.gz + URL_HASH SHA256=f409856e5920c18d0c2fb85276e24ee607d2a09b5e7d5f0a371368903c275da2 CMAKE_COMMAND ${JSONCPP_CMAKE_COMMAND} CMAKE_ARGS -DCMAKE_INSTALL_PREFIX= -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} diff --git a/libsolutil/JSON.cpp b/libsolutil/JSON.cpp index d27982acb..1eb494eba 100644 --- a/libsolutil/JSON.cpp +++ b/libsolutil/JSON.cpp @@ -33,8 +33,8 @@ using namespace std; static_assert( - (JSONCPP_VERSION_MAJOR == 1) && (JSONCPP_VERSION_MINOR == 9) && (JSONCPP_VERSION_PATCH == 3), - "Unexpected jsoncpp version: " JSONCPP_VERSION_STRING ". Expecting 1.9.3." + (JSONCPP_VERSION_MAJOR == 1) && (JSONCPP_VERSION_MINOR == 9) && (JSONCPP_VERSION_PATCH == 5), + "Unexpected jsoncpp version: " JSONCPP_VERSION_STRING ". Expecting 1.9.5." ); namespace solidity::util diff --git a/scripts/create_source_tarball.sh b/scripts/create_source_tarball.sh index 1ea8c0b57..aab48199e 100755 --- a/scripts/create_source_tarball.sh +++ b/scripts/create_source_tarball.sh @@ -31,9 +31,9 @@ REPO_ROOT="$(dirname "$0")"/.. fi # Add dependencies mkdir -p "$SOLDIR/deps/downloads/" 2>/dev/null || true - jsoncpp_version="1.9.3" + jsoncpp_version="1.9.5" jsoncpp_package_path="$SOLDIR/deps/downloads/jsoncpp-${jsoncpp_version}.tar.gz" - jsoncpp_sha256=8593c1d69e703563d94d8c12244e2e18893eeb9a8a9f8aa3d09a327aa45c8f7d + jsoncpp_sha256=f409856e5920c18d0c2fb85276e24ee607d2a09b5e7d5f0a371368903c275da2 wget -O "$jsoncpp_package_path" "https://github.com/open-source-parsers/jsoncpp/archive/${jsoncpp_version}.tar.gz" if ! [ "$(sha256sum "$jsoncpp_package_path")" = "${jsoncpp_sha256} ${jsoncpp_package_path}" ] then diff --git a/scripts/release_ppa.sh b/scripts/release_ppa.sh index aff2e7c25..792bdbc22 100755 --- a/scripts/release_ppa.sh +++ b/scripts/release_ppa.sh @@ -125,7 +125,7 @@ mv solidity solc # Fetch dependencies mkdir -p ./solc/deps/downloads/ 2>/dev/null || true -wget -O ./solc/deps/downloads/jsoncpp-1.9.3.tar.gz https://github.com/open-source-parsers/jsoncpp/archive/1.9.3.tar.gz +wget -O ./solc/deps/downloads/jsoncpp-1.9.5.tar.gz https://github.com/open-source-parsers/jsoncpp/archive/1.9.5.tar.gz wget -O ./solc/deps/downloads/range-v3-0.12.0.tar.gz https://github.com/ericniebler/range-v3/archive/0.12.0.tar.gz wget -O ./solc/deps/downloads/fmt-8.0.1.tar.gz https://github.com/fmtlib/fmt/archive/8.0.1.tar.gz