Skip to content

Commit 4860122

Browse files
authored
Merge branch 'googleapis:main' into emulator
2 parents 173f00b + 65a6980 commit 4860122

91 files changed

Lines changed: 10845 additions & 432 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,13 @@ breaking changes in the upcoming 3.x release. This release is scheduled for
66

77
## v2.40.0 - TBD
88

9+
### New Libraries
10+
11+
We are happy to announce the following GA libraries. Unless specifically noted,
12+
the APIs in these libraries are stable, and are ready for production use.
13+
14+
- [License Manager API](/google/cloud/licensemanager/README.md)
15+
916
### Updated Libraries
1017

1118
- [ManagedKafka](/google/cloud/managedkafka/README.md) - add schemaregistry to the library

MODULE.bazel

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,12 @@ python.toolchain(
5555
bazel_dep(name = "googleapis", version = "0.0.0", repo_name = "com_google_googleapis")
5656
archive_override(
5757
module_name = "googleapis",
58-
integrity = "sha256-obIxX36ykOKHaxmDnaHMeRazb5PIiSH5DQ2qtYdVqKM=",
58+
integrity = "sha256-JLDsEVCdmGOdD0NcdYyYdYvwXlaFeGT6lSp9jkYjCaY=",
5959
patch_strip = 1,
6060
patches = ["//bazel:googleapis.modules.patch"],
61-
strip_prefix = "googleapis-f9d6fe4a6ad9ed89dfc315f284124d2104377940",
61+
strip_prefix = "googleapis-6e5b74e4f8194149542348a40881a5d792a59a0e",
6262
urls = [
63-
"https://github.com/googleapis/googleapis/archive/f9d6fe4a6ad9ed89dfc315f284124d2104377940.tar.gz",
63+
"https://github.com/googleapis/googleapis/archive/6e5b74e4f8194149542348a40881a5d792a59a0e.tar.gz",
6464
],
6565
)
6666

README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -299,6 +299,9 @@ See each library's `README.md` file for more information about:
299299
- [Cloud Natural Language API](google/cloud/language/README.md)
300300
[[quickstart]](google/cloud/language/quickstart/README.md)
301301
[[reference]](https://cloud.google.com/cpp/docs/reference/language/latest)
302+
- [License Manager API](google/cloud/licensemanager/README.md)
303+
[[quickstart]](google/cloud/licensemanager/quickstart/README.md)
304+
[[reference]](https://cloud.google.com/cpp/docs/reference/licensemanager/latest)
302305
- [Google Cloud Logging](google/cloud/logging/README.md)
303306
[[quickstart]](google/cloud/logging/quickstart/README.md)
304307
[[reference]](https://cloud.google.com/cpp/docs/reference/logging/latest)

bazel/workspace0.bzl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -126,10 +126,10 @@ def gl_cpp_workspace0(name = None):
126126
http_archive,
127127
name = "com_google_googleapis",
128128
urls = [
129-
"https://github.com/googleapis/googleapis/archive/f9d6fe4a6ad9ed89dfc315f284124d2104377940.tar.gz",
129+
"https://github.com/googleapis/googleapis/archive/6e5b74e4f8194149542348a40881a5d792a59a0e.tar.gz",
130130
],
131-
sha256 = "a1b2315f7eb290e2876b19839da1cc7916b36f93c88921f90d0daab58755a8a3",
132-
strip_prefix = "googleapis-f9d6fe4a6ad9ed89dfc315f284124d2104377940",
131+
sha256 = "24b0ec11509d98639d0f435c758c98758bf05e56857864fa952a7d8e462309a6",
132+
strip_prefix = "googleapis-6e5b74e4f8194149542348a40881a5d792a59a0e",
133133
build_file = Label("//bazel:googleapis.BUILD"),
134134
# Scaffolding for patching googleapis after download. For example:
135135
# patches = ["googleapis.patch"]
Binary file not shown.

ci/etc/expected_install_directories

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -857,6 +857,10 @@
857857
./include/google/cloud/language/v2
858858
./include/google/cloud/language/v2/internal
859859
./include/google/cloud/language/v2/mocks
860+
./include/google/cloud/licensemanager
861+
./include/google/cloud/licensemanager/v1
862+
./include/google/cloud/licensemanager/v1/internal
863+
./include/google/cloud/licensemanager/v1/mocks
860864
./include/google/cloud/logging
861865
./include/google/cloud/logging/mocks
862866
./include/google/cloud/logging/v2
@@ -1466,6 +1470,8 @@
14661470
./lib64/cmake/google_cloud_cpp_kms_mocks
14671471
./lib64/cmake/google_cloud_cpp_language
14681472
./lib64/cmake/google_cloud_cpp_language_mocks
1473+
./lib64/cmake/google_cloud_cpp_licensemanager
1474+
./lib64/cmake/google_cloud_cpp_licensemanager_mocks
14691475
./lib64/cmake/google_cloud_cpp_logging
14701476
./lib64/cmake/google_cloud_cpp_logging_mocks
14711477
./lib64/cmake/google_cloud_cpp_lustre

cmake/GoogleCloudCppFeatures.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ set(GOOGLE_CLOUD_CPP_GA_LIBRARIES
113113
"ids"
114114
"kms"
115115
"language"
116+
"licensemanager"
116117
"logging"
117118
"lustre"
118119
"managedidentities"

cmake/GoogleapisConfig.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ set(GOOGLE_CLOUD_CPP_GOOGLEAPIS_SHA256
2727
mark_as_advanced(GOOGLE_CLOUD_CPP_GOOGLEAPIS_SHA256)
2828

2929
set(_GOOGLE_CLOUD_CPP_GOOGLEAPIS_COMMIT_SHA
30-
"f9d6fe4a6ad9ed89dfc315f284124d2104377940")
30+
"6e5b74e4f8194149542348a40881a5d792a59a0e")
3131
set(_GOOGLE_CLOUD_CPP_GOOGLEAPIS_SHA256
32-
"a1b2315f7eb290e2876b19839da1cc7916b36f93c88921f90d0daab58755a8a3")
32+
"24b0ec11509d98639d0f435c758c98758bf05e56857864fa952a7d8e462309a6")
3333

3434
set(DOXYGEN_ALIASES
3535
"googleapis_link{2}=\"[\\1](https://github.com/googleapis/googleapis/blob/${_GOOGLE_CLOUD_CPP_GOOGLEAPIS_COMMIT_SHA}/\\2)\""
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
@com_google_googleapis//google/api:annotations_proto
2+
@com_google_googleapis//google/api:client_proto
3+
@com_google_googleapis//google/api:field_behavior_proto
4+
@com_google_googleapis//google/api:field_info_proto
5+
@com_google_googleapis//google/api:http_proto
6+
@com_google_googleapis//google/api:launch_stage_proto
7+
@com_google_googleapis//google/api:resource_proto
8+
@com_google_googleapis//google/longrunning:operations_proto
9+
@com_google_googleapis//google/rpc:status_proto

external/googleapis/protodeps/privateca.deps

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
@com_google_googleapis//google/api:annotations_proto
22
@com_google_googleapis//google/api:client_proto
33
@com_google_googleapis//google/api:field_behavior_proto
4+
@com_google_googleapis//google/api:field_info_proto
45
@com_google_googleapis//google/api:http_proto
56
@com_google_googleapis//google/api:launch_stage_proto
67
@com_google_googleapis//google/api:resource_proto

0 commit comments

Comments
 (0)