update more code and deps

Author: scotthart

examples/api_key.cc

@@ -33,6 +33,7 @@
 #include "absl/strings/str_split.h"
 #include <chrono>
 #include <iostream>
+#include <optional>
 #include <string>
 #include <thread>
 #include <vector>
@@ -147,7 +148,7 @@ void AutoRun(std::vector<std::string> const& argv) {
     // When we authenticate with an API key, we do not have (or need)
     // credentials. Using a quota project requires credentials, so disable it.
     google::cloud::testing_util::ScopedEnvironment overlay(
-        "GOOGLE_CLOUD_CPP_USER_PROJECT", absl::nullopt);
+        "GOOGLE_CLOUD_CPP_USER_PROJECT", std::nullopt);
 
     try {
       AuthenticateWithApiKey({project_id, key.key_string()});

google/cloud/BUILD.bazel

@@ -78,7 +78,6 @@ cc_library(
         "@abseil-cpp//absl/strings:str_format",
         "@abseil-cpp//absl/time",
         "@abseil-cpp//absl/types:span",
-        "@abseil-cpp//absl/types:variant",
         "@opentelemetry-cpp//api",
     ] + select({
         "@platforms//os:windows": [],

google/cloud/google_cloud_cpp_common.cmake

@@ -184,11 +184,9 @@ target_link_libraries(
     google_cloud_cpp_common
     PUBLIC absl::base
            absl::memory
-           absl::optional
            absl::span
            absl::str_format
            absl::time
-           absl::variant
            Threads::Threads)
 if (WIN32)
     target_compile_definitions(google_cloud_cpp_common
@@ -255,12 +253,10 @@ google_cloud_cpp_add_pkgconfig(
     "common"
     "Google Cloud C++ Client Library Common Components"
     "Common Components used by the Google Cloud C++ Client Libraries."
-    "absl_optional"
     "absl_span"
     "absl_strings"
     "absl_time"
     "absl_time_zone"
-    "absl_variant"
     "${GOOGLE_CLOUD_CPP_OPENTELEMETRY_API}"
     NON_WIN32_REQUIRES
     openssl
@@ -428,7 +424,6 @@ if (BUILD_TESTING)
             PRIVATE google_cloud_cpp_testing
                     google-cloud-cpp::common
                     google-cloud-cpp::mocks
-                    absl::variant
                     GTest::gmock_main
                     GTest::gmock
                     GTest::gtest)

google/cloud/google_cloud_cpp_grpc_utils.cmake

@@ -112,7 +112,6 @@ target_link_libraries(
     PUBLIC absl::function_ref
            absl::memory
            absl::time
-           absl::variant
            google-cloud-cpp::iam_credentials_v1_iamcredentials_protos
            google-cloud-cpp::iam_v1_policy_protos
            google-cloud-cpp::longrunning_operations_protos
@@ -183,7 +182,6 @@ google_cloud_cpp_add_pkgconfig(
     "absl_strings"
     "absl_time"
     "absl_time_zone"
-    "absl_variant"
     "openssl")
 # Create and install the CMake configuration files.
 configure_file("config-grpc-utils.cmake.in"
@@ -208,7 +206,6 @@ function (google_cloud_cpp_grpc_utils_add_test fname labels)
                 google_cloud_cpp_testing_grpc
                 google_cloud_cpp_testing
                 google-cloud-cpp::common
-                absl::variant
                 GTest::gmock_main
                 GTest::gmock
                 GTest::gtest
@@ -308,7 +305,6 @@ if (BUILD_TESTING)
                     google_cloud_cpp_testing
                     google-cloud-cpp::common
                     google-cloud-cpp::iam_credentials_v1_iamcredentials_protos
-                    absl::variant
                     GTest::gmock_main
                     GTest::gmock
                     GTest::gtest

google/cloud/google_cloud_cpp_rest_protobuf_internal.cmake

@@ -106,7 +106,6 @@ function (google_cloud_cpp_rest_protobuf_internal_add_test fname labels)
                 google_cloud_cpp_testing_grpc
                 google_cloud_cpp_testing
                 google-cloud-cpp::common
-                absl::variant
                 GTest::gmock_main
                 GTest::gmock
                 GTest::gtest)

google/cloud/google_cloud_cpp_universe_domain.cmake

@@ -85,7 +85,7 @@ function (google_cloud_cpp_universe_domain_add_test fname labels)
     target_link_libraries(
         ${target}
         PRIVATE google-cloud-cpp::universe_domain google_cloud_cpp_testing
-                absl::variant GTest::gmock_main GTest::gmock GTest::gtest)
+                GTest::gmock_main GTest::gmock GTest::gtest)
     google_cloud_cpp_add_common_options(${target})
     add_test(NAME ${target} COMMAND ${target})
     set_tests_properties(${target} PROPERTIES LABELS "${labels}")

google/cloud/storage/BUILD.bazel

@@ -145,7 +145,6 @@ cc_library(
         "@abseil-cpp//absl/strings:str_format",
         "@abseil-cpp//absl/time",
         "@abseil-cpp//absl/types:span",
-        "@abseil-cpp//absl/types:variant",
         "@curl",
         "@nlohmann_json//:json",
     ] + select({

google/cloud/storage/google_cloud_cpp_storage.cmake

@@ -246,7 +246,6 @@ target_link_libraries(
            absl::memory
            absl::strings
            absl::time
-           absl::variant
            google-cloud-cpp::common
            google-cloud-cpp::rest_internal
            nlohmann_json::nlohmann_json
@@ -320,7 +319,6 @@ google_cloud_cpp_add_pkgconfig(
     "absl_strings"
     "absl_str_format"
     "absl_time"
-    "absl_variant"
     NON_WIN32_REQUIRES
     openssl
     WIN32_LIBS

google/cloud/storage/google_cloud_cpp_storage_grpc.cmake

@@ -282,7 +282,6 @@ google_cloud_cpp_add_pkgconfig(
     "google_cloud_cpp_grpc_utils"
     "google_cloud_cpp_common"
     "grpc++"
-    "absl_optional"
     "absl_strings"
     "absl_time"
     ${EXTRA_MODULES})

google/cloud/testing_util/scoped_environment.h

@@ -35,7 +35,7 @@ class ScopedEnvironment {
  public:
   /**
    * Set the @p variable environment variable to @p value. If @value is
-   * an unset `absl::optional` then the variable is unset. The previous value
+   * an unset `std::optional` then the variable is unset. The previous value
    * of the variable will be restored upon destruction.
    */
   ScopedEnvironment(std::string variable,