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

Commit d1916ee

Browse files
devbwwdevbww
authored
chore: upgrade to google-cloud-cpp-common v0.18.0 (#1238)
Also picks up the pending upgrade to protobuf v3.11.3.
1 parent 5dcf1dc commit d1916ee

21 files changed

+114
-107
lines changed

‎INSTALL.md‎

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -242,9 +242,9 @@ all the Google Cloud C++ client libraries:
242242

243243
```bash
244244
cd $HOME/Downloads
245-
wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.16.0.tar.gz && \
246-
tar -xf v0.16.0.tar.gz && \
247-
cd google-cloud-cpp-common-0.16.0 && \
245+
wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.18.0.tar.gz && \
246+
tar -xf v0.18.0.tar.gz && \
247+
cd google-cloud-cpp-common-0.18.0 && \
248248
cmake -H. -Bcmake-out \
249249
-DBUILD_TESTING=OFF \
250250
-DGOOGLE_CLOUD_CPP_TESTING_UTIL_ENABLE_INSTALL=ON && \
@@ -298,9 +298,9 @@ Google Cloud Platform proto files:
298298

299299
```bash
300300
cd $HOME/Downloads
301-
wget -q https://github.com/google/protobuf/archive/v3.9.1.tar.gz && \
302-
tar -xf v3.9.1.tar.gz && \
303-
cd protobuf-3.9.1/cmake && \
301+
wget -q https://github.com/google/protobuf/archive/v3.11.3.tar.gz && \
302+
tar -xf v3.11.3.tar.gz && \
303+
cd protobuf-3.11.3/cmake && \
304304
cmake \
305305
-DCMAKE_BUILD_TYPE=Release \
306306
-DBUILD_SHARED_LIBS=yes \
@@ -398,9 +398,9 @@ all the Google Cloud C++ client libraries:
398398

399399
```bash
400400
cd $HOME/Downloads
401-
wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.16.0.tar.gz && \
402-
tar -xf v0.16.0.tar.gz && \
403-
cd google-cloud-cpp-common-0.16.0 && \
401+
wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.18.0.tar.gz && \
402+
tar -xf v0.18.0.tar.gz && \
403+
cd google-cloud-cpp-common-0.18.0 && \
404404
cmake -H. -Bcmake-out \
405405
-DBUILD_TESTING=OFF \
406406
-DGOOGLE_CLOUD_CPP_TESTING_UTIL_ENABLE_INSTALL=ON && \
@@ -441,9 +441,9 @@ Google Cloud Platform proto files:
441441

442442
```bash
443443
cd $HOME/Downloads
444-
wget -q https://github.com/google/protobuf/archive/v3.9.1.tar.gz && \
445-
tar -xf v3.9.1.tar.gz && \
446-
cd protobuf-3.9.1/cmake && \
444+
wget -q https://github.com/google/protobuf/archive/v3.11.3.tar.gz && \
445+
tar -xf v3.11.3.tar.gz && \
446+
cd protobuf-3.11.3/cmake && \
447447
cmake \
448448
-DCMAKE_BUILD_TYPE=Release \
449449
-DBUILD_SHARED_LIBS=yes \
@@ -526,9 +526,9 @@ all the Google Cloud C++ client libraries:
526526

527527
```bash
528528
cd $HOME/Downloads
529-
wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.16.0.tar.gz && \
530-
tar -xf v0.16.0.tar.gz && \
531-
cd google-cloud-cpp-common-0.16.0 && \
529+
wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.18.0.tar.gz && \
530+
tar -xf v0.18.0.tar.gz && \
531+
cd google-cloud-cpp-common-0.18.0 && \
532532
cmake -H. -Bcmake-out \
533533
-DBUILD_TESTING=OFF \
534534
-DGOOGLE_CLOUD_CPP_TESTING_UTIL_ENABLE_INSTALL=ON && \
@@ -569,9 +569,9 @@ Google Cloud Platform proto files:
569569

570570
```bash
571571
cd $HOME/Downloads
572-
wget -q https://github.com/google/protobuf/archive/v3.9.1.tar.gz && \
573-
tar -xf v3.9.1.tar.gz && \
574-
cd protobuf-3.9.1/cmake && \
572+
wget -q https://github.com/google/protobuf/archive/v3.11.3.tar.gz && \
573+
tar -xf v3.11.3.tar.gz && \
574+
cd protobuf-3.11.3/cmake && \
575575
cmake \
576576
-DCMAKE_BUILD_TYPE=Release \
577577
-DBUILD_SHARED_LIBS=yes \
@@ -669,9 +669,9 @@ all the Google Cloud C++ client libraries:
669669

670670
```bash
671671
cd $HOME/Downloads
672-
wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.16.0.tar.gz && \
673-
tar -xf v0.16.0.tar.gz && \
674-
cd google-cloud-cpp-common-0.16.0 && \
672+
wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.18.0.tar.gz && \
673+
tar -xf v0.18.0.tar.gz && \
674+
cd google-cloud-cpp-common-0.18.0 && \
675675
cmake -H. -Bcmake-out \
676676
-DBUILD_TESTING=OFF \
677677
-DGOOGLE_CLOUD_CPP_TESTING_UTIL_ENABLE_INSTALL=ON && \
@@ -770,9 +770,9 @@ all the Google Cloud C++ client libraries:
770770

771771
```bash
772772
cd $HOME/Downloads
773-
wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.16.0.tar.gz && \
774-
tar -xf v0.16.0.tar.gz && \
775-
cd google-cloud-cpp-common-0.16.0 && \
773+
wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.18.0.tar.gz && \
774+
tar -xf v0.18.0.tar.gz && \
775+
cd google-cloud-cpp-common-0.18.0 && \
776776
cmake -H. -Bcmake-out \
777777
-DBUILD_TESTING=OFF \
778778
-DGOOGLE_CLOUD_CPP_TESTING_UTIL_ENABLE_INSTALL=ON && \
@@ -820,9 +820,9 @@ Google Cloud Platform proto files:
820820

821821
```bash
822822
cd $HOME/Downloads
823-
wget -q https://github.com/google/protobuf/archive/v3.9.1.tar.gz && \
824-
tar -xf v3.9.1.tar.gz && \
825-
cd protobuf-3.9.1/cmake && \
823+
wget -q https://github.com/google/protobuf/archive/v3.11.3.tar.gz && \
824+
tar -xf v3.11.3.tar.gz && \
825+
cd protobuf-3.11.3/cmake && \
826826
cmake \
827827
-DCMAKE_BUILD_TYPE=Release \
828828
-DBUILD_SHARED_LIBS=yes \
@@ -905,9 +905,9 @@ all the Google Cloud C++ client libraries:
905905

906906
```bash
907907
cd $HOME/Downloads
908-
wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.16.0.tar.gz && \
909-
tar -xf v0.16.0.tar.gz && \
910-
cd google-cloud-cpp-common-0.16.0 && \
908+
wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.18.0.tar.gz && \
909+
tar -xf v0.18.0.tar.gz && \
910+
cd google-cloud-cpp-common-0.18.0 && \
911911
cmake -H. -Bcmake-out \
912912
-DBUILD_TESTING=OFF \
913913
-DGOOGLE_CLOUD_CPP_TESTING_UTIL_ENABLE_INSTALL=ON && \
@@ -960,9 +960,9 @@ Google Cloud Platform proto files:
960960

961961
```bash
962962
cd $HOME/Downloads
963-
wget -q https://github.com/google/protobuf/archive/v3.9.1.tar.gz && \
964-
tar -xf v3.9.1.tar.gz && \
965-
cd protobuf-3.9.1/cmake && \
963+
wget -q https://github.com/google/protobuf/archive/v3.11.3.tar.gz && \
964+
tar -xf v3.11.3.tar.gz && \
965+
cd protobuf-3.11.3/cmake && \
966966
cmake \
967967
-DCMAKE_BUILD_TYPE=Release \
968968
-DBUILD_SHARED_LIBS=yes \
@@ -1045,9 +1045,9 @@ all the Google Cloud C++ client libraries:
10451045

10461046
```bash
10471047
cd $HOME/Downloads
1048-
wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.16.0.tar.gz && \
1049-
tar -xf v0.16.0.tar.gz && \
1050-
cd google-cloud-cpp-common-0.16.0 && \
1048+
wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.18.0.tar.gz && \
1049+
tar -xf v0.18.0.tar.gz && \
1050+
cd google-cloud-cpp-common-0.18.0 && \
10511051
cmake -H. -Bcmake-out \
10521052
-DBUILD_TESTING=OFF \
10531053
-DGOOGLE_CLOUD_CPP_TESTING_UTIL_ENABLE_INSTALL=ON && \
@@ -1106,9 +1106,9 @@ Google Cloud Platform proto files:
11061106

11071107
```bash
11081108
cd $HOME/Downloads
1109-
wget -q https://github.com/google/protobuf/archive/v3.9.1.tar.gz && \
1110-
tar -xf v3.9.1.tar.gz && \
1111-
cd protobuf-3.9.1/cmake && \
1109+
wget -q https://github.com/google/protobuf/archive/v3.11.3.tar.gz && \
1110+
tar -xf v3.11.3.tar.gz && \
1111+
cd protobuf-3.11.3/cmake && \
11121112
cmake \
11131113
-DCMAKE_BUILD_TYPE=Release \
11141114
-DBUILD_SHARED_LIBS=yes \
@@ -1206,9 +1206,9 @@ all the Google Cloud C++ client libraries:
12061206

12071207
```bash
12081208
cd $HOME/Downloads
1209-
wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.16.0.tar.gz && \
1210-
tar -xf v0.16.0.tar.gz && \
1211-
cd google-cloud-cpp-common-0.16.0 && \
1209+
wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.18.0.tar.gz && \
1210+
tar -xf v0.18.0.tar.gz && \
1211+
cd google-cloud-cpp-common-0.18.0 && \
12121212
cmake -H. -Bcmake-out \
12131213
-DBUILD_TESTING=OFF \
12141214
-DGOOGLE_CLOUD_CPP_TESTING_UTIL_ENABLE_INSTALL=ON && \

‎README.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ in the [release notes](README.md#release-notes) below.
3838
[![CI status docker/gcc-4.8][docker/gcc-4.8-shield]][docker/gcc-4.8-link]
3939
[![CI status docker/integration][docker/integration-shield]][docker/integration-link]
4040
[![CI status docker/msan][docker/msan-shield]][docker/msan-link]
41+
[![CI status docker/ninja][docker/ninja-shield]][docker/ninja-link]
4142
[![CI status docker/noex][docker/noex-shield]][docker/noex-link]
4243
[![CI status docker/publish-refdocs][docker/publish-refdocs-shield]][docker/publish-refdocs-link]
4344
[![CI status docker/tsan][docker/tsan-shield]][docker/tsan-link]
@@ -84,6 +85,8 @@ in the [release notes](README.md#release-notes) below.
8485
[docker/integration-shield]: https://storage.googleapis.com/cloud-cpp-kokoro-status/spanner/docker/integration.svg
8586
[docker/msan-link]: https://storage.googleapis.com/cloud-cpp-kokoro-status/spanner/docker/msan-link.html
8687
[docker/msan-shield]: https://storage.googleapis.com/cloud-cpp-kokoro-status/spanner/docker/msan.svg
88+
[docker/ninja-link]: https://storage.googleapis.com/cloud-cpp-kokoro-status/spanner/docker/ninja-link.html
89+
[docker/ninja-shield]: https://storage.googleapis.com/cloud-cpp-kokoro-status/spanner/docker/ninja.svg
8790
[docker/noex-link]: https://storage.googleapis.com/cloud-cpp-kokoro-status/spanner/docker/noex-link.html
8891
[docker/noex-shield]: https://storage.googleapis.com/cloud-cpp-kokoro-status/spanner/docker/noex.svg
8992
[docker/publish-refdocs-link]: https://storage.googleapis.com/cloud-cpp-kokoro-status/spanner/docker/publish-refdocs-link.html

‎bazel/google_cloud_cpp_spanner_deps.bzl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@ def google_cloud_cpp_spanner_deps():
4242
if "com_github_googleapis_google_cloud_cpp_common" not in native.existing_rules():
4343
http_archive(
4444
name = "com_github_googleapis_google_cloud_cpp_common",
45-
strip_prefix = "google-cloud-cpp-common-0.13.0",
45+
strip_prefix = "google-cloud-cpp-common-0.18.0",
4646
urls = [
47-
"https://github.com/googleapis/google-cloud-cpp-common/archive/v0.13.0.tar.gz",
47+
"https://github.com/googleapis/google-cloud-cpp-common/archive/v0.18.0.tar.gz",
4848
],
49-
sha256 = "ea7f8f64ee8a6964f8755d1024b908bf13170e505f54b57ffc72c0002d478b8c",
49+
sha256 = "af61c97919da43b7df0e917d27c3be6d0b8de96306140d552ac41ae579353b6a",
5050
)
5151

5252
# Load a version of googletest that we know works.

‎ci/etc/install-config.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
set -eu
1717

18-
GOOGLE_CLOUD_CPP_BAZEL_VERSION="1.0.0"
18+
GOOGLE_CLOUD_CPP_BAZEL_VERSION="2.0.0"
1919
readonly GOOGLE_CLOUD_CPP_BAZEL_VERSION
2020

2121
GOOGLE_CLOUD_CPP_CLOUD_SDK_VERSION="266.0.0"

‎ci/install-bazel.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ set -eu
1818
readonly PLATFORM=$(printf "%s-%s" "$(uname -s)" "$(uname -m)" \
1919
| tr '[:upper:]' '[:lower:]')
2020

21-
readonly BAZEL_VERSION="1.0.0"
21+
readonly BAZEL_VERSION="2.0.0"
2222
readonly GITHUB_DL="https://github.com/bazelbuild/bazel/releases/download"
2323
readonly SCRIPT_NAME="bazel-${BAZEL_VERSION}-installer-${PLATFORM}.sh"
2424
wget -q "${GITHUB_DL}/${BAZEL_VERSION}/${SCRIPT_NAME}"

‎ci/kokoro/Dockerfile.fedora-install‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,9 @@ RUN cmake --build cmake-out --target install
9191

9292
# Download and compile google-cloud-cpp from source too:
9393
WORKDIR /var/tmp/build
94-
RUN wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.13.0.tar.gz
95-
RUN tar -xf v0.13.0.tar.gz
96-
WORKDIR /var/tmp/build/google-cloud-cpp-common-0.13.0
94+
RUN wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.18.0.tar.gz
95+
RUN tar -xf v0.18.0.tar.gz
96+
WORKDIR /var/tmp/build/google-cloud-cpp-common-0.18.0
9797
# Compile without the tests because we are testing spanner, not the base
9898
# libraries
9999
RUN cmake -H. -Bcmake-out \

‎ci/kokoro/install/Dockerfile.centos-7‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ ENV PATH=/usr/local/bin:${PATH}
5858

5959
# ```bash
6060
WORKDIR /var/tmp/build
61-
RUN wget -q https://github.com/google/protobuf/archive/v3.9.1.tar.gz && \
62-
tar -xf v3.9.1.tar.gz && \
63-
cd protobuf-3.9.1/cmake && \
61+
RUN wget -q https://github.com/google/protobuf/archive/v3.11.3.tar.gz && \
62+
tar -xf v3.11.3.tar.gz && \
63+
cd protobuf-3.11.3/cmake && \
6464
cmake \
6565
-DCMAKE_BUILD_TYPE=Release \
6666
-DBUILD_SHARED_LIBS=yes \
@@ -158,9 +158,9 @@ RUN wget -q https://github.com/google/benchmark/archive/v1.5.0.tar.gz && \
158158

159159
# ```bash
160160
WORKDIR /var/tmp/build
161-
RUN wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.16.0.tar.gz && \
162-
tar -xf v0.16.0.tar.gz && \
163-
cd google-cloud-cpp-common-0.16.0 && \
161+
RUN wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.18.0.tar.gz && \
162+
tar -xf v0.18.0.tar.gz && \
163+
cd google-cloud-cpp-common-0.18.0 && \
164164
cmake -H. -Bcmake-out \
165165
-DBUILD_TESTING=OFF \
166166
-DGOOGLE_CLOUD_CPP_TESTING_UTIL_ENABLE_INSTALL=ON && \

‎ci/kokoro/install/Dockerfile.centos-8‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@ ENV PATH=/usr/local/bin:${PATH}
5252

5353
# ```bash
5454
WORKDIR /var/tmp/build
55-
RUN wget -q https://github.com/google/protobuf/archive/v3.9.1.tar.gz && \
56-
tar -xf v3.9.1.tar.gz && \
57-
cd protobuf-3.9.1/cmake && \
55+
RUN wget -q https://github.com/google/protobuf/archive/v3.11.3.tar.gz && \
56+
tar -xf v3.11.3.tar.gz && \
57+
cd protobuf-3.11.3/cmake && \
5858
cmake \
5959
-DCMAKE_BUILD_TYPE=Release \
6060
-DBUILD_SHARED_LIBS=yes \
@@ -137,9 +137,9 @@ RUN wget -q https://github.com/google/benchmark/archive/v1.5.0.tar.gz && \
137137

138138
# ```bash
139139
WORKDIR /var/tmp/build
140-
RUN wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.16.0.tar.gz && \
141-
tar -xf v0.16.0.tar.gz && \
142-
cd google-cloud-cpp-common-0.16.0 && \
140+
RUN wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.18.0.tar.gz && \
141+
tar -xf v0.18.0.tar.gz && \
142+
cd google-cloud-cpp-common-0.18.0 && \
143143
cmake -H. -Bcmake-out \
144144
-DBUILD_TESTING=OFF \
145145
-DGOOGLE_CLOUD_CPP_TESTING_UTIL_ENABLE_INSTALL=ON && \

‎ci/kokoro/install/Dockerfile.debian-buster‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,9 @@ RUN wget -q https://github.com/google/benchmark/archive/v1.5.0.tar.gz && \
9898

9999
# ```bash
100100
WORKDIR /var/tmp/build
101-
RUN wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.16.0.tar.gz && \
102-
tar -xf v0.16.0.tar.gz && \
103-
cd google-cloud-cpp-common-0.16.0 && \
101+
RUN wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.18.0.tar.gz && \
102+
tar -xf v0.18.0.tar.gz && \
103+
cd google-cloud-cpp-common-0.18.0 && \
104104
cmake -H. -Bcmake-out \
105105
-DBUILD_TESTING=OFF \
106106
-DGOOGLE_CLOUD_CPP_TESTING_UTIL_ENABLE_INSTALL=ON && \

‎ci/kokoro/install/Dockerfile.debian-stretch‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ RUN apt update && \
4747

4848
# ```bash
4949
WORKDIR /var/tmp/build
50-
RUN wget -q https://github.com/google/protobuf/archive/v3.9.1.tar.gz && \
51-
tar -xf v3.9.1.tar.gz && \
52-
cd protobuf-3.9.1/cmake && \
50+
RUN wget -q https://github.com/google/protobuf/archive/v3.11.3.tar.gz && \
51+
tar -xf v3.11.3.tar.gz && \
52+
cd protobuf-3.11.3/cmake && \
5353
cmake \
5454
-DCMAKE_BUILD_TYPE=Release \
5555
-DBUILD_SHARED_LIBS=yes \
@@ -132,9 +132,9 @@ RUN wget -q https://github.com/google/benchmark/archive/v1.5.0.tar.gz && \
132132

133133
# ```bash
134134
WORKDIR /var/tmp/build
135-
RUN wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.16.0.tar.gz && \
136-
tar -xf v0.16.0.tar.gz && \
137-
cd google-cloud-cpp-common-0.16.0 && \
135+
RUN wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.18.0.tar.gz && \
136+
tar -xf v0.18.0.tar.gz && \
137+
cd google-cloud-cpp-common-0.18.0 && \
138138
cmake -H. -Bcmake-out \
139139
-DBUILD_TESTING=OFF \
140140
-DGOOGLE_CLOUD_CPP_TESTING_UTIL_ENABLE_INSTALL=ON && \

0 commit comments

Comments
 (0)