From 5b95f0ec3dd78ffd173418a6a160a91f6d6388ce Mon Sep 17 00:00:00 2001 From: Jose Nino Date: Thu, 28 Oct 2021 16:32:46 -0700 Subject: [PATCH 1/4] envoy: c926499ed Signed-off-by: Jose Nino --- envoy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/envoy b/envoy index c6873083a4..c926499edb 160000 --- a/envoy +++ b/envoy @@ -1 +1 @@ -Subproject commit c6873083a420c7ec698e7bf28d080531c7d55003 +Subproject commit c926499edb794c94232d29f4e54a1d81df16d2e2 From ec81cfbc364e988dc691e6eeb93b96626bbff0d4 Mon Sep 17 00:00:00 2001 From: Jose Nino Date: Fri, 29 Oct 2021 11:39:47 -0700 Subject: [PATCH 2/4] pin com_github_nlohmann_json to a compatible version Signed-off-by: Jose Nino --- bazel/envoy_mobile_repositories.bzl | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/bazel/envoy_mobile_repositories.bzl b/bazel/envoy_mobile_repositories.bzl index 9956bc4327..81410a9501 100644 --- a/bazel/envoy_mobile_repositories.bzl +++ b/bazel/envoy_mobile_repositories.bzl @@ -69,6 +69,15 @@ 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 cannot be updated. + sha256 = "081ed0f9f89805c2d96335c3acfa993b39a0a5b4b4cef7edb68dd2210a13458c", + strip_prefix = "json-3.10.2", + urls = ["https://github.com/nlohmann/json/archive/v3.10.2.tar.gz"], + ), + def swift_repos(): http_archive( name = "build_bazel_rules_apple", From 0f5c677ec3a20e20614e358f43bb78a89e45d321 Mon Sep 17 00:00:00 2001 From: Jose Nino Date: Fri, 29 Oct 2021 11:42:55 -0700 Subject: [PATCH 3/4] pin com_github_nlohmann_json to a compatible version Signed-off-by: Jose Nino --- bazel/envoy_mobile_repositories.bzl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bazel/envoy_mobile_repositories.bzl b/bazel/envoy_mobile_repositories.bzl index 81410a9501..54afe0eeec 100644 --- a/bazel/envoy_mobile_repositories.bzl +++ b/bazel/envoy_mobile_repositories.bzl @@ -76,7 +76,7 @@ def upstream_envoy_overrides(): sha256 = "081ed0f9f89805c2d96335c3acfa993b39a0a5b4b4cef7edb68dd2210a13458c", strip_prefix = "json-3.10.2", urls = ["https://github.com/nlohmann/json/archive/v3.10.2.tar.gz"], - ), + ) def swift_repos(): http_archive( From 51bdfc798408d7cdb587bbe48584f9c691e921a1 Mon Sep 17 00:00:00 2001 From: Jose Nino Date: Fri, 29 Oct 2021 11:57:00 -0700 Subject: [PATCH 4/4] build file Signed-off-by: Jose Nino --- bazel/envoy_mobile_repositories.bzl | 1 + 1 file changed, 1 insertion(+) diff --git a/bazel/envoy_mobile_repositories.bzl b/bazel/envoy_mobile_repositories.bzl index 54afe0eeec..e583f3f977 100644 --- a/bazel/envoy_mobile_repositories.bzl +++ b/bazel/envoy_mobile_repositories.bzl @@ -76,6 +76,7 @@ def upstream_envoy_overrides(): sha256 = "081ed0f9f89805c2d96335c3acfa993b39a0a5b4b4cef7edb68dd2210a13458c", strip_prefix = "json-3.10.2", urls = ["https://github.com/nlohmann/json/archive/v3.10.2.tar.gz"], + build_file = "@envoy//bazel/external:json.BUILD", ) def swift_repos():