From d81287857a52fc485d5e21252a461326584f23e6 Mon Sep 17 00:00:00 2001 From: maleo Date: Fri, 7 Jun 2024 10:11:13 +0000 Subject: [PATCH] Use upstream BUILD file in nlohmann json --- bazel/nlohmann_json.BUILD | 27 --------------------------- bazel/workspace0.bzl | 1 - docfx/BUILD.bazel | 4 ++-- generator/BUILD.bazel | 2 +- google/cloud/BUILD.bazel | 2 +- google/cloud/storage/BUILD.bazel | 4 ++-- 6 files changed, 6 insertions(+), 34 deletions(-) delete mode 100644 bazel/nlohmann_json.BUILD diff --git a/bazel/nlohmann_json.BUILD b/bazel/nlohmann_json.BUILD deleted file mode 100644 index c59be3ccf0db0..0000000000000 --- a/bazel/nlohmann_json.BUILD +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 2020 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -package(default_visibility = ["//visibility:public"]) - -licenses(["notice"]) # Apache 2.0 - -cc_library( - name = "nlohmann_json", - hdrs = glob([ - "include/nlohmann/*.hpp", - "include/nlohmann/**/*.hpp", - ]), - includes = ["include"], - visibility = ["//visibility:public"], -) diff --git a/bazel/workspace0.bzl b/bazel/workspace0.bzl index ab2e92207cfb6..3be1b8634ac0f 100644 --- a/bazel/workspace0.bzl +++ b/bazel/workspace0.bzl @@ -212,7 +212,6 @@ def gl_cpp_workspace0(name = None): ], sha256 = "0d8ef5af7f9794e3263480193c491549b2ba6cc74bb018906202ada498a79406", strip_prefix = "json-3.11.3", - build_file = Label("//bazel:nlohmann_json.BUILD"), ) # Load google/crc32c, a library to efficiently compute CRC32C checksums. diff --git a/docfx/BUILD.bazel b/docfx/BUILD.bazel index dcb5eef07f0fc..2960304936fca 100644 --- a/docfx/BUILD.bazel +++ b/docfx/BUILD.bazel @@ -32,7 +32,7 @@ cc_library( }), deps = [ "@com_github_jbeder_yaml_cpp//:yaml-cpp", - "@com_github_nlohmann_json//:nlohmann_json", + "@com_github_nlohmann_json//:json", "@com_github_zeux_pugixml//:pugixml", ], ) @@ -50,7 +50,7 @@ cc_library( deps = [ ":docfx", "@com_github_jbeder_yaml_cpp//:yaml-cpp", - "@com_github_nlohmann_json//:nlohmann_json", + "@com_github_nlohmann_json//:json", "@com_github_zeux_pugixml//:pugixml", ], ) diff --git a/generator/BUILD.bazel b/generator/BUILD.bazel index aaecc064eab95..65ba625e94ab1 100644 --- a/generator/BUILD.bazel +++ b/generator/BUILD.bazel @@ -34,7 +34,7 @@ cc_library( "//:common", "//google/cloud:google_cloud_cpp_rest_internal", "@com_github_jbeder_yaml_cpp//:yaml-cpp", - "@com_github_nlohmann_json//:nlohmann_json", + "@com_github_nlohmann_json//:json", "@com_google_absl//absl/strings", "@com_google_absl//absl/strings:str_format", "@com_google_googleapis//:googleapis_system_includes", diff --git a/google/cloud/BUILD.bazel b/google/cloud/BUILD.bazel index 33cb29a85ee6a..508dd180ae18d 100644 --- a/google/cloud/BUILD.bazel +++ b/google/cloud/BUILD.bazel @@ -300,7 +300,7 @@ cc_library( deps = [ ":google_cloud_cpp_common", "@com_github_curl_curl//:curl", - "@com_github_nlohmann_json//:nlohmann_json", + "@com_github_nlohmann_json//:json", "@com_google_absl//absl/functional:function_ref", "@com_google_absl//absl/types:span", ] + select({ diff --git a/google/cloud/storage/BUILD.bazel b/google/cloud/storage/BUILD.bazel index d84a12dbf48b4..9ee8aa44cf37b 100644 --- a/google/cloud/storage/BUILD.bazel +++ b/google/cloud/storage/BUILD.bazel @@ -77,7 +77,7 @@ cc_library( "@com_github_curl_curl//:curl", "@com_github_google_crc32c//:crc32c", "@com_github_grpc_grpc//:grpc++", - "@com_github_nlohmann_json//:nlohmann_json", + "@com_github_nlohmann_json//:json", "@com_google_absl//absl/algorithm:container", "@com_google_absl//absl/strings", "@com_google_absl//absl/time", @@ -143,7 +143,7 @@ cc_library( "//google/cloud:google_cloud_cpp_rest_internal", "@com_github_curl_curl//:curl", "@com_github_google_crc32c//:crc32c", - "@com_github_nlohmann_json//:nlohmann_json", + "@com_github_nlohmann_json//:json", "@com_google_absl//absl/strings:cord", "@com_google_absl//absl/strings:str_format", "@com_google_absl//absl/time",