chore: update g-c-cpp-common to v0.25.0 (#1458)

googleapis · Apr 1, 2020 · e481273 · e481273
1 parent 62bb823
commit e481273
Show file tree

Hide file tree

Showing 16 changed files with 70 additions and 71 deletions.
diff --git a/bazel/google_cloud_cpp_spanner_deps.bzl b/bazel/google_cloud_cpp_spanner_deps.bzl
@@ -42,11 +42,11 @@ def google_cloud_cpp_spanner_deps():
     if "com_github_googleapis_google_cloud_cpp_common" not in native.existing_rules():
         http_archive(
             name = "com_github_googleapis_google_cloud_cpp_common",
-            strip_prefix = "google-cloud-cpp-common-0.24.0",
+            strip_prefix = "google-cloud-cpp-common-0.25.0",
             urls = [
-                "https://github.com/googleapis/google-cloud-cpp-common/archive/v0.24.0.tar.gz",
+                "https://github.com/googleapis/google-cloud-cpp-common/archive/v0.25.0.tar.gz",
             ],
-            sha256 = "d5e9075dd052e4ffdeba987d9e0c5b5583312e1213d79b913f811d4d2e78caee",
+            sha256 = "9ef2bb9b731cade7eb1be7e45323becb78cecda7e39b0a4050d7b787425d5efb",
         )
 
     # Load a version of googletest that we know works.

diff --git a/ci/etc/kokoro/install/version-config.sh b/ci/etc/kokoro/install/version-config.sh
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-readonly GOOGLE_CLOUD_CPP_COMMON_VERSION=0.24.0
+readonly GOOGLE_CLOUD_CPP_COMMON_VERSION=0.25.0
diff --git a/ci/kokoro/Dockerfile.fedora-install b/ci/kokoro/Dockerfile.fedora-install
@@ -77,14 +77,13 @@ RUN cmake --build cmake-out --target install
 
 # Download and compile google-cloud-cpp from source too:
 WORKDIR /var/tmp/build
-RUN wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.24.0.tar.gz
-RUN tar -xf v0.24.0.tar.gz
-WORKDIR /var/tmp/build/google-cloud-cpp-common-0.24.0
-# Compile without the tests because we are testing spanner, not the base
-# libraries
-RUN cmake -H. -Bcmake-out \
-    -DBUILD_SHARED_LIBS=yes \
-    -DBUILD_TESTING=OFF \
-    -DGOOGLE_CLOUD_CPP_TESTING_UTIL_ENABLE_INSTALL=ON
-RUN cmake --build cmake-out -- -j $(nproc)
-RUN cmake --build cmake-out --target install
+RUN wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.25.0.tar.gz && \
+    tar -xf v0.25.0.tar.gz && \
+    cd /var/tmp/build/google-cloud-cpp-common-0.25.0 && \
+    cmake -H. -Bcmake-out \
+      -DBUILD_SHARED_LIBS=YES \
+      -DBUILD_TESTING=OFF \
+      -DGOOGLE_CLOUD_CPP_TESTING_UTIL_ENABLE_INSTALL=ON && \
+    cmake --build cmake-out --target install -- -j ${NCPU} && \
+    ldconfig && \
+    cd /var/tmp && rm -fr build
diff --git a/ci/kokoro/install/Dockerfile.centos-7 b/ci/kokoro/install/Dockerfile.centos-7
@@ -123,9 +123,9 @@ RUN wget -q https://github.com/googleapis/cpp-cmakefiles/archive/v0.6.0.tar.gz &
 
 # ```bash
 WORKDIR /var/tmp/build
-RUN wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.24.0.tar.gz && \
-    tar -xf v0.24.0.tar.gz && \
-    cd google-cloud-cpp-common-0.24.0 && \
+RUN wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.25.0.tar.gz && \
+    tar -xf v0.25.0.tar.gz && \
+    cd google-cloud-cpp-common-0.25.0 && \
     cmake -H. -Bcmake-out -DBUILD_TESTING=OFF && \
     cmake --build cmake-out -- -j ${NCPU:-4} && \
     cmake --build cmake-out --target install -- -j ${NCPU:-4} && \

diff --git a/ci/kokoro/install/Dockerfile.centos-8 b/ci/kokoro/install/Dockerfile.centos-8
@@ -102,9 +102,9 @@ RUN wget -q https://github.com/googleapis/cpp-cmakefiles/archive/v0.6.0.tar.gz &
 
 # ```bash
 WORKDIR /var/tmp/build
-RUN wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.24.0.tar.gz && \
-    tar -xf v0.24.0.tar.gz && \
-    cd google-cloud-cpp-common-0.24.0 && \
+RUN wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.25.0.tar.gz && \
+    tar -xf v0.25.0.tar.gz && \
+    cd google-cloud-cpp-common-0.25.0 && \
     cmake -H. -Bcmake-out -DBUILD_TESTING=OFF && \
     cmake --build cmake-out -- -j ${NCPU:-4} && \
     cmake --build cmake-out --target install -- -j ${NCPU:-4} && \

diff --git a/ci/kokoro/install/Dockerfile.debian-buster b/ci/kokoro/install/Dockerfile.debian-buster
@@ -65,9 +65,9 @@ RUN wget -q https://github.com/googleapis/cpp-cmakefiles/archive/v0.6.0.tar.gz &
 
 # ```bash
 WORKDIR /var/tmp/build
-RUN wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.24.0.tar.gz && \
-    tar -xf v0.24.0.tar.gz && \
-    cd google-cloud-cpp-common-0.24.0 && \
+RUN wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.25.0.tar.gz && \
+    tar -xf v0.25.0.tar.gz && \
+    cd google-cloud-cpp-common-0.25.0 && \
     cmake -H. -Bcmake-out -DBUILD_TESTING=OFF && \
     cmake --build cmake-out -- -j ${NCPU:-4} && \
     cmake --build cmake-out --target install -- -j ${NCPU:-4} && \

diff --git a/ci/kokoro/install/Dockerfile.debian-stretch b/ci/kokoro/install/Dockerfile.debian-stretch
@@ -98,9 +98,9 @@ RUN wget -q https://github.com/googleapis/cpp-cmakefiles/archive/v0.6.0.tar.gz &
 
 # ```bash
 WORKDIR /var/tmp/build
-RUN wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.24.0.tar.gz && \
-    tar -xf v0.24.0.tar.gz && \
-    cd google-cloud-cpp-common-0.24.0 && \
+RUN wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.25.0.tar.gz && \
+    tar -xf v0.25.0.tar.gz && \
+    cd google-cloud-cpp-common-0.25.0 && \
     cmake -H. -Bcmake-out -DBUILD_TESTING=OFF && \
     cmake --build cmake-out -- -j ${NCPU:-4} && \
     cmake --build cmake-out --target install -- -j ${NCPU:-4} && \

diff --git a/ci/kokoro/install/Dockerfile.fedora b/ci/kokoro/install/Dockerfile.fedora
@@ -71,9 +71,9 @@ RUN wget -q https://github.com/googleapis/cpp-cmakefiles/archive/v0.6.0.tar.gz &
 
 # ```bash
 WORKDIR /var/tmp/build
-RUN wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.24.0.tar.gz && \
-    tar -xf v0.24.0.tar.gz && \
-    cd google-cloud-cpp-common-0.24.0 && \
+RUN wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.25.0.tar.gz && \
+    tar -xf v0.25.0.tar.gz && \
+    cd google-cloud-cpp-common-0.25.0 && \
     cmake -H. -Bcmake-out -DBUILD_TESTING=OFF && \
     cmake --build cmake-out -- -j ${NCPU:-4} && \
     cmake --build cmake-out --target install -- -j ${NCPU:-4} && \

diff --git a/ci/kokoro/install/Dockerfile.opensuse-leap b/ci/kokoro/install/Dockerfile.opensuse-leap
@@ -118,9 +118,9 @@ RUN wget -q https://github.com/googleapis/cpp-cmakefiles/archive/v0.6.0.tar.gz &
 
 # ```bash
 WORKDIR /var/tmp/build
-RUN wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.24.0.tar.gz && \
-    tar -xf v0.24.0.tar.gz && \
-    cd google-cloud-cpp-common-0.24.0 && \
+RUN wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.25.0.tar.gz && \
+    tar -xf v0.25.0.tar.gz && \
+    cd google-cloud-cpp-common-0.25.0 && \
     cmake -H. -Bcmake-out -DBUILD_TESTING=OFF && \
     cmake --build cmake-out -- -j ${NCPU:-4} && \
     cmake --build cmake-out --target install -- -j ${NCPU:-4} && \

diff --git a/ci/kokoro/install/Dockerfile.opensuse-tumbleweed b/ci/kokoro/install/Dockerfile.opensuse-tumbleweed
@@ -69,9 +69,9 @@ RUN wget -q https://github.com/googleapis/cpp-cmakefiles/archive/v0.6.0.tar.gz &
 
 # ```bash
 WORKDIR /var/tmp/build
-RUN wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.24.0.tar.gz && \
-    tar -xf v0.24.0.tar.gz && \
-    cd google-cloud-cpp-common-0.24.0 && \
+RUN wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.25.0.tar.gz && \
+    tar -xf v0.25.0.tar.gz && \
+    cd google-cloud-cpp-common-0.25.0 && \
     cmake -H. -Bcmake-out -DBUILD_TESTING=OFF && \
     cmake --build cmake-out -- -j ${NCPU:-4} && \
     cmake --build cmake-out --target install -- -j ${NCPU:-4} && \

diff --git a/ci/kokoro/install/Dockerfile.ubuntu-bionic b/ci/kokoro/install/Dockerfile.ubuntu-bionic
@@ -91,9 +91,9 @@ RUN wget -q https://github.com/googleapis/cpp-cmakefiles/archive/v0.6.0.tar.gz &
 
 # ```bash
 WORKDIR /var/tmp/build
-RUN wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.24.0.tar.gz && \
-    tar -xf v0.24.0.tar.gz && \
-    cd google-cloud-cpp-common-0.24.0 && \
+RUN wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.25.0.tar.gz && \
+    tar -xf v0.25.0.tar.gz && \
+    cd google-cloud-cpp-common-0.25.0 && \
     cmake -H. -Bcmake-out -DBUILD_TESTING=OFF && \
     cmake --build cmake-out -- -j ${NCPU:-4} && \
     cmake --build cmake-out --target install -- -j ${NCPU:-4} && \

diff --git a/ci/kokoro/install/Dockerfile.ubuntu-xenial b/ci/kokoro/install/Dockerfile.ubuntu-xenial
@@ -106,9 +106,9 @@ RUN wget -q https://github.com/googleapis/cpp-cmakefiles/archive/v0.6.0.tar.gz &
 
 # ```bash
 WORKDIR /var/tmp/build
-RUN wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.24.0.tar.gz && \
-    tar -xf v0.24.0.tar.gz && \
-    cd google-cloud-cpp-common-0.24.0 && \
+RUN wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.25.0.tar.gz && \
+    tar -xf v0.25.0.tar.gz && \
+    cd google-cloud-cpp-common-0.25.0 && \
     cmake -H. -Bcmake-out -DBUILD_TESTING=OFF && \
     cmake --build cmake-out -- -j ${NCPU:-4} && \
     cmake --build cmake-out --target install -- -j ${NCPU:-4} && \

diff --git a/ci/kokoro/windows/vcpkg-ports/google-cloud-cpp-common/CONTROL b/ci/kokoro/windows/vcpkg-ports/google-cloud-cpp-common/CONTROL
@@ -1,5 +1,5 @@
 Source: google-cloud-cpp-common
-Version: 0.24.0
+Version: 0.25.0
 Build-Depends: grpc, googleapis
 Description: Base C++ Libraries for Google Cloud Platform APIs
 Homepage: https://github.com/googleapis/google-cloud-cpp-common

diff --git a/ci/kokoro/windows/vcpkg-ports/google-cloud-cpp-common/portfile.cmake b/ci/kokoro/windows/vcpkg-ports/google-cloud-cpp-common/portfile.cmake
@@ -8,9 +8,9 @@ vcpkg_from_github(
     REPO
     googleapis/google-cloud-cpp-common
     REF
-    v0.24.0
+    v0.25.0
     SHA512
-    f75b8b11cad5428696c95bd1ea4cc3cb05d3e8655626ff9929ac92b4d0f23d9ad42c45b58d3641fb4077279b59fc2da7b1c5f63f7d40d8098a32209b22394fd2
+    074294e8b824d7f2b9d6d4051f4fbb28ca83166aad98ff000348abb238488b1c957726d901dae041bf50aa23ab368da5cf1d23ad42454f9ad07153976c0a29fe
     HEAD_REF
     master)
 

diff --git a/doc/packaging.md b/doc/packaging.md
@@ -127,9 +127,9 @@ all the Google Cloud C++ client libraries:
 
 ```bash
 cd $HOME/Downloads
-wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.24.0.tar.gz && \
-    tar -xf v0.24.0.tar.gz && \
-    cd google-cloud-cpp-common-0.24.0 && \
+wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.25.0.tar.gz && \
+    tar -xf v0.25.0.tar.gz && \
+    cd google-cloud-cpp-common-0.25.0 && \
     cmake -H. -Bcmake-out -DBUILD_TESTING=OFF && \
     cmake --build cmake-out -- -j ${NCPU:-4} && \
 sudo cmake --build cmake-out --target install -- -j ${NCPU:-4} && \
@@ -244,9 +244,9 @@ all the Google Cloud C++ client libraries:
 
 ```bash
 cd $HOME/Downloads
-wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.24.0.tar.gz && \
-    tar -xf v0.24.0.tar.gz && \
-    cd google-cloud-cpp-common-0.24.0 && \
+wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.25.0.tar.gz && \
+    tar -xf v0.25.0.tar.gz && \
+    cd google-cloud-cpp-common-0.25.0 && \
     cmake -H. -Bcmake-out -DBUILD_TESTING=OFF && \
     cmake --build cmake-out -- -j ${NCPU:-4} && \
 sudo cmake --build cmake-out --target install -- -j ${NCPU:-4} && \
@@ -334,9 +334,9 @@ all the Google Cloud C++ client libraries:
 
 ```bash
 cd $HOME/Downloads
-wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.24.0.tar.gz && \
-    tar -xf v0.24.0.tar.gz && \
-    cd google-cloud-cpp-common-0.24.0 && \
+wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.25.0.tar.gz && \
+    tar -xf v0.25.0.tar.gz && \
+    cd google-cloud-cpp-common-0.25.0 && \
     cmake -H. -Bcmake-out -DBUILD_TESTING=OFF && \
     cmake --build cmake-out -- -j ${NCPU:-4} && \
 sudo cmake --build cmake-out --target install -- -j ${NCPU:-4} && \
@@ -439,9 +439,9 @@ all the Google Cloud C++ client libraries:
 
 ```bash
 cd $HOME/Downloads
-wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.24.0.tar.gz && \
-    tar -xf v0.24.0.tar.gz && \
-    cd google-cloud-cpp-common-0.24.0 && \
+wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.25.0.tar.gz && \
+    tar -xf v0.25.0.tar.gz && \
+    cd google-cloud-cpp-common-0.25.0 && \
     cmake -H. -Bcmake-out -DBUILD_TESTING=OFF && \
     cmake --build cmake-out -- -j ${NCPU:-4} && \
 sudo cmake --build cmake-out --target install -- -j ${NCPU:-4} && \
@@ -503,9 +503,9 @@ all the Google Cloud C++ client libraries:
 
 ```bash
 cd $HOME/Downloads
-wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.24.0.tar.gz && \
-    tar -xf v0.24.0.tar.gz && \
-    cd google-cloud-cpp-common-0.24.0 && \
+wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.25.0.tar.gz && \
+    tar -xf v0.25.0.tar.gz && \
+    cd google-cloud-cpp-common-0.25.0 && \
     cmake -H. -Bcmake-out -DBUILD_TESTING=OFF && \
     cmake --build cmake-out -- -j ${NCPU:-4} && \
 sudo cmake --build cmake-out --target install -- -j ${NCPU:-4} && \
@@ -600,9 +600,9 @@ all the Google Cloud C++ client libraries:
 
 ```bash
 cd $HOME/Downloads
-wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.24.0.tar.gz && \
-    tar -xf v0.24.0.tar.gz && \
-    cd google-cloud-cpp-common-0.24.0 && \
+wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.25.0.tar.gz && \
+    tar -xf v0.25.0.tar.gz && \
+    cd google-cloud-cpp-common-0.25.0 && \
     cmake -H. -Bcmake-out -DBUILD_TESTING=OFF && \
     cmake --build cmake-out -- -j ${NCPU:-4} && \
 sudo cmake --build cmake-out --target install -- -j ${NCPU:-4} && \
@@ -701,9 +701,9 @@ all the Google Cloud C++ client libraries:
 
 ```bash
 cd $HOME/Downloads
-wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.24.0.tar.gz && \
-    tar -xf v0.24.0.tar.gz && \
-    cd google-cloud-cpp-common-0.24.0 && \
+wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.25.0.tar.gz && \
+    tar -xf v0.25.0.tar.gz && \
+    cd google-cloud-cpp-common-0.25.0 && \
     cmake -H. -Bcmake-out -DBUILD_TESTING=OFF && \
     cmake --build cmake-out -- -j ${NCPU:-4} && \
 sudo cmake --build cmake-out --target install -- -j ${NCPU:-4} && \
@@ -823,9 +823,9 @@ all the Google Cloud C++ client libraries:
 
 ```bash
 cd $HOME/Downloads
-wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.24.0.tar.gz && \
-    tar -xf v0.24.0.tar.gz && \
-    cd google-cloud-cpp-common-0.24.0 && \
+wget -q https://github.com/googleapis/google-cloud-cpp-common/archive/v0.25.0.tar.gz && \
+    tar -xf v0.25.0.tar.gz && \
+    cd google-cloud-cpp-common-0.25.0 && \
     cmake -H. -Bcmake-out -DBUILD_TESTING=OFF && \
     cmake --build cmake-out -- -j ${NCPU:-4} && \
 sudo cmake --build cmake-out --target install -- -j ${NCPU:-4} && \

diff --git a/super/external/google-cloud-cpp-common.cmake b/super/external/google-cloud-cpp-common.cmake
@@ -23,10 +23,10 @@ if (NOT TARGET google-cloud-cpp-common-project)
     # Give application developers a hook to configure the version and hash
     # downloaded from GitHub.
     set(GOOGLE_CLOUD_CPP_URL
-        "https://github.com/googleapis/google-cloud-cpp-common/archive/v0.24.0.tar.gz"
+        "https://github.com/googleapis/google-cloud-cpp-common/archive/v0.25.0.tar.gz"
     )
     set(GOOGLE_CLOUD_CPP_SHA256
-        "d5e9075dd052e4ffdeba987d9e0c5b5583312e1213d79b913f811d4d2e78caee")
+        "9ef2bb9b731cade7eb1be7e45323becb78cecda7e39b0a4050d7b787425d5efb")
 
     set_external_project_build_parallel_level(PARALLEL)
     set_external_project_vars()