Skip to content

Commit

Permalink
[json] Remove com_github_nlohmann_json override & patch (#2030)
Browse files Browse the repository at this point in the history
The patch is no longer needed as it was similarly patched upstream in
nlohmann/json#3101.

That patch was then shipped in v3.10.5, which is the version used in Envoy now.

Signed-off-by: JP Simard <jp@jpsim.com>
  • Loading branch information
jpsim committed Nov 29, 2022
1 parent 72da5c9 commit 67bade4
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 60 deletions.
12 changes: 0 additions & 12 deletions mobile/bazel/envoy_mobile_repositories.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -69,18 +69,6 @@ def upstream_envoy_overrides():
urls = ["https://github.com/bazelbuild/rules_python/archive/6f37aa9966f53e063c41b7509a386d53a9f156c3.tar.gz"],
)

http_archive(
name = "com_github_nlohmann_json",
# 3.10.4 introduced incompatible changes with Envoy Mobile. Until Envoy Mobile updates it's
# minimum iOS version to 13+ this dependency needs to be patched.
patches = ["@envoy_mobile//bazel:json.patch"],
patch_args = ["-p1"],
sha256 = "1155fd1a83049767360e9a120c43c578145db3204d2b309eba49fbbedd0f4ed3",
strip_prefix = "json-3.10.4",
urls = ["https://github.com/nlohmann/json/archive/v3.10.4.tar.gz"],
build_file = "@envoy//bazel/external:json.BUILD",
)

def swift_repos():
http_archive(
name = "build_bazel_rules_apple",
Expand Down
48 changes: 0 additions & 48 deletions mobile/bazel/json.patch

This file was deleted.

0 comments on commit 67bade4

Please sign in to comment.