Skip to content
This repository was archived by the owner on Dec 8, 2021. It is now read-only.

Commit 498d64d

Browse files
authored
Keep the //google/cloud/grpc_utils:google_cloud_cpp_grpc_utils target
around for backwards compatibility. The backwards compatibility headers are only available if one uses this target. The new target (one directory up) only gives you access to the new headers. No changes for CMake.
1 parent 2a96070 commit 498d64d

File tree

5 files changed

+73
-3
lines changed

5 files changed

+73
-3
lines changed

ci/test-install/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@ cc_test(
2323
],
2424
deps = [
2525
"@com_github_googleapis_google_cloud_cpp_common//google/cloud:google_cloud_cpp_common",
26-
"@com_github_googleapis_google_cloud_cpp_common//google/cloud:google_cloud_cpp_grpc_utils",
26+
"@com_github_googleapis_google_cloud_cpp_common//google/cloud/grpc_utils:google_cloud_cpp_grpc_utils",
2727
],
2828
)

google/cloud/BUILD

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,12 @@ load(":google_cloud_cpp_grpc_utils.bzl", "google_cloud_cpp_grpc_utils_hdrs", "go
6666
cc_library(
6767
name = "google_cloud_cpp_grpc_utils",
6868
srcs = google_cloud_cpp_grpc_utils_srcs,
69-
hdrs = google_cloud_cpp_grpc_utils_hdrs,
69+
# TODO(#171) - remove the filtering comprehension.
70+
hdrs = [
71+
header
72+
for header in google_cloud_cpp_grpc_utils_hdrs
73+
if not "grpc_utils/" in header
74+
],
7075
deps = [
7176
"//google/cloud:google_cloud_cpp_common",
7277
"@com_github_grpc_grpc//:grpc++",

google/cloud/completion_queue_test.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#include "google/cloud/grpc_utils/completion_queue.h"
15+
#include "google/cloud/completion_queue.h"
1616
#include "google/cloud/future.h"
1717
#include "google/cloud/testing_util/assert_ok.h"
1818
#include <google/bigtable/admin/v2/bigtable_table_admin.grpc.pb.h>

google/cloud/grpc_utils/BUILD

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
# Copyright 2020 Google LLC
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
package(default_visibility = ["//visibility:public"])
16+
17+
licenses(["notice"]) # Apache 2.0
18+
19+
# TODO(#171) - remove the backwards compatibility target.
20+
cc_library(
21+
name = "google_cloud_cpp_grpc_utils",
22+
srcs = [],
23+
hdrs = [
24+
"async_operation.h",
25+
"completion_queue.h",
26+
"grpc_error_delegate.h",
27+
"version.h",
28+
],
29+
deps = [
30+
"//google/cloud:google_cloud_cpp_common",
31+
"//google/cloud:google_cloud_cpp_grpc_utils",
32+
"@com_github_grpc_grpc//:grpc++",
33+
"@com_google_googleapis//:grpc_utils_protos",
34+
],
35+
)

google/cloud/samples/BUILD

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
# Copyright 2020 Google LLC
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
package(default_visibility = ["//visibility:public"])
16+
17+
licenses(["notice"]) # Apache 2.0
18+
19+
cc_test(
20+
name = "common_install_test",
21+
srcs = ["common_install_test.cc"],
22+
deps = [
23+
"//google/cloud:google_cloud_cpp_common",
24+
"//google/cloud:google_cloud_cpp_grpc_utils",
25+
"//google/cloud/grpc_utils:google_cloud_cpp_grpc_utils",
26+
"@com_github_grpc_grpc//:grpc++",
27+
"@com_google_googleapis//:grpc_utils_protos",
28+
"@com_google_googletest//:gtest",
29+
],
30+
)

0 commit comments

Comments
 (0)