Skip to content

Commit cacfe44

Browse files
authored
[BUILD] Upgrade nlohmann_json to 3.12.0 (#3406)
1 parent 546fcd7 commit cacfe44

File tree

6 files changed

+10
-7
lines changed

6 files changed

+10
-7
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,9 @@ Increment the:
4646
[#3320](https://github.com/open-telemetry/opentelemetry-cpp/pull/3220)
4747
[#3368](https://github.com/open-telemetry/opentelemetry-cpp/pull/3368)
4848

49+
* [BUILD] Upgrade nlohmann_json to 3.12.0
50+
[#3406](https://github.com/open-telemetry/opentelemetry-cpp/pull/3406)
51+
4952
## [1.20 2025-04-01]
5053

5154
* [BUILD] Update opentelemetry-proto version

MODULE.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ bazel_dep(name = "abseil-cpp", version = "20240116.1", repo_name = "com_google_a
1212
bazel_dep(name = "bazel_skylib", version = "1.5.0")
1313
bazel_dep(name = "curl", version = "8.8.0")
1414
bazel_dep(name = "grpc", version = "1.63.1.bcr.1", repo_name = "com_github_grpc_grpc")
15-
bazel_dep(name = "nlohmann_json", version = "3.11.3", repo_name = "github_nlohmann_json")
15+
bazel_dep(name = "nlohmann_json", version = "3.12.0", repo_name = "github_nlohmann_json")
1616
bazel_dep(name = "opentelemetry-proto", version = "1.5.0", repo_name = "com_github_opentelemetry_proto")
1717
bazel_dep(name = "opentracing-cpp", version = "1.6.0", repo_name = "com_github_opentracing")
1818
bazel_dep(name = "platforms", version = "0.0.8")

bazel/repository.bzl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,9 @@ def opentelemetry_cpp_deps():
100100
http_archive,
101101
name = "github_nlohmann_json",
102102
build_file = "@io_opentelemetry_cpp//bazel:nlohmann_json.BUILD",
103-
sha256 = "a22461d13119ac5c78f205d3df1db13403e58ce1bb1794edc9313677313f4a9d",
103+
sha256 = "b8cb0ef2dd7f57f18933997c9934bb1fa962594f701cd5a8d3c2c80541559372",
104104
urls = [
105-
"https://github.com/nlohmann/json/releases/download/v3.11.3/include.zip",
105+
"https://github.com/nlohmann/json/releases/download/v3.12.0/include.zip",
106106
],
107107
)
108108

install/conan/conanfile_latest.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ libcurl/8.12.1
77
abseil/20240116.2
88
protobuf/5.27.0
99
grpc/1.67.1
10-
nlohmann_json/3.11.3
10+
nlohmann_json/3.12.0
1111
prometheus-cpp/1.3.0
1212
opentracing-cpp/1.6.0
1313

@@ -37,4 +37,4 @@ CMakeToolchain
3737
CMakeDeps
3838

3939
[layout]
40-
cmake_layout
40+
cmake_layout

third_party/nlohmann-json

Submodule nlohmann-json updated 837 files

third_party_release

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ abseil=20240116.1
1818
benchmark=v1.8.3
1919
googletest=1.14.0
2020
ms-gsl=v3.1.0-67-g6f45293
21-
nlohmann-json=v3.11.3
21+
nlohmann-json=v3.12.0
2222
opentelemetry-proto=v1.5.0
2323
opentracing-cpp=v1.6.0
2424
prometheus-cpp=v1.3.0

0 commit comments

Comments
 (0)